{ :controller => "geocoder", :action => "search" }
)
assert_routing(
- { :path => "/geocoder/search_latlon", :method => :get },
+ { :path => "/geocoder/search_latlon", :method => :post },
{ :controller => "geocoder", :action => "search_latlon" }
)
assert_routing(
- { :path => "/geocoder/search_ca_postcode", :method => :get },
- { :controller => "geocoder", :action => "search_ca_postcode" }
- )
- assert_routing(
- { :path => "/geocoder/search_osm_nominatim", :method => :get },
+ { :path => "/geocoder/search_osm_nominatim", :method => :post },
{ :controller => "geocoder", :action => "search_osm_nominatim" }
)
assert_routing(
- { :path => "/geocoder/search_geonames", :method => :get },
- { :controller => "geocoder", :action => "search_geonames" }
- )
- assert_routing(
- { :path => "/geocoder/search_osm_nominatim_reverse", :method => :get },
+ { :path => "/geocoder/search_osm_nominatim_reverse", :method => :post },
{ :controller => "geocoder", :action => "search_osm_nominatim_reverse" }
)
- assert_routing(
- { :path => "/geocoder/search_geonames_reverse", :method => :get },
- { :controller => "geocoder", :action => "search_geonames_reverse" }
- )
end
##
def test_identify_latlon_basic
[
"50.06773 14.37742",
+ "50.06773/14.37742",
"50.06773, 14.37742",
"+50.06773 +14.37742",
- "+50.06773, +14.37742"
+ "+50.06773, +14.37742",
+ "+50.06773/+14.37742"
].each do |code|
latlon_check code, 50.06773, 14.37742
end
end
end
+ ##
+ # Test identification of integer lat/lon pairs using N/E with degrees
+ def test_identify_latlon_ne_d_int_deg
+ [
+ "N50 E14",
+ "N50° E14°",
+ "50N 14E",
+ "50°N 14°E"
+ ].each do |code|
+ latlon_check code, 50, 14
+ end
+ end
+
##
# Test identification of lat/lon pairs using N/W with degrees
def test_identify_latlon_nw_d
end
end
+ ##
+ # Test identification of lat/lon pairs with missing fractions
+ def test_no_identify_latlon_ne_missing_fraction_part
+ [
+ "N50. E14.",
+ "N50.° E14.°",
+ "50.N 14.E",
+ "50.°N 14.°E",
+ "N50 1.' E14 2.'",
+ "N50° 1.' E14° 2.'",
+ "50N 1.' 14 2.'E",
+ "50° 1.'N 14° 2.'E",
+ "N50 1' 3,\" E14 2' 4.\"",
+ "N50° 1' 3.\" E14° 2' 4.\"",
+ "50N 1' 3.\" 14 2' 4.\"E",
+ "50° 1' 3.\"N 14° 2' 4.\"E"
+ ].each do |code|
+ get search_path(:query => code)
+ assert_response :success
+ assert_template :search
+ assert_template :layout => "map"
+ assert_equal %w[osm_nominatim], assigns(:sources).pluck(:name)
+ end
+ end
+
+ #
+ # Test identification of lat/lon pairs with mixed precision
+ def test_identify_latlon_ne_mixed_precision
+ latlon_check "N1 5 E15", 1.083333, 15
+ latlon_check "N1 5 9 E15", 1.085833, 15
+ latlon_check "N1 5 9 E1 5", 1.085833, 1.083333
+ latlon_check "N15 E1 5", 15, 1.083333
+ latlon_check "N15 E1 5 9", 15, 1.085833
+ latlon_check "N1 5 E1 5 9", 1.083333, 1.085833
+ end
+
+ #
+ # Test identification of lat/lon pairs with values close to zero
+ def test_identify_latlon_close_to_zero
+ [
+ "0.0000123 -0.0000456",
+ "+0.0000123 -0.0000456",
+ "N 0° 0' 0.4428\", W 0° 0' 1.6416\""
+ ].each do |code|
+ latlon_check code, 0.0000123, -0.0000456
+ end
+ end
+
##
# Test identification of US zipcodes
def test_identify_us_postcode
##
# Test identification of Canadian postcodes
def test_identify_ca_postcode
- search_check "A1B 2C3", %w[ca_postcode osm_nominatim]
+ search_check "A1B 2C3", %w[osm_nominatim]
end
##
# Test identification fall through to the default case
def test_identify_default
- search_check "foo bar baz", %w[osm_nominatim geonames]
+ search_check "foo bar baz", %w[osm_nominatim]
end
##
# Test the builtin latitude+longitude search
def test_search_latlon
- get geocoder_search_latlon_path(:lat => 1.23, :lon => 4.56, :zoom => 16), :xhr => true
+ post geocoder_search_latlon_path(:lat => 1.23, :lon => 4.56, :zoom => 16), :xhr => true
results_check :name => "1.23, 4.56", :lat => 1.23, :lon => 4.56, :zoom => 16
- get geocoder_search_latlon_path(:lat => -91.23, :lon => 4.56, :zoom => 16), :xhr => true
+ post geocoder_search_latlon_path(:lat => -91.23, :lon => 4.56, :zoom => 16), :xhr => true
results_check_error "Latitude -91.23 out of range"
- get geocoder_search_latlon_path(:lat => 91.23, :lon => 4.56, :zoom => 16), :xhr => true
+ post geocoder_search_latlon_path(:lat => 91.23, :lon => 4.56, :zoom => 16), :xhr => true
results_check_error "Latitude 91.23 out of range"
- get geocoder_search_latlon_path(:lat => 1.23, :lon => -180.23, :zoom => 16), :xhr => true
+ post geocoder_search_latlon_path(:lat => 1.23, :lon => -180.23, :zoom => 16), :xhr => true
results_check_error "Longitude -180.23 out of range"
- get geocoder_search_latlon_path(:lat => 1.23, :lon => 180.23, :zoom => 16), :xhr => true
+ post geocoder_search_latlon_path(:lat => 1.23, :lon => 180.23, :zoom => 16), :xhr => true
results_check_error "Longitude 180.23 out of range"
end
def test_search_latlon_digits
- get geocoder_search_latlon_path(:lat => 1.23, :lon => 4.56, :zoom => 16, :latlon_digits => true), :xhr => true
+ post geocoder_search_latlon_path(:lat => 1.23, :lon => 4.56, :zoom => 16, :latlon_digits => true), :xhr => true
results_check({ :name => "1.23, 4.56", :lat => 1.23, :lon => 4.56, :zoom => 16 },
{ :name => "4.56, 1.23", :lat => 4.56, :lon => 1.23, :zoom => 16 })
- get geocoder_search_latlon_path(:lat => -91.23, :lon => 4.56, :zoom => 16, :latlon_digits => true), :xhr => true
+ post geocoder_search_latlon_path(:lat => -91.23, :lon => 4.56, :zoom => 16, :latlon_digits => true), :xhr => true
results_check :name => "4.56, -91.23", :lat => 4.56, :lon => -91.23, :zoom => 16
- get geocoder_search_latlon_path(:lat => -1.23, :lon => 170.23, :zoom => 16, :latlon_digits => true), :xhr => true
+ post geocoder_search_latlon_path(:lat => -1.23, :lon => 170.23, :zoom => 16, :latlon_digits => true), :xhr => true
results_check :name => "-1.23, 170.23", :lat => -1.23, :lon => 170.23, :zoom => 16
- get geocoder_search_latlon_path(:lat => 91.23, :lon => 94.56, :zoom => 16, :latlon_digits => true), :xhr => true
+ post geocoder_search_latlon_path(:lat => 91.23, :lon => 94.56, :zoom => 16, :latlon_digits => true), :xhr => true
results_check_error "Latitude or longitude are out of range"
- get geocoder_search_latlon_path(:lat => -91.23, :lon => -94.56, :zoom => 16, :latlon_digits => true), :xhr => true
+ post geocoder_search_latlon_path(:lat => -91.23, :lon => -94.56, :zoom => 16, :latlon_digits => true), :xhr => true
results_check_error "Latitude or longitude are out of range"
- get geocoder_search_latlon_path(:lat => 1.23, :lon => -180.23, :zoom => 16, :latlon_digits => true), :xhr => true
+ post geocoder_search_latlon_path(:lat => 1.23, :lon => -180.23, :zoom => 16, :latlon_digits => true), :xhr => true
results_check_error "Latitude or longitude are out of range"
- get geocoder_search_latlon_path(:lat => 1.23, :lon => 180.23, :zoom => 16, :latlon_digits => true), :xhr => true
+ post geocoder_search_latlon_path(:lat => 1.23, :lon => 180.23, :zoom => 16, :latlon_digits => true), :xhr => true
results_check_error "Latitude or longitude are out of range"
end
- ##
- # Test the Canadian postcode search
- def test_search_ca_postcode
- with_http_stubs "geocoder_ca" do
- get geocoder_search_ca_postcode_path(:query => "A1B 2C3", :zoom => 10,
- :minlon => -0.559, :minlat => 51.217,
- :maxlon => 0.836, :maxlat => 51.766), :xhr => true
-
- results_check :name => "A1B 2C3", :lat => "47.172520", :lon => "-55.440515"
-
- get geocoder_search_ca_postcode_path(:query => "k1a 0b1", :zoom => 10,
- :minlon => -0.559, :minlat => 51.217,
- :maxlon => 0.836, :maxlat => 51.766), :xhr => true
- results_check :name => "K1A 0B1", :lat => "45.375437", :lon => "-75.691041"
-
- get geocoder_search_ca_postcode_path(:query => "Q0Q 0Q0", :zoom => 10,
- :minlon => -0.559, :minlat => 51.217,
- :maxlon => 0.836, :maxlat => 51.766), :xhr => true
- results_check
- end
- end
-
##
# Test the nominatim forward search
def test_search_osm_nominatim
with_http_stubs "nominatim" do
- get geocoder_search_osm_nominatim_path(:query => "Hoddesdon", :zoom => 10,
- :minlon => -0.559, :minlat => 51.217,
- :maxlon => 0.836, :maxlat => 51.766), :xhr => true
+ post geocoder_search_osm_nominatim_path(:query => "Hoddesdon", :zoom => 10,
+ :minlon => -0.559, :minlat => 51.217,
+ :maxlon => 0.836, :maxlat => 51.766), :xhr => true
results_check "name" => "Hoddesdon, Hertfordshire, East of England, England, United Kingdom",
"min-lat" => 51.7216709, "max-lat" => 51.8016709,
"min-lon" => -0.0512898, "max-lon" => 0.0287102,
"type" => "node", "id" => 18007599
- get geocoder_search_osm_nominatim_path(:query => "Broxbourne", :zoom => 10,
- :minlon => -0.559, :minlat => 51.217,
- :maxlon => 0.836, :maxlat => 51.766), :xhr => true
+ post geocoder_search_osm_nominatim_path(:query => "Broxbourne", :zoom => 10,
+ :minlon => -0.559, :minlat => 51.217,
+ :maxlon => 0.836, :maxlat => 51.766), :xhr => true
results_check({ "prefix" => "Suburb",
"name" => "Broxbourne, Hertfordshire, East of England, England, United Kingdom",
"min-lat" => 51.7265723, "max-lat" => 51.7665723,
end
end
- ##
- # Test the geonames forward search
- def test_search_geonames
- with_http_stubs "geonames" do
- get geocoder_search_geonames_path(:query => "Hoddesdon", :zoom => 10, :minlon => -0.559, :minlat => 51.217,
- :maxlon => 0.836, :maxlat => 51.766), :xhr => true
- results_check :name => "Hoddesdon", :lat => 51.76148, :lon => -0.01144
-
- get geocoder_search_geonames_path(:query => "Broxbourne", :zoom => 10,
- :minlon => -0.559, :minlat => 51.217,
- :maxlon => 0.836, :maxlat => 51.766), :xhr => true
- results_check({ :name => "Broxbourne", :lat => 51.74712, :lon => -0.01923 },
- { :name => "Broxbourne District", :lat => 51.73026, :lon => -0.04821 },
- { :name => "Cheshunt", :lat => 51.70791, :lon => -0.03739 },
- { :name => "Hoddesdon", :lat => 51.76148, :lon => -0.01144 },
- { :name => "Waltham Cross", :lat => 51.68905, :lon => -0.0333 },
- { :name => "Goffs Oak", :lat => 51.71015, :lon => -0.0872 },
- { :name => "Wormley", :lat => 51.7324, :lon => -0.0242 },
- { :name => "Broxbourne", :lat => -27.50314, :lon => 151.378 },
- { :name => "Lee Valley White Water Centre", :lat => 51.68814, :lon => -0.01682 },
- { :name => "Cheshunt Railway Station", :lat => 51.703, :lon => -0.024 },
- { :name => "Theobalds Grove Railway Station", :lat => 51.692, :lon => -0.035 },
- { :name => "Waltham Cross Railway Station", :lat => 51.685, :lon => -0.027 },
- { :name => "Rye House Station", :lat => 51.76938, :lon => 0.00562 },
- { :name => "Broxbourne Station", :lat => 51.74697, :lon => -0.01105 },
- { :name => "Broxbornebury Park", :lat => 51.75252, :lon => -0.03839 },
- { :name => "Marriott Cheshunt", :lat => 51.7208, :lon => -0.0324 },
- { :name => "Cheshunt Community Hospital", :lat => 51.68396, :lon => -0.03951 })
- end
- end
-
##
# Test the nominatim reverse search
def test_search_osm_nominatim_reverse
with_http_stubs "nominatim" do
- get geocoder_search_osm_nominatim_reverse_path(:lat => 51.7632, :lon => -0.0076, :zoom => 15), :xhr => true
+ post geocoder_search_osm_nominatim_reverse_path(:lat => 51.7632, :lon => -0.0076, :zoom => 15), :xhr => true
results_check :name => "Broxbourne, Hertfordshire, East of England, England, United Kingdom",
:lat => 51.7465723, :lon => -0.0190782,
:type => "node", :id => 28825933, :zoom => 15
- get geocoder_search_osm_nominatim_reverse_path(:lat => 51.7632, :lon => -0.0076, :zoom => 17), :xhr => true
+ post geocoder_search_osm_nominatim_reverse_path(:lat => 51.7632, :lon => -0.0076, :zoom => 17), :xhr => true
results_check :name => "Dinant Link Road, Broxbourne, Hertfordshire, East of England, England, EN11 8HX, United Kingdom",
:lat => 51.7634883, :lon => -0.0088373,
:type => "way", :id => 3489841, :zoom => 17
- get geocoder_search_osm_nominatim_reverse_path(:lat => 13.7709, :lon => 100.50507, :zoom => 19), :xhr => true
+ post geocoder_search_osm_nominatim_reverse_path(:lat => 13.7709, :lon => 100.50507, :zoom => 19), :xhr => true
results_check :name => "MM Steak&Grill, ถนนศรีอยุธยา, บางขุนพรหม, กรุงเทพมหานคร, เขตดุสิต, กรุงเทพมหานคร, 10300, ประเทศไทย",
:lat => 13.7708691, :lon => 100.505073233221,
:type => "way", :id => 542901374, :zoom => 19
end
end
- ##
- # Test the geonames reverse search
- def test_search_geonames_reverse
- with_http_stubs "geonames" do
- get geocoder_search_geonames_reverse_path(:lat => 51.7632, :lon => -0.0076, :zoom => 15), :xhr => true
- results_check :name => "England", :suffix => ", United Kingdom",
- :lat => 51.7632, :lon => -0.0076
- end
- end
-
private
def latlon_check(query, lat, lon)
assert_response :success
assert_template :search
assert_template :layout => "map"
- assert_equal %w[latlon osm_nominatim_reverse geonames_reverse], assigns(:sources)
+ assert_equal %w[latlon osm_nominatim_reverse], assigns(:sources).pluck(:name)
assert_nil @controller.params[:query]
- assert_in_delta lat, @controller.params[:lat]
- assert_in_delta lon, @controller.params[:lon]
+ assert_match(/^[+-]?\d+(?:\.\d+)?$/, @controller.params[:lat])
+ assert_match(/^[+-]?\d+(?:\.\d+)?$/, @controller.params[:lon])
+ assert_in_delta lat, @controller.params[:lat].to_f
+ assert_in_delta lon, @controller.params[:lon].to_f
get search_path(:query => query), :xhr => true
assert_response :success
assert_template :search
assert_template :layout => "xhr"
- assert_equal %w[latlon osm_nominatim_reverse geonames_reverse], assigns(:sources)
+ assert_equal %w[latlon osm_nominatim_reverse], assigns(:sources).pluck(:name)
assert_nil @controller.params[:query]
- assert_in_delta lat, @controller.params[:lat]
- assert_in_delta lon, @controller.params[:lon]
+ assert_match(/^[+-]?\d+(?:\.\d+)?$/, @controller.params[:lat])
+ assert_match(/^[+-]?\d+(?:\.\d+)?$/, @controller.params[:lon])
+ assert_in_delta lat, @controller.params[:lat].to_f
+ assert_in_delta lon, @controller.params[:lon].to_f
end
def search_check(query, sources)
assert_response :success
assert_template :search
assert_template :layout => "map"
- assert_equal sources, assigns(:sources)
+ assert_equal sources, assigns(:sources).pluck(:name)
get search_path(:query => query), :xhr => true
assert_response :success
assert_template :search
assert_template :layout => "xhr"
- assert_equal sources, assigns(:sources)
+ assert_equal sources, assigns(:sources).pluck(:name)
end
def results_check(*results)
assert_select "li.search_results_entry", results.count
results.each do |result|
- attrs = result.collect { |k, v| "[data-#{k}='#{v}']" }.join("")
+ attrs = result.collect { |k, v| "[data-#{k}='#{v}']" }.join
assert_select "li.search_results_entry a.set_position#{attrs}", result[:name]
end
end
assert_response :success
assert_template :error
assert_template :layout => nil
- assert_select "p.search_results_error", error
+ assert_select ".alert.alert-danger", error
end
end
projects / rails.git / blobdiff