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

[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 ce568409d5052628aa8532b148ab56354ca88849..e72f6d75f32528682ca816bbcc90003fa5e28c31 100644 (file)
--- a/app/assets/javascripts/index/directions/graphhopper.js
+++ b/app/assets/javascripts/index/directions/graphhopper.js
@@ -3,18 +3,23 @@ function GraphHopperEngine(id, vehicleType) {
     "-3": 7, // sharp left
     "-2": 6, // left
     "-1": 5, // 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
-    4: 14, // finish reached
-    5: 14, // via reached
-    6: 10 // roundabout
+    "0": 0, // straight
+    "1": 1, // slight right
+    "2": 2, // right
+    "3": 3, // sharp right
+    "4": 14, // finish reached
+    "5": 14, // via reached
+    "6": 10, // roundabout
+    "-7": 19, // keep left
+    "7": 18, // keep right
+    "-98": 4, // unknown direction u-turn
+    "-8": 4, // left u-turn
+    "8": 4 // right u-turn

   };
 
   return {
     id: id,
   };
 
   return {
     id: id,

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

     draggable: false,
 
     getRoute: function (points, callback) {
     draggable: false,
 
     getRoute: function (points, callback) {


@@ -26,16 +31,17 @@ function GraphHopperEngine(id, vehicleType) {
           vehicle: vehicleType,
           locale: I18n.currentLocale(),
           key: "LijBPDQGfu7Iiq80w3HzwB4RUDJbMbhs6BU0dEnn",
           vehicle: vehicleType,
           locale: I18n.currentLocale(),
           key: "LijBPDQGfu7Iiq80w3HzwB4RUDJbMbhs6BU0dEnn",

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

           elevation: false,
           instructions: true,
           elevation: false,
           instructions: true,

+          turn_costs: vehicleType === "car",

           point: points.map(function (p) { return p.lat + "," + p.lng; })
         },
         traditional: true,
         dataType: "json",
         success: function (data) {
           point: points.map(function (p) { return p.lat + "," + p.lng; })
         },
         traditional: true,
         dataType: "json",
         success: function (data) {

-          if (!data.paths || data.paths.length === 0)
+          if (!data.paths || data.paths.length === 0) {

             return callback(true);
             return callback(true);

+          }

 
           var path = data.paths[0];
           var line = L.PolylineUtil.decode(path.points);
 
           var path = data.paths[0];
           var line = L.PolylineUtil.decode(path.points);


@@ -51,10 +57,10 @@ function GraphHopperEngine(id, vehicleType) {
             var distInMeter = instr.distance;
             var lineseg = [];
             for (var j = instr.interval[0]; j <= instr.interval[1]; j++) {
             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]});
+              lineseg.push({ lat: line[j][0], lng: line[j][1] });

             }
             steps.push([
             }
             steps.push([

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

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