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

[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 391c1f9315c7fe945d822d49380f9578729e79c0..4eb0e09f46c13bbfb83edb59ae773f65d18d601c 100644 (file)
--- a/app/assets/javascripts/index/directions.js
+++ b/app/assets/javascripts/index/directions.js
@@ -116,18 +116,14 @@ OSM.Directions = function (map) {
     // Cancel any route that is already in progress
     if (routeRequest) routeRequest.abort();
 
     // Cancel any route that is already in progress
     if (routeRequest) routeRequest.abort();
 

-    var o = endpoints[0].latlng,
-        d = endpoints[1].latlng;
+    const points = endpoints.map(p => p.latlng);

 
 

-    if (!o || !d) return;
+    if (!points[0] || !points[1]) return;

     $("header").addClass("closed");
 
     $("header").addClass("closed");
 

-    var precision = OSM.zoomPrecision(map.getZoom());
-

     OSM.router.replace("/directions?" + Qs.stringify({
       engine: chosenEngine.id,
     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)
+      route: points.map(p => OSM.cropLocation(p, map.getZoom()).join()).join(";")

     }));
 
     // copy loading item to sidebar and display it. we copy it, rather than
     }));
 
     // copy loading item to sidebar and display it. we copy it, rather than


@@ -136,7 +132,7 @@ OSM.Directions = function (map) {
     $("#sidebar_content").html($(".directions_form .loader_copy").html());
     map.setSidebarOverlaid(false);
 
     $("#sidebar_content").html($(".directions_form .loader_copy").html());
     map.setSidebarOverlaid(false);
 

-    routeRequest = chosenEngine.getRoute([o, d], function (err, route) {
+    routeRequest = chosenEngine.getRoute(points, function (err, route) {

       routeRequest = null;
 
       if (err) {
       routeRequest = null;
 
       if (err) {


@@ -285,10 +281,8 @@ 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);
       var pt = L.DomEvent.getMousePosition(oe, map.getContainer()); // co-ordinates of the mouse pointer at present
       pt.y += 20;
       var ll = map.containerPointToLatLng(pt);

-      var precision = OSM.zoomPrecision(map.getZoom());
-      var value = ll.lat.toFixed(precision) + ", " + ll.lng.toFixed(precision);
-      var llWithPrecision = L.latLng(ll.lat.toFixed(precision), ll.lng.toFixed(precision));
-      endpoints[type === "from" ? 0 : 1].setValue(value, llWithPrecision);
+      const llWithPrecision = OSM.cropLocation(ll, map.getZoom());
+      endpoints[type === "from" ? 0 : 1].setValue(llWithPrecision.join(", "), llWithPrecision);

     });
 
     endpoints[0].enable();
     });
 
     endpoints[0].enable();