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

Merge remote-tracking branch 'upstream/pull/4938'

Browse source
This commit is contained in:
Tom Hughes 2024-07-02 21:07:27 +01:00
commit f9db802c7b
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/geocoder_controller.rb
View file

@ -218,7 +218,7 @@ class GeocoderController < ApplicationController
query.match(/^(\d{1,3})°?\s*(\d{1,2})['′]?(?:\s*(\d{1,3}(\.\d*)?)?["″]?)?\s*([NS])\W*(\d{1,3})°?\s*(\d{1,2})['′]?(?:\s*(\d{1,3}(\.\d*)?)?["″]?)?\s*([EW])$/).try(:captures) # degrees, minutes, decimal seconds [NSEW]
params.merge!(dms_to_decdeg(latlon)).delete(:query)
elsif latlon = query.match(/^([+-]?\d+(\.\d*)?)(?:\s+|\s*,\s*)([+-]?\d+(\.\d*)?)$/)
elsif latlon = query.match(%r{^([+-]?\d+(\.\d*)?)(?:\s+|\s*[,/]\s*)([+-]?\d+(\.\d*)?)$})
params.merge!(:lat => latlon[1].to_f, :lon => latlon[3].to_f).delete(:query)
params[:latlon_digits] = true unless params[:whereami]

4
test/controllers/geocoder_controller_test.rb
View file

@ -37,9 +37,11 @@ class GeocoderControllerTest < ActionDispatch::IntegrationTest
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