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

[rails.git] / app / controllers / geocoder_controller.rb

diff --git a/app/controllers/geocoder_controller.rb b/app/controllers/geocoder_controller.rb
index ee3c3479c49bf260fb56d02db8fd4711d97f70ee..8ec0ab6b70acbb6c6e645e9a25229347ebfa0c9b 100644 (file)
--- a/app/controllers/geocoder_controller.rb
+++ b/app/controllers/geocoder_controller.rb
@@ -221,7 +221,7 @@ class GeocoderController < ApplicationController
       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)
 
       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]
+        params[:latlon_digits] = true

       end
     end
 
       end
     end