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 5a16f708cf33916a5ba1eccc7cd069b54c6b4eac..7a5d77d9bd50eae15c8be46df1cffdf5711553e2 100644 (file)
--- a/app/assets/javascripts/index/directions/graphhopper.js
+++ b/app/assets/javascripts/index/directions/graphhopper.js
@@ -1,15 +1,15 @@
 function GraphHopperEngine(id, vehicleType) {
   var GH_INSTR_MAP = {
 function GraphHopperEngine(id, vehicleType) {
   var GH_INSTR_MAP = {

-    "-3": 6, // sharp left
-    "-2": 7, // left
-    "-1": 8, // slight left
+    "-3": 7, // sharp left
+    "-2": 6, // left
+    "-1": 5, // slight left

     0: 0, // straight
     1: 1, // slight right
     2: 2, // right
     3: 3, // sharp right
     0: 0, // straight
     1: 1, // slight right
     2: 2, // right
     3: 3, // sharp right

-    4: -1, // finish reached
-    5: -1, // via reached
-    6: 11 // roundabout
+    4: 14, // finish reached
+    5: 14, // via reached
+    6: 10 // roundabout

   };
 
   return {
   };
 
   return {


@@ -21,7 +21,7 @@ function GraphHopperEngine(id, vehicleType) {
       // GraphHopper Directions API documentation
       // https://github.com/graphhopper/directions-api/blob/master/docs-routing.md
       return $.ajax({
       // GraphHopper Directions API documentation
       // https://github.com/graphhopper/directions-api/blob/master/docs-routing.md
       return $.ajax({

-        url: document.location.protocol + "//graphhopper.com/api/1/route",
+        url: document.location.protocol + OSM.GRAPHHOPPER_URL,

         data: {
           vehicle: vehicleType,
           locale: I18n.currentLocale(),
         data: {
           vehicle: vehicleType,
           locale: I18n.currentLocale(),


@@ -44,26 +44,33 @@ function GraphHopperEngine(id, vehicleType) {
           var len = path.instructions.length;
           for (var i = 0; i < len; i++) {
             var instr = path.instructions[i];
           var len = path.instructions.length;
           for (var i = 0; i < len; i++) {
             var instr = path.instructions[i];

-            var instrCode = (i === len - 1) ? 15 : GH_INSTR_MAP[instr.sign];
+            var instrCode = (i === len - 1) ? 14 : GH_INSTR_MAP[instr.sign];

             var instrText = "<b>" + (i + 1) + ".</b> ";
             instrText += instr.text;
             var latLng = line[instr.interval[0]];
             var distInMeter = instr.distance;
             var instrText = "<b>" + (i + 1) + ".</b> ";
             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([
             steps.push([

-              {lat: latLng.lat, lng: latLng.lng},
+              {lat: latLng[0], lng: latLng[1]},

               instrCode,
               instrText,
               distInMeter,
               instrCode,
               instrText,
               distInMeter,

-              []
+              lineseg

             ]); // TODO does graphhopper map instructions onto line indices?
           }
 
             ]); // TODO does graphhopper map instructions onto line indices?
           }
 

-          callback(null, {
+          callback(false, {

             line: line,
             steps: steps,
             distance: path.distance,
             time: path.time / 1000
           });
             line: line,
             steps: steps,
             distance: path.distance,
             time: path.time / 1000
           });

+        },
+        error: function () {
+          callback(true);

         }
       });
     }
         }
       });
     }