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

diff --cc app/controllers/geocoder_controller.rb
index ca6bab6df88a1e79ed4947391d22864e639c6d80,02ebc8a1bccb565796a62cafb911bbd7bdd17647..43f276efa020a35cfdbb1719155c4a3f5e61c1fe
--- 1/app/controllers/geocoder_controller.rb
--- 2/app/controllers/geocoder_controller.rb
+++ b/app/controllers/geocoder_controller.rb
@@@ -224,8 -220,16 +220,16 @@@ class GeocoderController < ApplicationC
      params.permit(:query, :lat, :lon, :latlon_digits, :zoom, :minlat, :minlon, :maxlat, :maxlon)
    end
  
+   def dms_regexp(name_prefix)
+     /
+       (?: (?<#{name_prefix}d>\d{1,3}(?:\.\d+)?)°? ) |
+       (?: (?<#{name_prefix}d>\d{1,3})°?\s*(?<#{name_prefix}m>\d{1,2}(?:\.\d+)?)['′]? ) |
+       (?: (?<#{name_prefix}d>\d{1,3})°?\s*(?<#{name_prefix}m>\d{1,2})['′]?\s*(?<#{name_prefix}s>\d{1,2}(?:\.\d+)?)["″]? )
+     /x
+   end
+ 
    def to_decdeg(captures)
 -    ns = captures.fetch("ns").casecmp("s").zero? ? -1 : 1
 +    ns = captures.fetch("ns").casecmp?("s") ? -1 : 1
      nsd = BigDecimal(captures.fetch("nsd", "0"))
      nsm = BigDecimal(captures.fetch("nsm", "0"))
      nss = BigDecimal(captures.fetch("nss", "0"))

diff --cc test/controllers/geocoder_controller_test.rb
Simple merge