Merge pull request #379 from HSLdevcom/route-request-restructuring

Restructure street preeferences to prepare for otp changes
HSLdevcom · Jan 22, 2024 · 25be44d · 25be44d
2 parents cef1937 + 38469c0
commit 25be44d
Show file tree

Hide file tree

Showing 6 changed files with 220 additions and 116 deletions.
diff --git a/finland/router-config.json b/finland/router-config.json
@@ -1,17 +1,23 @@
 {
   "routingDefaults": {
     "searchWindow": "16h",
-    "walkSpeed": 1.3,
     "transferSlack": 90,
     "waitReluctance": 0.99,
-    "bikeReluctance": 1.7,
-    "walkReluctance": 1.75,
-    "carReluctance": 10.0,
-    "stairsReluctance": 1.65,
-    "walkBoardCost": 120,
-    "bikeBoardCost": 120,
-    "stairsTimeFactor": 2,
     "elevatorBoardTime": 60,
+    "bicycle": {
+      "boardCost": 120,
+      "reluctance": 1.7
+    },
+    "car": {
+      "reluctance": 10.0
+    },
+    "walk": {
+      "speed": 1.3,
+      "reluctance": 1.75,
+      "stairsReluctance": 1.65,
+      "stairsTimeFactor": 2,
+      "boardCost": 120
+    },
     "accessEgress": {
       "maxDuration": "1h",
       "maxDurationForMode": {
@@ -52,35 +58,49 @@
     "transferCacheRequests": [
       {
         "modes": "WALK",
-        "walkSpeed": 1.2,
-        "walkReluctance": 1.8
+        "walk": {
+          "speed": 1.2,
+          "reluctance": 1.8
+        }
       },
       {
         "modes": "WALK",
-        "walkSpeed": 1.2,
-        "walkReluctance": 1.8,
+        "walk": {
+          "speed": 1.2,
+          "reluctance": 1.8
+        },
         "wheelchairAccessibility": {
           "enabled": true
         }
       },
       {
         "modes": "BICYCLE_RENT",
-        "walkSpeed": 1.2,
-        "bikeSpeed": 5.55,
-        "walkReluctance": 1.8,
-        "optimize": "GREENWAYS"
+        "walk": {
+          "speed": 1.2,
+          "reluctance": 1.8
+        },
+        "bicycle": {
+          "speed": 5.55,
+          "optimization": "SAFEST_STREETS"
+        }
       },
       {
         "modes": "WALK",
-        "walkSpeed": 1.67,
-        "walkReluctance": 1.8
+        "walk": {
+          "speed": 1.67,
+          "reluctance": 1.8
+        }
       },
       {
         "modes": "BICYCLE_RENT",
-        "walkSpeed": 1.67,
-        "bikeSpeed": 5.55,
-        "walkReluctance": 1.8,
-        "optimize": "GREENWAYS"
+        "walk": {
+          "speed": 1.67,
+          "reluctance": 1.8
+        },
+        "bicycle": {
+          "speed": 5.55,
+          "optimization": "SAFEST_STREETS"
+        }
       }
     ]
   },

diff --git a/hsl/router-config.json b/hsl/router-config.json
@@ -1,17 +1,23 @@
 {
   "routingDefaults": {
     "searchWindow": "4h",
-    "walkSpeed": 1.3,
     "transferSlack": 90,
     "waitReluctance": 0.95,
-    "walkReluctance": 1.75,
-    "bikeReluctance": 1.7,
-    "carReluctance": 10.0,
-    "stairsReluctance": 1.65,
-    "stairsTimeFactor": 2,
     "elevatorBoardTime": 60,
-    "walkBoardCost": 120,
-    "bikeBoardCost": 120,
+    "bicycle": {
+      "boardCost": 120,
+      "reluctance": 1.7
+    },
+    "car": {
+      "reluctance": 10.0
+    },
+    "walk": {
+      "speed": 1.3,
+      "reluctance": 1.75,
+      "stairsReluctance": 1.65,
+      "stairsTimeFactor": 2,
+      "boardCost": 120
+    },
     "accessEgress": {
       "maxDuration": "35m"
     },
@@ -76,49 +82,71 @@
     "transferCacheRequests": [
       {
         "modes": "WALK",
-        "walkSpeed": 1.2,
-        "walkReluctance": 1.8
+        "walk": {
+          "speed": 1.2,
+          "reluctance": 1.8
+        }
       },
       {
         "modes": "WALK",
-        "walkSpeed": 1.2,
-        "walkReluctance": 1.8,
+        "walk": {
+          "speed": 1.2,
+          "reluctance": 1.8
+        },
         "wheelchairAccessibility": {
           "enabled": true
         }
       },
       {
         "modes": "BICYCLE",
-        "walkSpeed": 1.2,
-        "bikeSpeed": 5.55,
-        "walkReluctance": 1.8,
-        "optimize": "GREENWAYS"
+        "walk": {
+          "speed": 1.2,
+          "reluctance": 1.8
+        },
+        "bicycle": {
+          "speed": 5.55,
+          "optimization": "SAFEST_STREETS"
+        }
       },
       {
         "modes": "BICYCLE_RENT",
-        "walkSpeed": 1.2,
-        "bikeSpeed": 5.55,
-        "walkReluctance": 1.8,
-        "optimize": "GREENWAYS"
+        "walk": {
+          "speed": 1.2,
+          "reluctance": 1.8
+        },
+        "bicycle": {
+          "speed": 5.55,
+          "optimization": "SAFEST_STREETS"
+        }
       },
       {
         "modes": "WALK",
-        "walkSpeed": 1.67,
-        "walkReluctance": 1.8
+        "walk": {
+          "speed": 1.67,
+          "reluctance": 1.8
+        }
       },
       {
         "modes": "BICYCLE",
-        "walkSpeed": 1.67,
-        "bikeSpeed": 5.55,
-        "walkReluctance": 1.8,
-        "optimize": "GREENWAYS"
+        "walk": {
+          "speed": 1.67,
+          "reluctance": 1.8
+        },
+        "bicycle": {
+          "speed": 5.55,
+          "optimization": "SAFEST_STREETS"
+        }
       },
       {
         "modes": "BICYCLE_RENT",
-        "walkSpeed": 1.67,
-        "bikeSpeed": 5.55,
-        "walkReluctance": 1.8,
-        "optimize": "GREENWAYS"
+        "walk": {
+          "speed": 1.67,
+          "reluctance": 1.8
+        },
+        "bicycle": {
+          "speed": 5.55,
+          "optimization": "SAFEST_STREETS"
+        }
       }
     ]
   },

diff --git a/kela/router-config.json b/kela/router-config.json
@@ -1,17 +1,23 @@
 {
   "routingDefaults": {
     "searchWindow": "16h",
-    "walkSpeed": 1.3,
     "transferSlack": 90,
     "waitReluctance": 0.99,
-    "bikeReluctance": 1.7,
-    "walkReluctance": 1.75,
-    "carReluctance": 10.0,
-    "stairsReluctance": 1.65,
-    "walkBoardCost": 120,
-    "bikeBoardCost": 120,
-    "stairsTimeFactor": 2,
     "elevatorBoardTime": 60,
+    "bicycle": {
+      "boardCost": 120,
+      "reluctance": 1.7
+    },
+    "car": {
+      "reluctance": 10.0
+    },
+    "walk": {
+      "speed": 1.3,
+      "reluctance": 1.75,
+      "stairsReluctance": 1.65,
+      "stairsTimeFactor": 2,
+      "boardCost": 120
+    },
     "accessEgress": {
       "maxDuration": "8h",
       "maxStopCount": "400"
@@ -42,21 +48,27 @@
     "transferCacheRequests": [
       {
         "modes": "WALK",
-        "walkSpeed": 1.2,
-        "walkReluctance": 1.8
+        "walk": {
+          "speed": 1.2,
+          "reluctance": 1.8
+        }
       },
       {
         "modes": "WALK",
-        "walkSpeed": 1.2,
-        "walkReluctance": 1.8,
+        "walk": {
+          "speed": 1.2,
+          "reluctance": 1.8
+        },
         "wheelchairAccessibility": {
           "enabled": true
         }
       },
       {
         "modes": "WALK",
-        "walkSpeed": 1.67,
-        "walkReluctance": 1.8
+        "walk": {
+          "speed": 1.67,
+          "reluctance": 1.8
+        }
       }
     ]
   },

diff --git a/varely/router-config.json b/varely/router-config.json
@@ -1,17 +1,23 @@
 {
   "routingDefaults": {
     "searchWindow": "6h",
-    "walkSpeed": 1.3,
     "transferSlack": 90,
     "waitReluctance": 0.95,
-    "walkReluctance": 1.75,
-    "bikeReluctance": 1.7,
-    "carReluctance": 10.0,
-    "stairsReluctance": 1.65,
-    "stairsTimeFactor": 2,
     "elevatorBoardTime": 60,
-    "walkBoardCost": 120,
-    "bikeBoardCost": 120,
+    "bicycle": {
+      "boardCost": 120,
+      "reluctance": 1.7
+    },
+    "car": {
+      "reluctance": 10.0
+    },
+    "walk": {
+      "speed": 1.3,
+      "reluctance": 1.75,
+      "stairsReluctance": 1.65,
+      "stairsTimeFactor": 2,
+      "boardCost": 120
+    },
     "accessEgress": {
       "maxDuration": "1h"
     },
@@ -47,21 +53,27 @@
     "transferCacheRequests": [
       {
         "modes": "WALK",
-        "walkSpeed": 1.2,
-        "walkReluctance": 1.8
+        "walk": {
+          "speed": 1.2,
+          "reluctance": 1.8
+        }
       },
       {
         "modes": "WALK",
-        "walkSpeed": 1.2,
-        "walkReluctance": 1.8,
+        "walk": {
+          "speed": 1.2,
+          "reluctance": 1.8
+        },
         "wheelchairAccessibility": {
           "enabled": true
         }
       },
       {
         "modes": "WALK",
-        "walkSpeed": 1.67,
-        "walkReluctance": 1.8
+        "walk": {
+          "speed": 1.67,
+          "reluctance": 1.8
+        }
       }
     ]
   },