X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/6db326aa1f084a062a3b658876bc01bf650f5702..a47c0a4411825f48e447641094678b15df3b2f74:/app/assets/javascripts/index/directions.js

diff --git a/app/assets/javascripts/index/directions.js b/app/assets/javascripts/index/directions.js
index 4283ef5aa..71eedaa83 100644
--- a/app/assets/javascripts/index/directions.js
+++ b/app/assets/javascripts/index/directions.js
@@ -3,7 +3,7 @@
 
 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] });
@@ -31,9 +31,9 @@ OSM.Directions = function (map) {
   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");
@@ -139,7 +139,7 @@ OSM.Directions = function (map) {
     var from = endpoints[0].latlng,
         to = endpoints[1].latlng;
 
-    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
@@ -210,7 +210,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)
@@ -260,11 +260,11 @@ OSM.Directions = function (map) {
 
       // Add each row
       route.steps.forEach(function (step) {
-        var ll        = step[0],
-          direction   = step[1],
-          instruction = step[2],
-          dist        = step[3],
-          lineseg     = step[4];
+        var ll = step[0],
+            direction = step[1],
+            instruction = step[2],
+            dist = step[3],
+            lineseg = step[4];
 
         if (dist < 5) {
           dist = "";
@@ -360,14 +360,14 @@ OSM.Directions = function (map) {
       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(","));