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 2462d1d3024b263ad3d05bd84be001b40334f6c5..e72f6d75f32528682ca816bbcc90003fa5e28c31 100644 (file)
--- a/app/assets/javascripts/index/directions/graphhopper.js
+++ b/app/assets/javascripts/index/directions/graphhopper.js
@@ -9,12 +9,17 @@ function GraphHopperEngine(id, vehicleType) {
     "3": 3, // sharp right
     "4": 14, // finish reached
     "5": 14, // via reached
     "3": 3, // sharp right
     "4": 14, // finish reached
     "5": 14, // via reached

-    "6": 10 // roundabout
+    "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) {


@@ -23,13 +28,13 @@ function GraphHopperEngine(id, vehicleType) {
       return $.ajax({
         url: OSM.GRAPHHOPPER_URL,
         data: {
       return $.ajax({
         url: OSM.GRAPHHOPPER_URL,
         data: {

-          "vehicle": vehicleType,
-          "locale": I18n.currentLocale(),
-          "key": "LijBPDQGfu7Iiq80w3HzwB4RUDJbMbhs6BU0dEnn",
-          "elevation": false,
-          "instructions": true,
-          "turn_costs": true,
-          "point": points.map(function (p) { return p.lat + "," + p.lng; })
+          vehicle: vehicleType,
+          locale: I18n.currentLocale(),
+          key: "LijBPDQGfu7Iiq80w3HzwB4RUDJbMbhs6BU0dEnn",
+          elevation: false,
+          instructions: true,
+          turn_costs: vehicleType === "car",
+          point: points.map(function (p) { return p.lat + "," + p.lng; })

         },
         traditional: true,
         dataType: "json",
         },
         traditional: true,
         dataType: "json",