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

[rails.git] / app / assets / javascripts / index / contextmenu.js

diff --git a/app/assets/javascripts/index/contextmenu.js b/app/assets/javascripts/index/contextmenu.js
index 080a4de72b14691b5328a8b12976f061901b23db..ffc0eadb771d24810ba21c2e1344d20484726f27 100644 (file)
--- a/app/assets/javascripts/index/contextmenu.js
+++ b/app/assets/javascripts/index/contextmenu.js
@@ -1,3 +1,5 @@
+//= require qs/dist/qs
+

 OSM.initializeContextMenu = function (map) {
   map.contextmenu.addItem({
     text: I18n.t("javascripts.context.directions_from"),
 OSM.initializeContextMenu = function (map) {
   map.contextmenu.addItem({
     text: I18n.t("javascripts.context.directions_from"),


@@ -7,7 +9,7 @@ OSM.initializeContextMenu = function (map) {
           lat = latlng.lat.toFixed(precision),
           lng = latlng.lng.toFixed(precision);
 
           lat = latlng.lat.toFixed(precision),
           lng = latlng.lng.toFixed(precision);
 

-      OSM.router.route("/directions?" + querystring.stringify({
+      OSM.router.route("/directions?" + Qs.stringify({

         from: lat + "," + lng,
         to: $("#route_to").val()
       }));
         from: lat + "," + lng,
         to: $("#route_to").val()
       }));


@@ -22,7 +24,7 @@ OSM.initializeContextMenu = function (map) {
           lat = latlng.lat.toFixed(precision),
           lng = latlng.lng.toFixed(precision);
 
           lat = latlng.lat.toFixed(precision),
           lng = latlng.lng.toFixed(precision);
 

-      OSM.router.route("/directions?" + querystring.stringify({
+      OSM.router.route("/directions?" + Qs.stringify({

         from: $("#route_from").val(),
         to: lat + "," + lng
       }));
         from: $("#route_from").val(),
         to: lat + "," + lng
       }));


@@ -49,7 +51,7 @@ OSM.initializeContextMenu = function (map) {
           lat = latlng.lat.toFixed(precision),
           lng = latlng.lng.toFixed(precision);
 
           lat = latlng.lat.toFixed(precision),
           lng = latlng.lng.toFixed(precision);
 

-      OSM.router.route("/search?whereami=1&query=" + encodeURIComponent(lat + "," + lng));
+      OSM.router.route("/search?lat=" + encodeURIComponent(lat) + "&lon=" + encodeURIComponent(lng));

     }
   });
 
     }
   });
 


@@ -77,7 +79,7 @@ OSM.initializeContextMenu = function (map) {
     else map.contextmenu.enable();
   });
 
     else map.contextmenu.enable();
   });
 

-  var updateMenu = function updateMenu () {
+  var updateMenu = function updateMenu() {

     map.contextmenu.setDisabled(2, map.getZoom() < 12);
     map.contextmenu.setDisabled(4, map.getZoom() < 14);
   };
     map.contextmenu.setDisabled(2, map.getZoom() < 12);
     map.contextmenu.setDisabled(4, map.getZoom() < 14);
   };