X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/1bb52e3cb6da18a4777c8314088c5cb5c48a484a..d3ab0c9a8a01161a5f701e3fafbc16d08716dd40:/app/assets/javascripts/index/directions.js?ds=sidebyside diff --git a/app/assets/javascripts/index/directions.js b/app/assets/javascripts/index/directions.js index 689a6eba8..8d9263323 100644 --- a/app/assets/javascripts/index/directions.js +++ b/app/assets/javascripts/index/directions.js @@ -1,34 +1,54 @@ //= require_self //= require_tree ./directions +//= require qs/dist/qs OSM.Directions = function (map) { - 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 awaitingRoute; // true if we've asked the engine for a route and are waiting to hear back var chosenEngine; - var popup = L.popup({autoPanPadding: [100, 100]}); + var popup = L.popup({ autoPanPadding: [100, 100] }); var polyline = L.polyline([], { - color: '#03f', + color: "#03f", opacity: 0.3, weight: 10 }); var highlight = L.polyline([], { - color: '#ff0', + color: "#ff0", opacity: 0.5, weight: 12 }); + var endpointDragCallback = function (dragging) { + if (map.hasLayer(polyline)) { + getRoute(false, !dragging); + } + }; + var endpoints = [ - Endpoint($("input[name='route_from']"), OSM.MARKER_GREEN), - Endpoint($("input[name='route_to']"), OSM.MARKER_RED) + Endpoint($("input[name='route_from']"), OSM.MARKER_GREEN, endpointDragCallback), + Endpoint($("input[name='route_to']"), OSM.MARKER_RED, endpointDragCallback) ]; var expiry = new Date(); expiry.setYear(expiry.getFullYear() + 10); - function Endpoint(input, iconUrl) { + var engines = OSM.Directions.engines; + + engines.sort(function (a, b) { + var localised_a = I18n.t("javascripts.directions.engines." + a.id), + localised_b = I18n.t("javascripts.directions.engines." + b.id); + return localised_a.localeCompare(localised_b); + }); + + var select = $("select.routing_engines"); + + engines.forEach(function (engine, i) { + select.append(""); + }); + + function Endpoint(input, iconUrl, dragCallback) { var endpoint = {}; endpoint.marker = L.marker([0, 0], { @@ -40,34 +60,32 @@ OSM.Directions = function (map) { shadowUrl: OSM.MARKER_SHADOW, shadowSize: [41, 41] }), - draggable: true + draggable: true, + autoPan: true }); - endpoint.marker.on('drag dragend', function (e) { - var dragging = (e.type === 'drag'); + endpoint.marker.on("drag dragend", function (e) { + var dragging = (e.type === "drag"); if (dragging && !chosenEngine.draggable) return; if (dragging && awaitingRoute) return; endpoint.setLatLng(e.target.getLatLng()); - if (map.hasLayer(polyline)) { - getRoute(false, !dragging); - } + dragCallback(dragging); }); - input.on("keydown", function() { - input.css("background-color", "#fff"); + input.on("keydown", function () { + input.removeClass("is-invalid"); }); input.on("change", function (e) { - awaitingGeocode = true; - // make text the same in both text boxes var value = e.target.value; endpoint.setValue(value); }); - endpoint.setValue = function(value, latlng) { + endpoint.setValue = function (value, latlng) { endpoint.value = value; delete endpoint.latlng; + input.removeClass("is-invalid"); input.val(value); if (latlng) { @@ -77,7 +95,7 @@ OSM.Directions = function (map) { } }; - endpoint.getGeocode = function() { + endpoint.getGeocode = function () { // if no one has entered a value yet, then we can't geocode, so don't // even try. if (!endpoint.value) { @@ -86,12 +104,14 @@ OSM.Directions = function (map) { endpoint.awaitingGeocode = true; - $.getJSON(OSM.NOMINATIM_URL + 'search?q=' + encodeURIComponent(endpoint.value) + '&format=json', function (json) { + var viewbox = map.getBounds().toBBoxString(); // ,,, + + $.getJSON(OSM.NOMINATIM_URL + "search?q=" + encodeURIComponent(endpoint.value) + "&format=json&viewbox=" + viewbox, function (json) { endpoint.awaitingGeocode = false; endpoint.hasGeocode = true; if (json.length === 0) { - alert(I18n.t('javascripts.directions.errors.no_place_with_name', {place: endpoint.value})); - input.css("background-color", "rgba(255, 0, 0, 0.5)"); + input.addClass("is-invalid"); + alert(I18n.t("javascripts.directions.errors.no_place", { place: endpoint.value })); return; } @@ -99,10 +119,7 @@ OSM.Directions = function (map) { input.val(json[0].display_name); - if (awaitingGeocode) { - awaitingGeocode = false; - getRoute(true, true); - } + getRoute(true, true); }); }; @@ -119,18 +136,26 @@ OSM.Directions = function (map) { return endpoint; } - $(".directions_form .reverse_directions").on("click", function() { - var from = endpoints[0].latlng, - to = endpoints[1].latlng; + $(".directions_form .reverse_directions").on("click", function () { + var coordFrom = endpoints[0].latlng, + coordTo = endpoints[1].latlng, + routeFrom = "", + routeTo = ""; + if (coordFrom) { + routeFrom = coordFrom.lat + "," + coordFrom.lng; + } + if (coordTo) { + 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: to.lat + "," + to.lng + ";" + from.lat + "," + from.lng + 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) { @@ -142,30 +167,36 @@ 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); m -= h * 60; - return h + ":" + (m < 10 ? '0' : '') + m; + return h + ":" + (m < 10 ? "0" : "") + m; } - function setEngine(id) { - engines.forEach(function(engine, i) { - if (engine.id === id) { - chosenEngine = engine; - select.val(i); - } + function findEngine(id) { + return engines.findIndex(function (engine) { + return engine.id === id; }); } + function setEngine(index) { + chosenEngine = engines[index]; + select.val(index); + } + function getRoute(fitRoute, reportErrors) { // Cancel any route that is already in progress if (awaitingRoute) awaitingRoute.abort(); @@ -176,11 +207,9 @@ OSM.Directions = function (map) { var endpoint = endpoints[ep_i]; if (!endpoint.hasGeocode && !endpoint.awaitingGeocode) { endpoint.getGeocode(); - awaitingGeocode = true; } } if (endpoints[0].awaitingGeocode || endpoints[1].awaitingGeocode) { - awaitingGeocode = true; return; } @@ -192,16 +221,16 @@ 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) + route: o.lat.toFixed(precision) + "," + o.lng.toFixed(precision) + ";" + + d.lat.toFixed(precision) + "," + d.lng.toFixed(precision) })); // 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()); + $("#sidebar_content").html($(".directions_form .loader_copy").html()); map.setSidebarOverlaid(false); awaitingRoute = chosenEngine.getRoute([o, d], function (err, route) { @@ -211,7 +240,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; @@ -225,50 +254,58 @@ OSM.Directions = function (map) { map.fitBounds(polyline.getBounds().pad(0.05)); } - var html = '

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

