Don't send comment text when reopening a note

[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 4a8f3cc1eff6953a9d35bd725592dce7d8946cff..ea284f29b97d87f0ee2508697b6afb1228c8a5b2 100644 (file)
--- a/app/assets/javascripts/index/contextmenu.js
+++ b/app/assets/javascripts/index/contextmenu.js
@@ -1,46 +1,97 @@
-  var context_describe = function(e, map){
-    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));
-  };
+//= require qs/dist/qs
 
-  var context_directionsfrom = function(e, map){
-    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.initializeContextMenu = function (map) {
+  map.contextmenu.addItem({
+    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);
 
-  var context_directionsto = function(e, map){
-    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: lat + "," + lng,
+        to: getDirectionsEndpointCoordinatesFromInput($("#route_to"))
+      }));
+    }
+  });
 
-  var context_addnote = function(e, map){
-    // 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');
-  };
+  map.contextmenu.addItem({
+    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);
 
-  var context_centrehere = function(e, map){
-    map.panTo(e.latlng);
-  };
+      OSM.router.route("/directions?" + Qs.stringify({
+        from: getDirectionsEndpointCoordinatesFromInput($("#route_from")),
+        to: lat + "," + lng
+      }));
+    }
+  });
+
+  map.contextmenu.addItem({
+    text: I18n.t("javascripts.context.add_note"),
+    callback: function addNoteHere(e) {
+      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: 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?lat=" + encodeURIComponent(lat) + "&lon=" + encodeURIComponent(lng));
+    }
+  });
+
+  map.contextmenu.addItem({
+    text: I18n.t("javascripts.context.query_features"),
+    callback: function queryFeatures(e) {
+      var precision = OSM.zoomPrecision(map.getZoom()),
+          latlng = e.latlng.wrap(),
+          lat = latlng.lat.toFixed(precision),
+          lng = latlng.lng.toFixed(precision);
+
+      OSM.router.route("/query?lat=" + lat + "&lon=" + lng);
+    }
+  });
+
+  map.contextmenu.addItem({
+    text: I18n.t("javascripts.context.centre_map"),
+    callback: function centreMap(e) {
+      map.panTo(e.latlng);
+    }
+  });
+
+  map.on("mousedown", function (e) {
+    if (e.originalEvent.shiftKey) map.contextmenu.disable();
+    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 context_queryhere = function(e, map) {
-    var precision = OSM.zoomPrecision(map.getZoom()),
-      latlng = e.latlng.wrap(),
-      lat = latlng.lat.toFixed(precision),
-      lng = latlng.lng.toFixed(precision);
-    OSM.router.route("/query?lat=" + lat + "&lon=" + lng);
+  var updateMenu = function updateMenu() {
+    map.contextmenu.setDisabled(2, map.getZoom() < 12);
+    map.contextmenu.setDisabled(4, map.getZoom() < 14);
   };
 
+  map.on("zoomend", updateMenu);
+  updateMenu();
+};