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

[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 2d3455eeeda6ac1ca058de6f08bc71fc39c8f67a..f05f1ab3dfb761336a471ce49f542edd4965af60 100644 (file)
--- a/app/assets/javascripts/index/directions/graphhopper.js
+++ b/app/assets/javascripts/index/directions/graphhopper.js
@@ -1,31 +1,32 @@
 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 {
     id: id,
   };
 
   return {
     id: id,

-    creditline: '<a href="https://graphhopper.com/" target="_blank">Graphhopper</a>',
+    creditline: '<a href="https://www.graphhopper.com/" target="_blank">Graphhopper</a>',

     draggable: false,
 
     getRoute: function (points, callback) {
       // GraphHopper Directions API documentation
     draggable: false,
 
     getRoute: function (points, callback) {
       // GraphHopper Directions API documentation

-      // https://github.com/graphhopper/directions-api/blob/master/docs-routing.md
+      // https://graphhopper.com/api/1/docs/routing/

       return $.ajax({
       return $.ajax({

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

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

+          "ch.disable": vehicleType === "car",

           type: "jsonp",
           elevation: false,
           instructions: true,
           type: "jsonp",
           elevation: false,
           instructions: true,


@@ -44,17 +45,21 @@ 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?
           }
 


@@ -62,7 +67,9 @@ function GraphHopperEngine(id, vehicleType) {
             line: line,
             steps: steps,
             distance: path.distance,
             line: line,
             steps: steps,
             distance: path.distance,

-            time: path.time / 1000
+            time: path.time / 1000,
+            ascend: path.ascend,
+            descend: path.descend

           });
         },
         error: function () {
           });
         },
         error: function () {


@@ -73,5 +80,6 @@ function GraphHopperEngine(id, vehicleType) {
   };
 }
 
   };
 }
 

+OSM.Directions.addEngine(new GraphHopperEngine("graphhopper_car", "car"), true);

 OSM.Directions.addEngine(new GraphHopperEngine("graphhopper_bicycle", "bike"), true);
 OSM.Directions.addEngine(new GraphHopperEngine("graphhopper_foot", "foot"), true);
 OSM.Directions.addEngine(new GraphHopperEngine("graphhopper_bicycle", "bike"), true);
 OSM.Directions.addEngine(new GraphHopperEngine("graphhopper_foot", "foot"), true);