X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/1e9a3f8664a1715e59211d25dd7168b95b85fe72..12c1d5e6c05813a0697724277b4d8529a1a7c240:/app/assets/javascripts/index/contextmenu.js?ds=sidebyside diff --git a/app/assets/javascripts/index/contextmenu.js b/app/assets/javascripts/index/contextmenu.js index b19c5d34f..cac5e6fbf 100644 --- a/app/assets/javascripts/index/contextmenu.js +++ b/app/assets/javascripts/index/contextmenu.js @@ -1,3 +1,5 @@ +//= require qs/dist/qs + OSM.initializeContextMenu = function (map) { map.contextmenu.addItem({ text: I18n.t("javascripts.context.directions_from"), @@ -7,8 +9,9 @@ OSM.initializeContextMenu = function (map) { 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: $("#route_to").val() })); } }); @@ -21,8 +24,9 @@ OSM.initializeContextMenu = function (map) { 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: $("#route_from").val(), + to: lat + "," + lng })); } }); @@ -47,7 +51,7 @@ OSM.initializeContextMenu = function (map) { lat = latlng.lat.toFixed(precision), lng = latlng.lng.toFixed(precision); - OSM.router.route("/search?query=" + encodeURIComponent(lat + "," + lng)); + OSM.router.route("/search?whereami=1&query=" + encodeURIComponent(lat + "," + lng)); } }); @@ -72,11 +76,10 @@ OSM.initializeContextMenu = function (map) { map.on("mousedown", function (e) { if (e.originalEvent.shiftKey) map.contextmenu.disable(); - }).on("mouseup", function () { - map.contextmenu.enable(); + else map.contextmenu.enable(); }); - var updateMenu = function updateMenu () { + var updateMenu = function updateMenu() { map.contextmenu.setDisabled(2, map.getZoom() < 12); map.contextmenu.setDisabled(4, map.getZoom() < 14); };