X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/d716e4095bc3bb2bb991cb7857d98f2f1418ba04..1bee96ede16e1dab41ad82efb9f2486da68a642f:/app/assets/javascripts/index/contextmenu.js?ds=inline diff --git a/app/assets/javascripts/index/contextmenu.js b/app/assets/javascripts/index/contextmenu.js index b19c5d34f..ea284f29b 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: getDirectionsEndpointCoordinatesFromInput($("#route_to")) })); } }); @@ -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: getDirectionsEndpointCoordinatesFromInput($("#route_from")), + 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?lat=" + encodeURIComponent(lat) + "&lon=" + encodeURIComponent(lng)); } }); @@ -72,11 +76,18 @@ 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 () { + 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); };