X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/609cedc4998805d38d1607e68c67e491ce589114..87ea9fcb021b9b67a79d35cb719a064a34a7784d:/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 ce8ac9c1c..5040e7f3e 100644
--- a/app/assets/javascripts/index/directions.js
+++ b/app/assets/javascripts/index/directions.js
@@ -1,22 +1,22 @@
//= 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 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
});
@@ -29,6 +29,20 @@ OSM.Directions = function (map) {
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 = {};
@@ -41,28 +55,36 @@ 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 = function(value, latlng) {
+ endpoint.setValue = function (value, latlng) {
endpoint.value = value;
delete endpoint.latlng;
+ input.removeClass("error");
input.val(value);
if (latlng) {
@@ -72,7 +94,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) {
@@ -81,24 +103,24 @@ 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(); // ' + I18n.t('javascripts.directions.errors.no_route') + ' " + I18n.t("javascripts.directions.errors.no_route") + " ' +
- 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.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.directions') +
- '
' +
- I18n.t('javascripts.directions.ascend') + ': ' + Math.round(route.ascend) + 'm. ' +
- I18n.t('javascripts.directions.descend') + ': ' + Math.round(route.descend) +'m.';
+ var html = "" +
+ "" + I18n.t("javascripts.directions.directions") +
+ "
" +
+ I18n.t("javascripts.directions.ascend") + ": " + Math.round(route.ascend) + "m. " +
+ I18n.t("javascripts.directions.descend") + ": " + Math.round(route.descend) + "m.";
}
- html += '';
+ html += "
" + instruction); row.append(" | " + dist);
- row.on('click', function () {
+ row.on("click", function () {
popup
.setLatLng(ll)
.setContent(" " + instruction + " ") @@ -280,61 +309,45 @@ 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(""); - }); - - 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(); - } + 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(); + getRoute(true, true); }); - $(".routing_marker").on('dragstart', function (e) { + $(".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)); + 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); @@ -343,33 +356,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); - getRoute(); + 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); @@ -377,17 +394,17 @@ OSM.Directions = function (map) { 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) |