//= 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] });
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();
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 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");
select.append("<option value='" + i + "'>" + I18n.t("javascripts.directions.engines." + engine.id) + "</option>");
});
- function Endpoint(input, iconUrl) {
+ function Endpoint(input, iconUrl, dragCallback) {
var endpoint = {};
endpoint.marker = L.marker([0, 0], {
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.removeClass("error");
+ 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.value = value;
delete endpoint.latlng;
- input.removeClass("error");
+ input.removeClass("is-invalid");
input.val(value);
if (latlng) {
endpoint.awaitingGeocode = true;
- $.getJSON(OSM.NOMINATIM_URL + "search?q=" + encodeURIComponent(endpoint.value) + "&format=json", function (json) {
+ var viewbox = map.getBounds().toBBoxString(); // <sw lon>,<sw lat>,<ne lon>,<ne lat>
+
+ $.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) {
- input.addClass("error");
+ input.addClass("is-invalid");
alert(I18n.t("javascripts.directions.errors.no_place", { place: endpoint.value }));
return;
}
input.val(json[0].display_name);
- if (awaitingGeocode) {
- awaitingGeocode = false;
- getRoute(true, true);
- }
+ getRoute(true, true);
});
};
}
$(".directions_form .reverse_directions").on("click", function () {
- var from = endpoints[0].latlng,
- to = endpoints[1].latlng;
+ 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) {
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);
var endpoint = endpoints[ep_i];
if (!endpoint.hasGeocode && !endpoint.awaitingGeocode) {
endpoint.getGeocode();
- awaitingGeocode = true;
}
}
if (endpoints[0].awaitingGeocode || endpoints[1].awaitingGeocode) {
- awaitingGeocode = true;
return;
}
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)
map.removeLayer(polyline);
if (reportErrors) {
- $("#sidebar_content").html("<p class=\"search_results_error\">" + I18n.t("javascripts.directions.errors.no_route") + "</p>");
+ $("#sidebar_content").html("<div class=\"alert alert-danger\">" + I18n.t("javascripts.directions.errors.no_route") + "</div>");
}
return;
map.fitBounds(polyline.getBounds().pad(0.05));
}
- var html = "<h2><a class=\"geolink\" href=\"#\">" +
- "<span class=\"icon close\"></span></a>" + I18n.t("javascripts.directions.directions") +
- "</h2><p id=\"routing_summary\">" +
+ var distanceText = $("<p>").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 += "<br />" +
- I18n.t("javascripts.directions.ascend") + ": " + Math.round(route.ascend) + "m. " +
- I18n.t("javascripts.directions.descend") + ": " + Math.round(route.descend) + "m.";
+ distanceText.append(
+ $("<br>"),
+ I18n.t("javascripts.directions.ascend") + ": " + formatHeight(route.ascend) + ". " +
+ I18n.t("javascripts.directions.descend") + ": " + formatHeight(route.descend) + ".");
}
- html += "</p><table id=\"turnbyturn\" />";
+
+ var turnByTurnTable = $("<table class='table table-hover table-sm mb-3'>")
+ .append($("<tbody>"));
+ var directionsCloseButton = $("<button type='button' class='btn-close'>")
+ .attr("aria-label", I18n.t("javascripts.close"));
$("#sidebar_content")
- .html(html);
+ .empty()
+ .append(
+ $("<div class='d-flex'>").append(
+ $("<h2 class='flex-grow-1 text-break'>")
+ .text(I18n.t("javascripts.directions.directions")),
+ $("<div>").append(directionsCloseButton)),
+ distanceText,
+ turnByTurnTable
+ );
// Add each row
route.steps.forEach(function (step) {
- var ll = step[0],
- direction = step[1],
+ var ll = step[0],
+ direction = step[1],
instruction = step[2],
- dist = step[3],
- lineseg = step[4];
+ dist = step[3],
+ lineseg = step[4];
if (dist < 5) {
dist = "";
}
var row = $("<tr class='turn'/>");
- row.append("<td><div class='direction i" + direction + "'/></td> ");
- row.append("<td class='instruction'>" + instruction);
- row.append("<td class='distance'>" + dist);
+ row.append("<td
class='border-0'><div class='direction i" + direction + "'/></td> ");
+ row.append("<td>" + instruction);
+ row.append("<td class='distance text-body-secondary text-end'>" + dist);
row.on("click", function () {
popup
map.removeLayer(highlight);
});
- $("#turnbyturn").append(row);
+ turnByTurnTable.append(row);
});
- $("#sidebar_content").append("<p id=\"routing_credit\">" +
+ $("#sidebar_content").append("<p class=\"text-center\">" +
I18n.t("javascripts.directions.instructions.courtesy", { link: chosenEngine.creditline }) +
"</p>");
- $("#sidebar_content a.geolink").on("click", function (e) {
- e.preventDefault();
+ directionsCloseButton.on("click", function () {
map.removeLayer(polyline);
$("#sidebar_content").html("");
map.setSidebarOverlaid(true);
}
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) {
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") };
var oe = e.originalEvent;
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(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(","));
projects / rails.git / blobdiff