Merge remote-tracking branch 'openstreetmap/pull/1445'

[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..b19c5d34f4f728a1b7b534c094cd577bf5221ece 100644 (file)
--- a/app/assets/javascripts/index/contextmenu.js
+++ b/app/assets/javascripts/index/contextmenu.js
@@ -1,6 +1,6 @@
 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(),
@@ -14,7 +14,7 @@ OSM.initializeContextMenu = function (map) {
   });
 
   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(),
@@ -28,16 +28,19 @@ OSM.initializeContextMenu = function (map) {
   });
 
   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(),
@@ -49,7 +52,7 @@ OSM.initializeContextMenu = function (map) {
   });
 
   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,14 +64,14 @@ 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();
+    if (e.originalEvent.shiftKey) map.contextmenu.disable();
   }).on("mouseup", function () {
     map.contextmenu.enable();
   });