Merge remote-tracking branch 'upstream/pull/3074'

[rails.git] / app / assets / javascripts / index / directions.js

diff --git a/app/assets/javascripts/index/directions.js b/app/assets/javascripts/index/directions.js
index 1c095a36b2d51450708d03f51653f04bb3718554..ee44ad4c4be11be9db4ae5a9f684f0a11232b730 100644 (file)
--- a/app/assets/javascripts/index/directions.js
+++ b/app/assets/javascripts/index/directions.js
@@ -1,10 +1,8 @@
 //= require_self
 //= require_tree ./directions
 //= require_self
 //= require_tree ./directions

-//= require querystring
+//= require qs/dist/qs

 
 OSM.Directions = function (map) {
 
 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;
   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,18 +139,18 @@ OSM.Directions = function (map) {
   }
 
   $(".directions_form .reverse_directions").on("click", function () {
   }
 
   $(".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 = "";
         routeFrom = "",
         routeTo = "";

-    if (from) {
-      routeFrom = from.lat + "," + from.lng;
+    if (coordFrom) {
+      routeFrom = coordFrom.lat + "," + coordFrom.lng;

     }
     }

-    if (to) {
-      routeTo = to.lat + "," + to.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: routeTo + ";" + routeFrom
       from: $("#route_to").val(),
       to: $("#route_from").val(),
       route: routeTo + ";" + routeFrom


@@ -223,7 +221,7 @@ OSM.Directions = function (map) {
 
     var precision = OSM.zoomPrecision(map.getZoom());
 
 
     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)
       engine: chosenEngine.id,
       route: o.lat.toFixed(precision) + "," + o.lng.toFixed(precision) + ";" +
              d.lat.toFixed(precision) + "," + d.lng.toFixed(precision)


@@ -337,9 +335,7 @@ OSM.Directions = function (map) {
   select.on("change", function (e) {
     chosenEngine = engines[e.target.selectedIndex];
     $.cookie("_osm_directions_engine", chosenEngine.id, { expires: expiry, path: "/" });
   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);
-    }
+    getRoute(true, true);

   });
 
   $(".directions_form").on("submit", function (e) {
   });
 
   $(".directions_form").on("submit", function (e) {


@@ -380,7 +376,7 @@ OSM.Directions = function (map) {
       getRoute(true, true);
     });
 
       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(","));
         route = (params.route || "").split(";"),
         from = route[0] && L.latLng(route[0].split(",")),
         to = route[1] && L.latLng(route[1].split(","));