From: Ilya Zverev <zverik@textual.ru>
Date: Mon, 3 Sep 2018 09:05:25 +0000 (+0300)
Subject: Do not display two coordinates on 'where am I' click
X-Git-Tag: live~2901
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/67925e6d98c3834d7dbb431295e7dd2d093b8250?hp=d792a3bab59cd2f171c49d8d63937db3cbc9b0bc

Do not display two coordinates on 'where am I' click

Closes #1968
---

diff --git a/app/assets/javascripts/index/contextmenu.js b/app/assets/javascripts/index/contextmenu.js
index 1ee703e60..080a4de72 100644
--- a/app/assets/javascripts/index/contextmenu.js
+++ b/app/assets/javascripts/index/contextmenu.js
@@ -49,7 +49,7 @@ OSM.initializeContextMenu = function (map) {
           lat = latlng.lat.toFixed(precision),
           lng = latlng.lng.toFixed(precision);
 
-      OSM.router.route("/search?query=" + encodeURIComponent(lat + "," + lng));
+      OSM.router.route("/search?whereami=1&query=" + encodeURIComponent(lat + "," + lng));
     }
   });
 
diff --git a/app/assets/javascripts/index/search.js b/app/assets/javascripts/index/search.js
index 52af38c54..ea6140e58 100644
--- a/app/assets/javascripts/index/search.js
+++ b/app/assets/javascripts/index/search.js
@@ -34,7 +34,7 @@ OSM.Search = function(map) {
     e.preventDefault();
     var center = map.getCenter().wrap(),
       precision = OSM.zoomPrecision(map.getZoom());
-    OSM.router.route("/search?query=" + encodeURIComponent(
+    OSM.router.route("/search?whereami=1&query=" + encodeURIComponent(
       center.lat.toFixed(precision) + "," + center.lng.toFixed(precision)
     ));
   });
diff --git a/app/controllers/geocoder_controller.rb b/app/controllers/geocoder_controller.rb
index d92da72b1..da5245687 100644
--- a/app/controllers/geocoder_controller.rb
+++ b/app/controllers/geocoder_controller.rb
@@ -305,7 +305,9 @@ class GeocoderController < ApplicationController
         params.merge!(dms_to_decdeg(latlon)).delete(:query)
 
       elsif latlon = query.match(/^\s*([+-]?\d+(\.\d*)?)\s*[\s,]\s*([+-]?\d+(\.\d*)?)\s*$/)
-        params.merge!(:lat => latlon[1].to_f, :lon => latlon[3].to_f, :latlon_digits => true).delete(:query)
+        params.merge!(:lat => latlon[1].to_f, :lon => latlon[3].to_f).delete(:query)
+
+        params[:latlon_digits] = true unless params[:whereami]
       end
     end