cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'pull/4961'

Browse source
This commit is contained in:
Anton Khorev 2024-07-13 14:48:44 +03:00
commit 392d3d1226
3 changed files with 87 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

62
test/controllers/geocoder_controller_test.rb
View file

@ -60,6 +60,19 @@ class GeocoderControllerTest < ActionDispatch::IntegrationTest
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
@ -223,6 +236,43 @@ class GeocoderControllerTest < ActionDispatch::IntegrationTest
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 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
@ -368,8 +418,10 @@ class GeocoderControllerTest < ActionDispatch::IntegrationTest
assert_template :layout => "map"
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
@ -377,8 +429,10 @@ class GeocoderControllerTest < ActionDispatch::IntegrationTest
assert_template :layout => "xhr"
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)