' + - I18n.t('javascripts.directions.distance') + ': ' + formatDistance(route.distance) + '. ' + - 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.'; + var distanceText = $("

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

'; - $('#sidebar_content') - .html(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 () { + row.on("click", function () { popup .setLatLng(ll) .setContent("

" + instruction + "

") @@ -283,61 +320,44 @@ OSM.Directions = function (map) { map.removeLayer(highlight); }); - $('#turnbyturn').append(row); + turnByTurnTable.append(row); }); - $('#sidebar_content').append('

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

'); + $("#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(''); + $("#sidebar_content").html(""); map.setSidebarOverlaid(true); // TODO: collapse width of sidebar back to previous }); }); } - var engines = OSM.Directions.engines; - - engines.sort(function (a, b) { - a = I18n.t('javascripts.directions.engines.' + a.id); - b = I18n.t('javascripts.directions.engines.' + b.id); - return a.localeCompare(b); - }); - - var select = $('select.routing_engines'); - - engines.forEach(function(engine, i) { - select.append(""); - }); - - var chosenEngineId = $.cookie('_osm_directions_engine'); - if(!chosenEngineId) { - chosenEngineId = 'osrm_car'; + var chosenEngineIndex = findEngine("fossgis_osrm_car"); + if (Cookies.get("_osm_directions_engine")) { + chosenEngineIndex = findEngine(Cookies.get("_osm_directions_engine")); } - setEngine(chosenEngineId); + 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) { + $(".directions_form").on("submit", function (e) { e.preventDefault(); getRoute(true, true); }); - $(".routing_marker").on('dragstart', function (e) { + $(".routing_marker_column img").on("dragstart", function (e) { var dt = e.originalEvent.dataTransfer; - dt.effectAllowed = 'move'; - var dragData = { type: $(this).data('type') }; - dt.setData('text', JSON.stringify(dragData)); + dt.effectAllowed = "move"; + var dragData = { type: $(this).data("type") }; + dt.setData("text", JSON.stringify(dragData)); if (dt.setDragImage) { var img = $("").attr("src", $(e.originalEvent.target).attr("src")); dt.setDragImage(img.get(0), 12, 21); @@ -346,33 +366,37 @@ OSM.Directions = function (map) { var page = {}; - page.pushstate = page.popstate = function() { + page.pushstate = page.popstate = function () { $(".search_form").hide(); $(".directions_form").show(); - $("#map").on('dragend dragover', function (e) { + $("#map").on("dragend dragover", function (e) { e.preventDefault(); }); - $("#map").on('drop', function (e) { + $("#map").on("drop", function (e) { e.preventDefault(); var oe = e.originalEvent; - var dragData = JSON.parse(oe.dataTransfer.getData('text')); + var dragData = JSON.parse(oe.dataTransfer.getData("text")); var type = dragData.type; - var pt = L.DomEvent.getMousePosition(oe, map.getContainer()); // co-ordinates of the mouse pointer at present + var pt = L.DomEvent.getMousePosition(oe, map.getContainer()); // co-ordinates of the mouse pointer at present pt.y += 20; var ll = map.containerPointToLatLng(pt); - endpoints[type === 'from' ? 0 : 1].setLatLng(ll); + endpoints[type === "from" ? 0 : 1].setLatLng(ll); getRoute(true, true); }); - var params = querystring.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(',')); + 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(",")); if (params.engine) { - setEngine(params.engine); + var engineIndex = findEngine(params.engine); + + if (engineIndex >= 0) { + setEngine(engineIndex); + } } endpoints[0].setValue(params.from || "", from); @@ -383,14 +407,14 @@ OSM.Directions = function (map) { getRoute(true, true); }; - page.load = function() { + page.load = function () { page.pushstate(); }; - page.unload = function() { + page.unload = function () { $(".search_form").show(); $(".directions_form").hide(); - $("#map").off('dragend dragover drop'); + $("#map").off("dragend dragover drop"); map .removeLayer(popup)