X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/783b5e3729228908d7404ae7404af1023501a906..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 4c39d6781..5040e7f3e 100644 --- a/app/assets/javascripts/index/directions.js +++ b/app/assets/javascripts/index/directions.js @@ -1,10 +1,8 @@ //= require_self //= require_tree ./directions -//= require querystring +//= require qs/dist/qs 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 chosenEngine; @@ -141,13 +139,21 @@ OSM.Directions = function (map) { } $(".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 })); }); @@ -215,7 +221,7 @@ 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) @@ -250,7 +256,7 @@ OSM.Directions = function (map) { var 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") { @@ -258,7 +264,7 @@ OSM.Directions = function (map) { I18n.t("javascripts.directions.ascend") + ": " + Math.round(route.ascend) + "m. " + I18n.t("javascripts.directions.descend") + ": " + Math.round(route.descend) + "m."; } - html += "