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

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

diff --git a/app/assets/javascripts/index/directions/fossgis_valhalla.js b/app/assets/javascripts/index/directions/fossgis_valhalla.js
index c897a3b16943c84ebb8c8b783a728b97c6763efa..619f8f1e371d9979a8ef94f0d0953fd443c8062c 100644 (file)
--- a/app/assets/javascripts/index/directions/fossgis_valhalla.js
+++ b/app/assets/javascripts/index/directions/fossgis_valhalla.js
@@ -27,10 +27,16 @@ function FOSSGISValhallaEngine(id, costing) {
     5, // kStayLeft = 24;
     20, // kMerge = 25;
     10, // kRoundaboutEnter = 26;
     5, // kStayLeft = 24;
     20, // kMerge = 25;
     10, // kRoundaboutEnter = 26;

-    11, // kRoundaboutExit = 27;
+    10, // kRoundaboutExit = 27;

     17, // kFerryEnter = 28;
     0, // kFerryExit = 29;
     17, // kFerryEnter = 28;
     0, // kFerryExit = 29;

-    ...Array(7).fill(), // irrelevant transit maneuvers
+    null, // kTransit = 30;
+    null, // kTransitTransfer = 31;
+    null, // kTransitRemainOn = 32;
+    null, // kTransitConnectionStart = 33;
+    null, // kTransitConnectionTransfer = 34;
+    null, // kTransitConnectionDestination = 35;
+    null, // kPostTransitConnectionDestination = 36;

     21, // kMergeRight = 37;
     20 // kMergeLeft = 38;
   ];
     21, // kMergeRight = 37;
     20 // kMergeLeft = 38;
   ];


@@ -47,7 +53,7 @@ function FOSSGISValhallaEngine(id, costing) {
         data: {
           json: JSON.stringify({
             locations: points.map(function (p) {
         data: {
           json: JSON.stringify({
             locations: points.map(function (p) {

-              return { lat: p.lat, lon: p.lng };
+              return { lat: p.lat, lon: p.lng, radius: 5 };

             }),
             costing: costing,
             directions_options: {
             }),
             costing: costing,
             directions_options: {


@@ -107,6 +113,6 @@ function FOSSGISValhallaEngine(id, costing) {
   };
 }
 
   };
 }
 

-  OSM.Directions.addEngine(new FOSSGISValhallaEngine("fossgis_valhalla_car", "auto"), true);
-  OSM.Directions.addEngine(new FOSSGISValhallaEngine("fossgis_valhalla_bicycle", "bicycle"), true);
-  OSM.Directions.addEngine(new FOSSGISValhallaEngine("fossgis_valhalla_foot", "pedestrian"), true);
+OSM.Directions.addEngine(new FOSSGISValhallaEngine("fossgis_valhalla_car", "auto"), true);
+OSM.Directions.addEngine(new FOSSGISValhallaEngine("fossgis_valhalla_bicycle", "bicycle"), true);
+OSM.Directions.addEngine(new FOSSGISValhallaEngine("fossgis_valhalla_foot", "pedestrian"), true);