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

[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 fdde8dec470d7e487f2f0cf05ee81661c61f67d3..ea284f29b97d87f0ee2508697b6afb1228c8a5b2 100644 (file)
--- a/app/assets/javascripts/index/contextmenu.js
+++ b/app/assets/javascripts/index/contextmenu.js
@@ -1,8 +1,6 @@
-//= require querystring
+//= require qs/dist/qs

 
 OSM.initializeContextMenu = function (map) {
 
 OSM.initializeContextMenu = function (map) {

-  var querystring = require("querystring-component");
-

   map.contextmenu.addItem({
     text: I18n.t("javascripts.context.directions_from"),
     callback: function directionsFromHere(e) {
   map.contextmenu.addItem({
     text: I18n.t("javascripts.context.directions_from"),
     callback: function directionsFromHere(e) {


@@ -11,9 +9,9 @@ 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,
         from: lat + "," + lng,

-        to: $("#route_to").val()
+        to: getDirectionsEndpointCoordinatesFromInput($("#route_to"))

       }));
     }
   });
       }));
     }
   });


@@ -26,8 +24,8 @@ 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({
-        from: $("#route_from").val(),
+      OSM.router.route("/directions?" + Qs.stringify({
+        from: getDirectionsEndpointCoordinatesFromInput($("#route_from")),

         to: lat + "," + lng
       }));
     }
         to: lat + "," + lng
       }));
     }


@@ -53,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));

     }
   });
 
     }
   });
 


@@ -81,6 +79,14 @@ OSM.initializeContextMenu = function (map) {
     else map.contextmenu.enable();
   });
 
     else map.contextmenu.enable();
   });
 

+  function getDirectionsEndpointCoordinatesFromInput(input) {
+    if (input.attr("data-lat") && input.attr("data-lon")) {
+      return input.attr("data-lat") + "," + input.attr("data-lon");
+    } else {
+      return $(input).val();
+    }
+  }
+

   var updateMenu = function updateMenu() {
     map.contextmenu.setDisabled(2, map.getZoom() < 12);
     map.contextmenu.setDisabled(4, map.getZoom() < 14);
   var updateMenu = function updateMenu() {
     map.contextmenu.setDisabled(2, map.getZoom() < 12);
     map.contextmenu.setDisabled(4, map.getZoom() < 14);