X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/e256c837b56d9f1c40c0c57dd89db4825bc7489e..bf9dd8f350ca1b54afb79dda79506d980ccb5738:/app/assets/javascripts/index/directions.js diff --git a/app/assets/javascripts/index/directions.js b/app/assets/javascripts/index/directions.js index 31144a547..5f9027ec6 100644 --- a/app/assets/javascripts/index/directions.js +++ b/app/assets/javascripts/index/directions.js @@ -1,22 +1,24 @@ //= require_self //= require_tree ./directions +//= require querystring 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 dragging; // true if the user is dragging a start/end point + var awaitingRoute; // true if we've asked the engine for a route and are waiting to hear back var chosenEngine; - var popup = L.popup(); + 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 }); @@ -26,6 +28,23 @@ OSM.Directions = function (map) { Endpoint($("input[name='route_to']"), OSM.MARKER_RED) ]; + var expiry = new Date(); + expiry.setYear(expiry.getFullYear() + 10); + + 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) { var endpoint = {}; @@ -38,33 +57,46 @@ OSM.Directions = function (map) { shadowUrl: OSM.MARKER_SHADOW, shadowSize: [41, 41] }), - draggable: true + draggable: true, + autoPan: true }); - endpoint.marker.on('drag dragend', function (e) { - 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(); + getRoute(false, !dragging); } }); + input.on("keydown", function () { + input.removeClass("error"); + }); + 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(value); }); - endpoint.setValue = function(value) { + endpoint.setValue = function (value, latlng) { endpoint.value = value; delete endpoint.latlng; + input.removeClass("error"); input.val(value); - endpoint.getGeocode(); - } - endpoint.getGeocode = function() { + if (latlng) { + endpoint.setLatLng(latlng); + } else { + endpoint.getGeocode(); + } + }; + + endpoint.getGeocode = function () { // if no one has entered a value yet, then we can't geocode, so don't // even try. if (!endpoint.value) { @@ -73,27 +105,27 @@ OSM.Directions = function (map) { endpoint.awaitingGeocode = true; - $.getJSON(document.location.protocol + 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')); + if (json.length === 0) { + input.addClass("error"); + alert(I18n.t("javascripts.directions.errors.no_place", { place: endpoint.value })); return; } - input.val(json[0].display_name); + endpoint.setLatLng(L.latLng(json[0])); - endpoint.latlng = L.latLng(json[0]); - endpoint.marker - .setLatLng(endpoint.latlng) - .addTo(map); + input.val(json[0].display_name); if (awaitingGeocode) { awaitingGeocode = false; - getRoute(); + getRoute(true, true); } }); - } + }; endpoint.setLatLng = function (ll) { var precision = OSM.zoomPrecision(map.getZoom()); @@ -108,7 +140,26 @@ OSM.Directions = function (map) { return endpoint; } - $(".directions_form a.directions_close").on("click", function(e) { + $(".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({ + from: $("#route_to").val(), + to: $("#route_from").val(), + route: routeTo + ";" + routeFrom + })); + }); + + $(".directions_form .close").on("click", function (e) { e.preventDefault(); var route_from = endpoints[0].value; if (route_from) { @@ -132,19 +183,24 @@ OSM.Directions = function (map) { 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 getRoute() { + 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(); + // go fetch geocodes for any endpoints which have not already // been geocoded. for (var ep_i = 0; ep_i < 2; ++ep_i) { @@ -169,25 +225,24 @@ OSM.Directions = function (map) { OSM.router.replace("/directions?" + querystring.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()); - awaitingRoute = true; + $("#sidebar_content").html($(".directions_form .loader_copy").html()); map.setSidebarOverlaid(false); - chosenEngine.getRoute([o, d], function (err, route) { - awaitingRoute = false; + awaitingRoute = chosenEngine.getRoute([o, d], function (err, route) { + awaitingRoute = null; if (err) { map.removeLayer(polyline); - if (!dragging) { - alert(I18n.t('javascripts.directions.errors.no_route')); + if (reportErrors) { + $("#sidebar_content").html("

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

"); } return; @@ -197,41 +252,43 @@ OSM.Directions = function (map) { .setLatLngs(route.line) .addTo(map); - if (!dragging) { + if (fitRoute) { 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) + '.

' + - ''; + 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."; + } + html += "

