Merge remote-tracking branch 'openstreetmap/pull/1445'

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

diff --git a/app/assets/javascripts/index/directions/graphhopper.js b/app/assets/javascripts/index/directions/graphhopper.js
index 9cf1dc1aacf58ba703d281e78401e35b651680d9..7a5d77d9bd50eae15c8be46df1cffdf5711553e2 100644 (file)
--- a/app/assets/javascripts/index/directions/graphhopper.js
+++ b/app/assets/javascripts/index/directions/graphhopper.js
@@ -7,8 +7,8 @@ function GraphHopperEngine(id, vehicleType) {
     1: 1, // slight right
     2: 2, // right
     3: 3, // sharp right
-    4: 8, // finish reached
-    5: 8, // via reached
+    4: 14, // finish reached
+    5: 14, // via reached
     6: 10 // roundabout
   };
 
@@ -49,12 +49,16 @@ function GraphHopperEngine(id, vehicleType) {
             instrText += instr.text;
             var latLng = line[instr.interval[0]];
             var distInMeter = instr.distance;
+            var lineseg = [];
+            for (var j = instr.interval[0]; j <= instr.interval[1]; j++) {
+              lineseg.push({lat: line[j][0], lng: line[j][1]});
+            }
             steps.push([
-              {lat: latLng.lat, lng: latLng.lng},
+              {lat: latLng[0], lng: latLng[1]},
               instrCode,
               instrText,
               distInMeter,
-              []
+              lineseg
             ]); // TODO does graphhopper map instructions onto line indices?
           }