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

[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 f9f49db15c736186f31be61c36bba57138bac1f8..ea284f29b97d87f0ee2508697b6afb1228c8a5b2 100644 (file)
--- a/app/assets/javascripts/index/contextmenu.js
+++ b/app/assets/javascripts/index/contextmenu.js
@@ -1,55 +1,62 @@
+//= require qs/dist/qs
+
 OSM.initializeContextMenu = function (map) {
   map.contextmenu.addItem({
-    text: "Directions from here",
+    text: I18n.t("javascripts.context.directions_from"),
     callback: function directionsFromHere(e) {
       var precision = OSM.zoomPrecision(map.getZoom()),
           latlng = e.latlng.wrap(),
           lat = latlng.lat.toFixed(precision),
           lng = latlng.lng.toFixed(precision);
 
-      OSM.router.route("/directions?" + querystring.stringify({
-        route: lat + "," + lng + ";" + $("#route_to").val()
+      OSM.router.route("/directions?" + Qs.stringify({
+        from: lat + "," + lng,
+        to: getDirectionsEndpointCoordinatesFromInput($("#route_to"))
       }));
     }
   });
 
   map.contextmenu.addItem({
-    text: "Directions to here",
+    text: I18n.t("javascripts.context.directions_to"),
     callback: function directionsToHere(e) {
       var precision = OSM.zoomPrecision(map.getZoom()),
           latlng = e.latlng.wrap(),
           lat = latlng.lat.toFixed(precision),
           lng = latlng.lng.toFixed(precision);
 
-      OSM.router.route("/directions?" + querystring.stringify({
-        route: $("#route_from").val() + ";" + lat + "," + lng
+      OSM.router.route("/directions?" + Qs.stringify({
+        from: getDirectionsEndpointCoordinatesFromInput($("#route_from")),
+        to: lat + "," + lng
       }));
     }
   });
 
   map.contextmenu.addItem({
-    text: "Add a note here",
+    text: I18n.t("javascripts.context.add_note"),
     callback: function addNoteHere(e) {
-      // I'd like this, instead of panning, to pass a query parameter about where to place the marker
-      map.panTo(e.latlng.wrap(), {animate: false});
-      OSM.router.route("/note/new");
+      var precision = OSM.zoomPrecision(map.getZoom()),
+          latlng = e.latlng.wrap(),
+          lat = latlng.lat.toFixed(precision),
+          lng = latlng.lng.toFixed(precision);
+
+      OSM.router.route("/note/new?lat=" + lat + "&lon=" + lng);
     }
   });
 
   map.contextmenu.addItem({
-    text: "Show address",
+    text: I18n.t("javascripts.context.show_address"),
     callback: function describeLocation(e) {
       var precision = OSM.zoomPrecision(map.getZoom()),
           latlng = e.latlng.wrap(),
           lat = latlng.lat.toFixed(precision),
           lng = latlng.lng.toFixed(precision);
 
-      OSM.router.route("/search?query=" + encodeURIComponent(lat + "," + lng));
+      OSM.router.route("/search?lat=" + encodeURIComponent(lat) + "&lon=" + encodeURIComponent(lng));
     }
   });
 
   map.contextmenu.addItem({
-    text: "Query features",
+    text: I18n.t("javascripts.context.query_features"),
     callback: function queryFeatures(e) {
       var precision = OSM.zoomPrecision(map.getZoom()),
           latlng = e.latlng.wrap(),
@@ -61,19 +68,26 @@ OSM.initializeContextMenu = function (map) {
   });
 
   map.contextmenu.addItem({
-    text: "Centre map here",
+    text: I18n.t("javascripts.context.centre_map"),
     callback: function centreMap(e) {
       map.panTo(e.latlng);
     }
   });
 
   map.on("mousedown", function (e) {
-    if (e.shiftKey) map.contextmenu.disable();
-  }).on("mouseup", function () {
-    map.contextmenu.enable();
+    if (e.originalEvent.shiftKey) map.contextmenu.disable();
+    else map.contextmenu.enable();
   });
 
-  var updateMenu = function updateMenu () {
+  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);
   };