"; - $('#sidebar_content') + $("#sidebar_content") .html(html); // Add each row - var cumulative = 0; route.steps.forEach(function (step) { - var ll = step[0], - direction = step[1], - instruction = step[2], - dist = step[3], - lineseg = step[4]; - - cumulative += dist; + var ll = step[0], + direction = step[1], + instruction = step[2], + dist = step[3], + lineseg = step[4]; if (dist < 5) { dist = ""; } else if (dist < 200) { - dist = Math.round(dist / 10) * 10 + "m"; + dist = String(Math.round(dist / 10) * 10) + "m"; } else if (dist < 1500) { - dist = Math.round(dist / 100) * 100 + "m"; + dist = String(Math.round(dist / 100) * 100) + "m"; } else if (dist < 5000) { - dist = Math.round(dist / 100) / 10 + "km"; + dist = String(Math.round(dist / 100) / 10) + "km"; } else { - dist = Math.round(dist / 1000) + "km"; + dist = String(Math.round(dist / 1000)) + "km"; } var row = $(""); @@ -239,7 +296,7 @@ OSM.Directions = function (map) { row.append("
" + instruction); row.append("" + dist); - row.on('click', function () { + row.on("click", function () { popup .setLatLng(ll) .setContent("

" + instruction + "

") @@ -254,116 +311,104 @@ OSM.Directions = function (map) { map.removeLayer(highlight); }); - $('#turnbyturn').append(row); + $("#turnbyturn").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) { + $("#sidebar_content a.geolink").on("click", function (e) { e.preventDefault(); 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(""); - }); - - setEngine('osrm_car'); + var chosenEngineIndex = findEngine("fossgis_osrm_car"); + if ($.cookie("_osm_directions_engine")) { + chosenEngineIndex = findEngine($.cookie("_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(); + getRoute(true, true); } }); - $(".directions_form").on("submit", function(e) { + $(".directions_form").on("submit", function (e) { e.preventDefault(); - getRoute(); + getRoute(true, true); }); - $(".routing_marker").on('dragstart', function (e) { - e.originalEvent.dataTransfer.effectAllowed = 'move'; - e.originalEvent.dataTransfer.setData('id', this.id); - var xo = e.originalEvent.clientX - $(e.target).offset().left; - var yo = e.originalEvent.clientY - $(e.target).offset().top; - e.originalEvent.dataTransfer.setData('offsetX', e.originalEvent.target.width / 2 - xo); - e.originalEvent.dataTransfer.setData('offsetY', e.originalEvent.target.height - yo); + $(".routing_marker").on("dragstart", function (e) { + var dt = e.originalEvent.dataTransfer; + 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); + } }); 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 id = oe.dataTransfer.getData('id'); - var pt = L.DomEvent.getMousePosition(oe, map.getContainer()); // co-ordinates of the mouse pointer at present - pt.x += Number(oe.dataTransfer.getData('offsetX')); - pt.y += Number(oe.dataTransfer.getData('offsetY')); + 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 + pt.y += 20; var ll = map.containerPointToLatLng(pt); - endpoints[id === 'marker_from' ? 0 : 1].setLatLng(ll); - getRoute(); + endpoints[type === "from" ? 0 : 1].setLatLng(ll); + getRoute(true, true); }); var params = querystring.parse(location.search.substring(1)), - route = (params.route || '').split(';'); + 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 (params.from) { - endpoints[0].setValue(params.from); - endpoints[1].setValue(""); - } else { - endpoints[0].setValue(""); - endpoints[1].setValue(""); + if (engineIndex >= 0) { + setEngine(engineIndex); + } } - var o = route[0] && L.latLng(route[0].split(',')), - d = route[1] && L.latLng(route[1].split(',')); - - if (o) endpoints[0].setLatLng(o); - if (d) endpoints[1].setLatLng(d); + endpoints[0].setValue(params.from || "", from); + endpoints[1].setValue(params.to || "", to); - map.setSidebarOverlaid(!o || !d); + map.setSidebarOverlaid(!from || !to); - getRoute(); + 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) @@ -378,7 +423,7 @@ OSM.Directions = function (map) { OSM.Directions.engines = []; OSM.Directions.addEngine = function (engine, supportsHTTPS) { - if (document.location.protocol == "http:" || supportsHTTPS) { + if (document.location.protocol === "http:" || supportsHTTPS) { OSM.Directions.engines.push(engine); } };