X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/6209a9be78bd0a99f32e8351975beb67f2393bc7..ac7c45bca036db2c5bfd692d77ff7f1da526955f:/test/controllers/geocoder_controller_test.rb diff --git a/test/controllers/geocoder_controller_test.rb b/test/controllers/geocoder_controller_test.rb index d29d77e8b..e05c8d06a 100644 --- a/test/controllers/geocoder_controller_test.rb +++ b/test/controllers/geocoder_controller_test.rb @@ -1,5 +1,3 @@ -# coding: utf-8 - require "test_helper" require "geocoder_controller" @@ -15,10 +13,6 @@ class GeocoderControllerTest < ActionController::TestCase { :path => "/geocoder/search_latlon", :method => :get }, { :controller => "geocoder", :action => "search_latlon" } ) - assert_routing( - { :path => "/geocoder/search_uk_postcode", :method => :get }, - { :controller => "geocoder", :action => "search_uk_postcode" } - ) assert_routing( { :path => "/geocoder/search_ca_postcode", :method => :get }, { :controller => "geocoder", :action => "search_ca_postcode" } @@ -265,7 +259,7 @@ class GeocoderControllerTest < ActionController::TestCase "CR2 6XH", "DN55 1PT" ].each do |code| - search_check code, %w[uk_postcode osm_nominatim] + search_check code, %w[osm_nominatim] end end @@ -300,24 +294,6 @@ class GeocoderControllerTest < ActionController::TestCase results_check_error "Longitude 180.23 out of range" end - ## - # Test the UK postcode search - def test_search_uk_postcode - with_http_stubs "npemap" do - get :search_uk_postcode, :xhr => true, - :params => { :query => "CV4 7AL", :zoom => 10, - :minlon => -0.559, :minlat => 51.217, - :maxlon => 0.836, :maxlat => 51.766 } - results_check :name => "CV4 7AL", :lat => 52.381748701968, :lon => -1.56176420939232 - - get :search_uk_postcode, :xhr => true, - :params => { :query => "XX9 9XX", :zoom => 10, - :minlon => -0.559, :minlat => 51.217, - :maxlon => 0.836, :maxlat => 51.766 } - results_check - end - end - ## # Test the Canadian postcode search def test_search_ca_postcode @@ -426,6 +402,12 @@ class GeocoderControllerTest < ActionController::TestCase 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 :search_osm_nominatim_reverse, :xhr => true, + :params => { :lat => 13.7709, :lon => 100.50507, :zoom => 19 } + results_check :name => "MM Steak&Grill, ถนนศรีอยุธยา, บางขุนพรหม, กรุงเทพมหานคร, เขตดุสิต, กรุงเทพมหานคร, 10300, ประเทศไทย", + :lat => 13.7708691, :lon => 100.505073233221, + :type => "way", :id => 542901374, :zoom => 19 end end