X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/6db326aa1f084a062a3b658876bc01bf650f5702..f051a7c1f5d1999558caa9d3cbe8c36f8ac39c9b:/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 e3e30ce6b..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,9 +9,9 @@ OSM.initializeContextMenu = function (map) { lat = latlng.lat.toFixed(precision), lng = latlng.lng.toFixed(precision); - OSM.router.route("/directions?" + querystring.stringify({ + OSM.router.route("/directions?" + Qs.stringify({ from: lat + "," + lng, - to: $("#route_to").val() + to: getDirectionsEndpointCoordinatesFromInput($("#route_to")) })); } }); @@ -22,8 +24,8 @@ OSM.initializeContextMenu = function (map) { lat = latlng.lat.toFixed(precision), lng = latlng.lng.toFixed(precision); - OSM.router.route("/directions?" + querystring.stringify({ - from: $("#route_from").val(), + OSM.router.route("/directions?" + Qs.stringify({ + from: getDirectionsEndpointCoordinatesFromInput($("#route_from")), to: lat + "," + lng })); } @@ -49,7 +51,7 @@ OSM.initializeContextMenu = function (map) { lat = latlng.lat.toFixed(precision), lng = latlng.lng.toFixed(precision); - OSM.router.route("/search?whereami=1&query=" + encodeURIComponent(lat + "," + lng)); + OSM.router.route("/search?lat=" + encodeURIComponent(lat) + "&lon=" + encodeURIComponent(lng)); } }); @@ -77,6 +79,14 @@ OSM.initializeContextMenu = function (map) { 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 updateMenu = function updateMenu() { map.contextmenu.setDisabled(2, map.getZoom() < 12); map.contextmenu.setDisabled(4, map.getZoom() < 14);