X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/550c4a3a45814fde5c809334c85f1ebc47659a82..9bfae01a99665342ce2ce83a06f8ef32432dcfa4:/app/assets/javascripts/index/directions.js diff --git a/app/assets/javascripts/index/directions.js b/app/assets/javascripts/index/directions.js index 5040e7f3e..e2cdd3a54 100644 --- a/app/assets/javascripts/index/directions.js +++ b/app/assets/javascripts/index/directions.js @@ -1,10 +1,10 @@ +//= require ./directions-endpoint //= 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 routeRequest = null; // jqXHR object of an ongoing route request or null var chosenEngine; var popup = L.popup({ autoPanPadding: [100, 100] }); @@ -21,9 +21,20 @@ OSM.Directions = function (map) { weight: 12 }); + var endpointDragCallback = function (dragging) { + if (!map.hasLayer(polyline)) return; + if (dragging && !chosenEngine.draggable) return; + if (dragging && routeRequest) return; + + getRoute(false, !dragging); + }; + var endpointChangeCallback = function () { + getRoute(true, true); + }; + var endpoints = [ - Endpoint($("input[name='route_from']"), OSM.MARKER_GREEN), - Endpoint($("input[name='route_to']"), OSM.MARKER_RED) + OSM.DirectionsEndpoint(map, $("input[name='route_from']"), OSM.MARKER_GREEN, endpointDragCallback, endpointChangeCallback), + OSM.DirectionsEndpoint(map, $("input[name='route_to']"), OSM.MARKER_RED, endpointDragCallback, endpointChangeCallback) ]; var expiry = new Date(); @@ -43,101 +54,6 @@ OSM.Directions = function (map) { select.append(""); }); - function Endpoint(input, iconUrl) { - var endpoint = {}; - - endpoint.marker = L.marker([0, 0], { - icon: L.icon({ - iconUrl: iconUrl, - iconSize: [25, 41], - iconAnchor: [12, 41], - popupAnchor: [1, -34], - shadowUrl: OSM.MARKER_SHADOW, - shadowSize: [41, 41] - }), - draggable: true, - autoPan: true - }); - - 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); - } - }); - - 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.value = value; - delete endpoint.latlng; - input.removeClass("error"); - input.val(value); - - 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) { - return; - } - - endpoint.awaitingGeocode = true; - - 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) { - input.addClass("error"); - alert(I18n.t("javascripts.directions.errors.no_place", { place: endpoint.value })); - return; - } - - endpoint.setLatLng(L.latLng(json[0])); - - input.val(json[0].display_name); - - if (awaitingGeocode) { - awaitingGeocode = false; - getRoute(true, true); - } - }); - }; - - endpoint.setLatLng = function (ll) { - var precision = OSM.zoomPrecision(map.getZoom()); - input.val(ll.lat.toFixed(precision) + ", " + ll.lng.toFixed(precision)); - endpoint.hasGeocode = true; - endpoint.latlng = ll; - endpoint.marker - .setLatLng(ll) - .addTo(map); - }; - - return endpoint; - } - $(".directions_form .reverse_directions").on("click", function () { var coordFrom = endpoints[0].latlng, coordTo = endpoints[1].latlng, @@ -157,26 +73,26 @@ OSM.Directions = function (map) { })); }); - $(".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) { - OSM.router.route("/?query=" + encodeURIComponent(route_from) + OSM.formatHash(map)); - } else { - OSM.router.route("/" + OSM.formatHash(map)); - } + $(".search_form input[name='query']").val(endpoints[0].value); + OSM.router.route("/" + OSM.formatHash(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); @@ -197,7 +113,7 @@ OSM.Directions = function (map) { function getRoute(fitRoute, reportErrors) { // Cancel any route that is already in progress - if (awaitingRoute) awaitingRoute.abort(); + if (routeRequest) routeRequest.abort(); // go fetch geocodes for any endpoints which have not already // been geocoded. @@ -205,11 +121,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; } @@ -233,14 +147,14 @@ OSM.Directions = function (map) { $("#sidebar_content").html($(".directions_form .loader_copy").html()); map.setSidebarOverlaid(false); - awaitingRoute = chosenEngine.getRoute([o, d], function (err, route) { - awaitingRoute = null; + routeRequest = chosenEngine.getRoute([o, d], function (err, route) { + routeRequest = null; if (err) { 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; @@ -254,20 +168,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 @@ -309,15 +234,14 @@ 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 a.geolink").on("click", function (e) { - e.preventDefault(); + directionsCloseButton.on("click", function () { map.removeLayer(polyline); $("#sidebar_content").html(""); map.setSidebarOverlaid(true); @@ -343,7 +267,7 @@ OSM.Directions = function (map) { 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") }; @@ -372,8 +296,9 @@ OSM.Directions = function (map) { 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 precision = OSM.zoomPrecision(map.getZoom()); + var value = ll.lat.toFixed(precision) + ", " + ll.lng.toFixed(precision); + endpoints[type === "from" ? 0 : 1].setValue(value, ll); }); var params = Qs.parse(location.search.substring(1)), @@ -393,8 +318,6 @@ OSM.Directions = function (map) { endpoints[1].setValue(params.to || "", to); map.setSidebarOverlaid(!from || !to); - - getRoute(true, true); }; page.load = function () {