X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/b70da7b8ea15ab48bb2f34155567cea6dffc8fc9..f051a7c1f5d1999558caa9d3cbe8c36f8ac39c9b:/app/assets/javascripts/index/contextmenu.js diff --git a/app/assets/javascripts/index/contextmenu.js b/app/assets/javascripts/index/contextmenu.js index cac5e6fbf..ea284f29b 100644 --- a/app/assets/javascripts/index/contextmenu.js +++ b/app/assets/javascripts/index/contextmenu.js @@ -11,7 +11,7 @@ OSM.initializeContextMenu = function (map) { OSM.router.route("/directions?" + Qs.stringify({ from: lat + "," + lng, - to: $("#route_to").val() + to: getDirectionsEndpointCoordinatesFromInput($("#route_to")) })); } }); @@ -25,7 +25,7 @@ OSM.initializeContextMenu = function (map) { lng = latlng.lng.toFixed(precision); OSM.router.route("/directions?" + Qs.stringify({ - from: $("#route_from").val(), + from: getDirectionsEndpointCoordinatesFromInput($("#route_from")), to: lat + "," + lng })); } @@ -51,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)); } }); @@ -79,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);