X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/0e78061cdba5cfb3f299f57b7643d2b396ee235b..ba3d3269e3a08bc0b23d1f1a6584081702c70072:/test/controllers/geocoder_controller_test.rb?ds=inline diff --git a/test/controllers/geocoder_controller_test.rb b/test/controllers/geocoder_controller_test.rb index d0f0ce086..dd740e570 100644 --- a/test/controllers/geocoder_controller_test.rb +++ b/test/controllers/geocoder_controller_test.rb @@ -9,29 +9,17 @@ class GeocoderControllerTest < ActionDispatch::IntegrationTest { :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 ## @@ -263,95 +251,73 @@ class GeocoderControllerTest < ActionDispatch::IntegrationTest ## # 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, @@ -370,68 +336,27 @@ class GeocoderControllerTest < ActionDispatch::IntegrationTest 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) @@ -439,7 +364,7 @@ class GeocoderControllerTest < ActionDispatch::IntegrationTest 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) assert_nil @controller.params[:query] assert_in_delta lat, @controller.params[:lat] assert_in_delta lon, @controller.params[:lon] @@ -448,7 +373,7 @@ class GeocoderControllerTest < ActionDispatch::IntegrationTest 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) assert_nil @controller.params[:query] assert_in_delta lat, @controller.params[:lat] assert_in_delta lon, @controller.params[:lon]