-# coding: utf-8
-
require "test_helper"
require "geocoder_controller"
{ :path => "/geocoder/search_latlon", :method => :get },
{ :controller => "geocoder", :action => "search_latlon" }
)
- assert_routing(
- { :path => "/geocoder/search_us_postcode", :method => :get },
- { :controller => "geocoder", :action => "search_us_postcode" }
- )
- 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" }
get :search
assert_response :bad_request
- xhr :get, :search
+ get :search, :xhr => true
assert_response :bad_request
end
"12345",
"12345-6789"
].each do |code|
- post :search, :query => code
+ post :search, :params => { :query => code }
assert_response :success
- assert_equal %w[us_postcode osm_nominatim], assigns(:sources)
+ assert_equal %w[osm_nominatim], assigns(:sources)
end
end
"CR2 6XH",
"DN55 1PT"
].each do |code|
- search_check code, %w[uk_postcode osm_nominatim]
+ search_check code, %w[osm_nominatim]
end
end
##
# Test the builtin latitude+longitude search
def test_search_latlon
- xhr :get, :search_latlon, :lat => 1.23, :lon => 4.56, :zoom => 16
+ get :search_latlon, :params => { :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
- xhr :get, :search_latlon, :lat => -91.23, :lon => 4.56, :zoom => 16
+ get :search_latlon, :params => { :lat => -91.23, :lon => 4.56, :zoom => 16 }, :xhr => true
results_check_error "Latitude -91.23 out of range"
- xhr :get, :search_latlon, :lat => 91.23, :lon => 4.56, :zoom => 16
+ get :search_latlon, :params => { :lat => 91.23, :lon => 4.56, :zoom => 16 }, :xhr => true
results_check_error "Latitude 91.23 out of range"
- xhr :get, :search_latlon, :lat => 1.23, :lon => -180.23, :zoom => 16
+ get :search_latlon, :params => { :lat => 1.23, :lon => -180.23, :zoom => 16 }, :xhr => true
results_check_error "Longitude -180.23 out of range"
- xhr :get, :search_latlon, :lat => 1.23, :lon => 180.23, :zoom => 16
+ get :search_latlon, :params => { :lat => 1.23, :lon => 180.23, :zoom => 16 }, :xhr => true
results_check_error "Longitude 180.23 out of range"
end
- ##
- # Test the US postcode search
- def test_search_us_postcode
- with_http_stubs "geocoder_us" do
- xhr :get, :search_us_postcode,
- :query => "90210", :zoom => 10,
- :minlon => -0.559, :minlat => 51.217,
- :maxlon => 0.836, :maxlat => 51.766
- results_check :prefix => "Beverly Hills, CA,", :name => "90210",
- :lat => 34.088808, :lon => -118.40612
-
- xhr :get, :search_us_postcode,
- :query => "00000", :zoom => 10,
- :minlon => -0.559, :minlat => 51.217,
- :maxlon => 0.836, :maxlat => 51.766
- results_check
- end
- end
+ def test_search_latlon_digits
+ get :search_latlon, :params => { :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 })
- ##
- # Test the UK postcode search
- def test_search_uk_postcode
- with_http_stubs "npemap" do
- xhr :get, :search_uk_postcode,
- :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
-
- xhr :get, :search_uk_postcode,
- :query => "XX9 9XX", :zoom => 10,
- :minlon => -0.559, :minlat => 51.217,
- :maxlon => 0.836, :maxlat => 51.766
- results_check
- end
+ get :search_latlon, :params => { :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 :search_latlon, :params => { :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 :search_latlon, :params => { :lat => 91.23, :lon => 94.56, :zoom => 16, :latlon_digits => true }, :xhr => true
+ results_check_error "Latitude or longitude are out of range"
+
+ get :search_latlon, :params => { :lat => -91.23, :lon => -94.56, :zoom => 16, :latlon_digits => true }, :xhr => true
+ results_check_error "Latitude or longitude are out of range"
+
+ get :search_latlon, :params => { :lat => 1.23, :lon => -180.23, :zoom => 16, :latlon_digits => true }, :xhr => true
+ results_check_error "Latitude or longitude are out of range"
+
+ get :search_latlon, :params => { :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
- xhr :get, :search_ca_postcode,
- :query => "A1B 2C3", :zoom => 10,
- :minlon => -0.559, :minlat => 51.217,
- :maxlon => 0.836, :maxlat => 51.766
+ get :search_ca_postcode, :xhr => true,
+ :params => { :query => "A1B 2C3", :zoom => 10,
+ :minlon => -0.559, :minlat => 51.217,
+ :maxlon => 0.836, :maxlat => 51.766 }
results_check :name => "A1B 2C3", :lat => "47.172520", :lon => "-55.440515"
- xhr :get, :search_ca_postcode,
- :query => "k1a 0b1", :zoom => 10,
- :minlon => -0.559, :minlat => 51.217,
- :maxlon => 0.836, :maxlat => 51.766
+ get :search_ca_postcode, :xhr => true,
+ :params => { :query => "k1a 0b1", :zoom => 10,
+ :minlon => -0.559, :minlat => 51.217,
+ :maxlon => 0.836, :maxlat => 51.766 }
results_check :name => "K1A 0B1", :lat => "45.375437", :lon => "-75.691041"
- xhr :get, :search_ca_postcode,
- :query => "Q0Q 0Q0", :zoom => 10,
- :minlon => -0.559, :minlat => 51.217,
- :maxlon => 0.836, :maxlat => 51.766
+ get :search_ca_postcode, :xhr => true,
+ :params => { :query => "Q0Q 0Q0", :zoom => 10,
+ :minlon => -0.559, :minlat => 51.217,
+ :maxlon => 0.836, :maxlat => 51.766 }
results_check
end
end
# Test the nominatim forward search
def test_search_osm_nominatim
with_http_stubs "nominatim" do
- xhr :get, :search_osm_nominatim,
- :query => "Hoddesdon", :zoom => 10,
- :minlon => -0.559, :minlat => 51.217,
- :maxlon => 0.836, :maxlat => 51.766
+ get :search_osm_nominatim, :xhr => true,
+ :params => { :query => "Hoddesdon", :zoom => 10,
+ :minlon => -0.559, :minlat => 51.217,
+ :maxlon => 0.836, :maxlat => 51.766 }
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
- xhr :get, :search_osm_nominatim,
- :query => "Broxbourne", :zoom => 10,
- :minlon => -0.559, :minlat => 51.217,
- :maxlon => 0.836, :maxlat => 51.766
+ get :search_osm_nominatim, :xhr => true,
+ :params => { :query => "Broxbourne", :zoom => 10,
+ :minlon => -0.559, :minlat => 51.217,
+ :maxlon => 0.836, :maxlat => 51.766 }
results_check({ "prefix" => "Suburb",
"name" => "Broxbourne, Hertfordshire, East of England, England, United Kingdom",
"min-lat" => 51.7265723, "max-lat" => 51.7665723,
# Test the geonames forward search
def test_search_geonames
with_http_stubs "geonames" do
- xhr :get, :search_geonames,
- :query => "Hoddesdon", :zoom => 10,
- :minlon => -0.559, :minlat => 51.217,
- :maxlon => 0.836, :maxlat => 51.766
+ get :search_geonames, :xhr => true,
+ :params => { :query => "Hoddesdon", :zoom => 10,
+ :minlon => -0.559, :minlat => 51.217,
+ :maxlon => 0.836, :maxlat => 51.766 }
results_check :name => "Hoddesdon", :lat => 51.76148, :lon => -0.01144
- xhr :get, :search_geonames,
- :query => "Broxbourne", :zoom => 10,
- :minlon => -0.559, :minlat => 51.217,
- :maxlon => 0.836, :maxlat => 51.766
+ get :search_geonames, :xhr => true,
+ :params => { :query => "Broxbourne", :zoom => 10,
+ :minlon => -0.559, :minlat => 51.217,
+ :maxlon => 0.836, :maxlat => 51.766 }
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 },
# Test the nominatim reverse search
def test_search_osm_nominatim_reverse
with_http_stubs "nominatim" do
- xhr :get, :search_osm_nominatim_reverse, :lat => 51.7632, :lon => -0.0076, :zoom => 15
+ get :search_osm_nominatim_reverse, :xhr => true,
+ :params => { :lat => 51.7632, :lon => -0.0076, :zoom => 15 }
results_check :name => "Broxbourne, Hertfordshire, East of England, England, United Kingdom",
:lat => 51.7465723, :lon => -0.0190782,
:type => "node", :id => 28825933, :zoom => 15
- xhr :get, :search_osm_nominatim_reverse, :lat => 51.7632, :lon => -0.0076, :zoom => 17
+ get :search_osm_nominatim_reverse, :xhr => true,
+ :params => { :lat => 51.7632, :lon => -0.0076, :zoom => 17 }
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
# Test the geonames reverse search
def test_search_geonames_reverse
with_http_stubs "geonames" do
- xhr :get, :search_geonames_reverse, :lat => 51.7632, :lon => -0.0076, :zoom => 15
+ get :search_geonames_reverse, :xhr => true,
+ :params => { :lat => 51.7632, :lon => -0.0076, :zoom => 15 }
results_check :name => "England", :suffix => ", United Kingdom",
:lat => 51.7632, :lon => -0.0076
end
private
def latlon_check(query, lat, lon)
- get :search, :query => query
+ get :search, :params => { :query => query }
assert_response :success
assert_template :search
assert_template :layout => "map"
assert_in_delta lat, @controller.params[:lat]
assert_in_delta lon, @controller.params[:lon]
- xhr :get, :search, :query => query
+ get :search, :params => { :query => query }, :xhr => true
assert_response :success
assert_template :search
assert_template :layout => "xhr"
end
def search_check(query, sources)
- get :search, :query => query
+ get :search, :params => { :query => query }
assert_response :success
assert_template :search
assert_template :layout => "map"
assert_equal sources, assigns(:sources)
- xhr :get, :search, :query => query
+ get :search, :params => { :query => query }, :xhr => true
assert_response :success
assert_template :search
assert_template :layout => "xhr"
projects / rails.git / blobdiff