X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/a2cf9b5b9f568c614ad8bbf8a477326b01cefb57..6b0451124c0fe1cb7275ce973a069a125386558e:/app/assets/javascripts/index.js

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index 6f081c617..684685d51 100644
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -8,6 +8,7 @@
 //= require leaflet.polyline
 //= require leaflet.query
 //= require leaflet.contextmenu
+//= require index/contextmenu
 //= require index/search
 //= require index/browse
 //= require index/export
@@ -76,47 +77,6 @@ $(document).ready(function () {
 
   var params = OSM.mapParams();
 
-  // TODO consider using a separate js file for the context menu additions
-  var context_describe = function(e){
-    var precision = OSM.zoomPrecision(map.getZoom());
-    OSM.router.route("/search?query=" + encodeURIComponent(
-      e.latlng.lat.toFixed(precision) + "," + e.latlng.lng.toFixed(precision)
-    ));
-  };
-
-  var context_directionsfrom = function(e){
-    var precision = OSM.zoomPrecision(map.getZoom());
-    OSM.router.route("/directions?" + querystring.stringify({
-      route: e.latlng.lat.toFixed(precision) + ',' + e.latlng.lng.toFixed(precision) + ';' + $('#route_to').val()
-    }));
-  }
-
-  var context_directionsto = function(e){
-    var precision = OSM.zoomPrecision(map.getZoom());
-    OSM.router.route("/directions?" + querystring.stringify({
-      route: $('#route_from').val() + ';' + e.latlng.lat.toFixed(precision) + ',' + e.latlng.lng.toFixed(precision)
-    }));
-  }
-
-  var context_addnote = function(e){
-    // I'd like this, instead of panning, to pass a query parameter about where to place the marker
-    map.panTo(e.latlng, {animate: false});
-    OSM.router.route('/note/new');
-  }
-
-  var context_centrehere = function(e){
-    map.panTo(e.latlng);
-  }
-
-  var context_queryhere = function(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);
-  }
-
   // TODO internationalisation of the context menu strings
   var map = new L.OSM.Map("map", {
     zoomControl: false,
@@ -125,22 +85,22 @@ $(document).ready(function () {
     contextmenuWidth: 140,
     contextmenuItems: [{
         text: 'Directions from here',
-        callback: context_directionsfrom
+        callback: function(e){ context_directionsfrom(e, map); }
     }, {
         text: 'Directions to here',
-        callback: context_directionsto
+        callback: function(e){ context_directionsto(e, map); }
     }, '-', {
         text: 'Add a note here',
-        callback: context_addnote
+        callback: function(e){ context_addnote(e, map); }
     }, {
         text: 'Show address',
-        callback: context_describe
+        callback: function(e){ context_describe(e, map); }
     }, {
         text: 'Query features',
-        callback: context_queryhere
+        callback: function(e){ context_queryhere(e, map); }
     }, {
         text: 'Centre map here',
-        callback: context_centrehere
+        callback: function(e){ context_centrehere(e, map); }
     }]
   });