X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/e89742928ddccbe127955f94be4be61e13f1faed..12ac6f8f27dfe63d9674fba54862db13a9e6d89a:/app/assets/javascripts/index/directions.js diff --git a/app/assets/javascripts/index/directions.js b/app/assets/javascripts/index/directions.js index 5f9027ec6..42854f2e2 100644 --- a/app/assets/javascripts/index/directions.js +++ b/app/assets/javascripts/index/directions.js @@ -1,10 +1,8 @@ //= require_self //= require_tree ./directions -//= require querystring +//= require qs/dist/qs OSM.Directions = function (map) { - var querystring = require("querystring-component"); - var awaitingGeocode; // true if the user has requested a route, but we're waiting on a geocode result var awaitingRoute; // true if we've asked the engine for a route and are waiting to hear back var chosenEngine; @@ -152,14 +150,14 @@ OSM.Directions = function (map) { routeTo = coordTo.lat + "," + coordTo.lng; } - OSM.router.route("/directions?" + querystring.stringify({ + OSM.router.route("/directions?" + Qs.stringify({ from: $("#route_to").val(), to: $("#route_from").val(), route: routeTo + ";" + routeFrom })); }); - $(".directions_form .close").on("click", function (e) { + $(".directions_form .btn-close").on("click", function (e) { e.preventDefault(); var route_from = endpoints[0].value; if (route_from) { @@ -171,14 +169,18 @@ OSM.Directions = function (map) { function formatDistance(m) { if (m < 1000) { - return Math.round(m) + "m"; + return I18n.t("javascripts.directions.distance_m", { distance: Math.round(m) }); } else if (m < 10000) { - return (m / 1000.0).toFixed(1) + "km"; + return I18n.t("javascripts.directions.distance_km", { distance: (m / 1000.0).toFixed(1) }); } else { - return Math.round(m / 1000) + "km"; + return I18n.t("javascripts.directions.distance_km", { distance: Math.round(m / 1000) }); } } + function formatHeight(m) { + return I18n.t("javascripts.directions.distance_m", { distance: Math.round(m) }); + } + function formatTime(s) { var m = Math.round(s / 60); var h = Math.floor(m / 60); @@ -223,7 +225,7 @@ OSM.Directions = function (map) { var precision = OSM.zoomPrecision(map.getZoom()); - OSM.router.replace("/directions?" + querystring.stringify({ + OSM.router.replace("/directions?" + Qs.stringify({ engine: chosenEngine.id, route: o.lat.toFixed(precision) + "," + o.lng.toFixed(precision) + ";" + d.lat.toFixed(precision) + "," + d.lng.toFixed(precision) @@ -242,7 +244,7 @@ OSM.Directions = function (map) { map.removeLayer(polyline); if (reportErrors) { - $("#sidebar_content").html("

" + I18n.t("javascripts.directions.errors.no_route") + "

"); + $("#sidebar_content").html("
" + I18n.t("javascripts.directions.errors.no_route") + "
"); } return; @@ -256,20 +258,31 @@ OSM.Directions = function (map) { map.fitBounds(polyline.getBounds().pad(0.05)); } - var html = "

" + - "" + I18n.t("javascripts.directions.directions") + - "

" + + var distanceText = $("

").append( I18n.t("javascripts.directions.distance") + ": " + formatDistance(route.distance) + ". " + - I18n.t("javascripts.directions.time") + ": " + formatTime(route.time) + "."; + I18n.t("javascripts.directions.time") + ": " + formatTime(route.time) + "."); if (typeof route.ascend !== "undefined" && typeof route.descend !== "undefined") { - html += "
" + - I18n.t("javascripts.directions.ascend") + ": " + Math.round(route.ascend) + "m. " + - I18n.t("javascripts.directions.descend") + ": " + Math.round(route.descend) + "m."; + distanceText.append( + $("
"), + I18n.t("javascripts.directions.ascend") + ": " + formatHeight(route.ascend) + ". " + + I18n.t("javascripts.directions.descend") + ": " + formatHeight(route.descend) + "."); } - html += "

"; + + var turnByTurnTable = $("
") + .append($("")); + var directionsCloseButton = $(""); - row.append(" "); - row.append(" "); + row.append("
" + instruction); - row.append("" + dist); + row.append("
" + instruction); + row.append("" + dist); row.on("click", function () { popup @@ -311,15 +324,14 @@ OSM.Directions = function (map) { map.removeLayer(highlight); }); - $("#turnbyturn").append(row); + turnByTurnTable.append(row); }); - $("#sidebar_content").append("

" + + $("#sidebar_content").append("

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

"); - $("#sidebar_content a.geolink").on("click", function (e) { - e.preventDefault(); + directionsCloseButton.on("click", function () { map.removeLayer(polyline); $("#sidebar_content").html(""); map.setSidebarOverlaid(true); @@ -329,17 +341,15 @@ OSM.Directions = function (map) { } var chosenEngineIndex = findEngine("fossgis_osrm_car"); - if ($.cookie("_osm_directions_engine")) { - chosenEngineIndex = findEngine($.cookie("_osm_directions_engine")); + if (Cookies.get("_osm_directions_engine")) { + chosenEngineIndex = findEngine(Cookies.get("_osm_directions_engine")); } setEngine(chosenEngineIndex); select.on("change", function (e) { chosenEngine = engines[e.target.selectedIndex]; - $.cookie("_osm_directions_engine", chosenEngine.id, { expires: expiry, path: "/" }); - if (map.hasLayer(polyline)) { - getRoute(true, true); - } + Cookies.set("_osm_directions_engine", chosenEngine.id, { secure: true, expires: expiry, path: "/", samesite: "lax" }); + getRoute(true, true); }); $(".directions_form").on("submit", function (e) { @@ -380,7 +390,7 @@ OSM.Directions = function (map) { getRoute(true, true); }); - var params = querystring.parse(location.search.substring(1)), + var params = Qs.parse(location.search.substring(1)), route = (params.route || "").split(";"), from = route[0] && L.latLng(route[0].split(",")), to = route[1] && L.latLng(route[1].split(","));