X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/846353303bcd718bb509567622af8a53a4c1421a..7869631e83a7686c06d92aaefb8a23245e930b57:/app/assets/javascripts/index/directions.js?ds=inline diff --git a/app/assets/javascripts/index/directions.js b/app/assets/javascripts/index/directions.js index 3d6da84fc..89888bbd1 100644 --- a/app/assets/javascripts/index/directions.js +++ b/app/assets/javascripts/index/directions.js @@ -4,6 +4,7 @@ OSM.Directions = function (map) { let controller = null; // the AbortController for the current route request if a route request is in progress + let lastLocation = []; let chosenEngine; const popup = L.popup({ autoPanPadding: [100, 100] }); @@ -36,23 +37,14 @@ OSM.Directions = function (map) { OSM.DirectionsEndpoint(map, $("input[name='route_to']"), OSM.MARKER_RED, endpointDragCallback, endpointChangeCallback) ]; + let downloadURL = null; + const expiry = new Date(); expiry.setYear(expiry.getFullYear() + 10); - const engines = OSM.Directions.engines; - - engines.sort(function (a, b) { - const localised_a = I18n.t("javascripts.directions.engines." + a.id), - localised_b = I18n.t("javascripts.directions.engines." + b.id); - return localised_a.localeCompare(localised_b); - }); - + const modeGroup = $(".routing_modes"); const select = $("select.routing_engines"); - engines.forEach(function (engine, i) { - select.append(""); - }); - $(".directions_form .reverse_directions").on("click", function () { const coordFrom = endpoints[0].latlng, coordTo = endpoints[1].latlng; @@ -96,15 +88,33 @@ OSM.Directions = function (map) { return h + ":" + (m < 10 ? "0" : "") + m; } - function findEngine(id) { - return engines.findIndex(function (engine) { - return engine.id === id; - }); - } + function setEngine(id) { + const engines = OSM.Directions.engines; + const desired = engines.find(engine => engine.id === id); + if (!desired || (chosenEngine && chosenEngine.id === id)) return; + chosenEngine = desired; + + const modes = engines + .filter(engine => engine.provider === chosenEngine.provider) + .map(engine => engine.mode); + modeGroup + .find("input[id]") + .prop("disabled", function () { + return !modes.includes(this.id); + }) + .prop("checked", function () { + return this.id === chosenEngine.mode; + }); - function setEngine(index) { - chosenEngine = engines[index]; - select.val(index); + const providers = engines + .filter(engine => engine.mode === chosenEngine.mode) + .map(engine => engine.provider); + select + .find("option[value]") + .prop("disabled", function () { + return !providers.includes(this.value); + }); + select.val(chosenEngine.provider); } function getRoute(fitRoute, reportErrors) { @@ -124,7 +134,7 @@ OSM.Directions = function (map) { // copy loading item to sidebar and display it. we copy it, rather than // just using it in-place and replacing it in case it has to be used // again. - $("#sidebar_content").html($(".directions_form .loader_copy").html()); + $("#directions_content").html($(".directions_form .loader_copy").html()); map.setSidebarOverlaid(false); controller = new AbortController(); chosenEngine.getRoute(points, controller.signal).then(function (route) { @@ -148,16 +158,10 @@ OSM.Directions = function (map) { const turnByTurnTable = $("") .append($("")); - const directionsCloseButton = $(""); - row.append(" "); + if (direction) { + row.append(""); + } else { + row.append("
"); + } row.append("" + instruction); row.append("" + getDistText(dist)); @@ -189,21 +197,23 @@ OSM.Directions = function (map) { turnByTurnTable.append(row); }); - $("#sidebar_content").append("

" + + const blob = new Blob([JSON.stringify(polyline.toGeoJSON())], { type: "application/json" }); + URL.revokeObjectURL(downloadURL); + downloadURL = URL.createObjectURL(blob); + + $("#directions_content").append(`

${ + I18n.t("javascripts.directions.download") + }

`); + + $("#directions_content").append("

" + I18n.t("javascripts.directions.instructions.courtesy", { link: chosenEngine.creditline }) + "

"); - - directionsCloseButton.on("click", function () { - map.removeLayer(polyline); - $("#sidebar_content").html(""); - popup.close(); - map.setSidebarOverlaid(true); - // TODO: collapse width of sidebar back to previous - }); }).catch(function () { map.removeLayer(polyline); if (reportErrors) { - $("#sidebar_content").html("
" + I18n.t("javascripts.directions.errors.no_route") + "
"); + $("#directions_content").html("
" + I18n.t("javascripts.directions.errors.no_route") + "
"); } }).finally(function () { controller = null; @@ -218,14 +228,26 @@ OSM.Directions = function (map) { } } - let chosenEngineIndex = findEngine("fossgis_osrm_car"); - if (Cookies.get("_osm_directions_engine")) { - chosenEngineIndex = findEngine(Cookies.get("_osm_directions_engine")); + function hideRoute(e) { + e.stopPropagation(); + map.removeLayer(polyline); + $("#directions_content").html(""); + popup.close(); + map.setSidebarOverlaid(true); + // TODO: collapse width of sidebar back to previous } - setEngine(chosenEngineIndex); + + setEngine("fossgis_osrm_car"); + setEngine(Cookies.get("_osm_directions_engine")); + + modeGroup.on("change", "input[name='modes']", function (e) { + setEngine(chosenEngine.provider + "_" + e.target.id); + Cookies.set("_osm_directions_engine", chosenEngine.id, { secure: true, expires: expiry, path: "/", samesite: "lax" }); + getRoute(true, true); + }); select.on("change", function (e) { - chosenEngine = engines[e.target.selectedIndex]; + setEngine(e.target.value + "_" + chosenEngine.mode); Cookies.set("_osm_directions_engine", chosenEngine.id, { secure: true, expires: expiry, path: "/", samesite: "lax" }); getRoute(true, true); }); @@ -246,11 +268,33 @@ OSM.Directions = function (map) { } }); - const page = {}; + function sendstartinglocation({ latlng: { lat, lng } }) { + map.fire("startinglocation", { latlng: [lat, lng] }); + } - page.pushstate = page.popstate = function () { - $(".search_form").hide(); - $(".directions_form").show(); + function startingLocationListener({ latlng }) { + if (endpoints[0].value) return; + endpoints[0].setValue(latlng.join(", ")); + } + + map.on("locationfound", ({ latlng: { lat, lng } }) => + lastLocation = [lat, lng] + ).on("locateactivate", () => { + map.once("startinglocation", startingLocationListener); + }); + + function initializeFromParams() { + const params = new URLSearchParams(location.search), + route = (params.get("route") || "").split(";"); + + if (params.has("engine")) setEngine(params.get("engine")); + + endpoints[0].setValue(params.get("from") || route[0] || lastLocation.join(", ")); + endpoints[1].setValue(params.get("to") || route[1] || ""); + } + + function enableListeners() { + $("#sidebar_content").on("click", ".btn-close", hideRoute); $("#map").on("dragend dragover", function (e) { e.preventDefault(); @@ -268,37 +312,53 @@ OSM.Directions = function (map) { endpoints[type === "from" ? 0 : 1].setValue(llWithPrecision.join(", ")); }); - endpoints[0].enable(); - endpoints[1].enable(); + map.on("locationfound", sendstartinglocation); - const params = new URLSearchParams(location.search), - route = (params.get("route") || "").split(";"); + endpoints[0].enableListeners(); + endpoints[1].enableListeners(); + } - if (params.has("engine")) { - const engineIndex = findEngine(params.get("engine")); + const page = {}; - if (engineIndex >= 0) { - setEngine(engineIndex); - } - } + page.pushstate = page.popstate = function () { + if ($("#directions_content").length) { + page.load(); + } else { + initializeFromParams(); - endpoints[0].setValue(params.get("from") || route[0] || ""); - endpoints[1].setValue(params.get("to") || route[1] || ""); + $(".search_form").hide(); + $(".directions_form").show(); - map.setSidebarOverlaid(!endpoints[0].latlng || !endpoints[1].latlng); + OSM.loadSidebarContent("/directions", enableListeners); + + map.setSidebarOverlaid(!endpoints[0].latlng || !endpoints[1].latlng); + } }; page.load = function () { - page.pushstate(); + initializeFromParams(); + + $(".search_form").hide(); + $(".directions_form").show(); + + enableListeners(); + + map.setSidebarOverlaid(!endpoints[0].latlng || !endpoints[1].latlng); }; page.unload = function () { $(".search_form").show(); $(".directions_form").hide(); + + $("#sidebar_content").off("click", ".btn-close", hideRoute); $("#map").off("dragend dragover drop"); + map.off("locationfound", sendstartinglocation); + + endpoints[0].disableListeners(); + endpoints[1].disableListeners(); - endpoints[0].disable(); - endpoints[1].disable(); + endpoints[0].clearValue(); + endpoints[1].clearValue(); map .removeLayer(popup) @@ -311,7 +371,8 @@ OSM.Directions = function (map) { OSM.Directions.engines = []; OSM.Directions.addEngine = function (engine, supportsHTTPS) { - if (document.location.protocol === "http:" || supportsHTTPS) { + if (location.protocol === "http:" || supportsHTTPS) { + engine.id = engine.provider + "_" + engine.mode; OSM.Directions.engines.push(engine); } };