Merge pull request #543 from HSLdevcom/revert-542-remove-flex-and-others

VillePihlava · web-flow · commit fa6b59f322d3 · 2026-04-16T19:04:53.000+03:00
Revert "Remove flex test configurations for release"
diff --git a/finland/router-config.json b/finland/router-config.json
@@ -35,6 +35,12 @@
       "maxStopCountForMode": {
         "BIKE": 0,
         "CAR": 0
+      },
+      "penalty": {
+        "FLEXIBLE": {
+          "timePenalty": "5m + 5t",
+          "costFactor": 1
+        }
       }
     },
     "maxDirectStreetDuration": "100h",
@@ -68,8 +74,8 @@
     "tracingTags": ["digitransit-subscription-id"]
   },
   "flex": {
-    "maxTransferDuration": "1m",
-    "maxFlexTripDuration": "3h",
+    "maxTransferDuration": "5m",
+    "maxFlexTripDuration": "40m",
     "maxAccessWalkDuration": "5m",
     "maxEgressWalkDuration": "5m"
   },
diff --git a/hsl/config.js b/hsl/config.js
@@ -10,6 +10,11 @@ module.exports = {
       undefined,
       { 'trips.txt': 'trips2.txt' },
     ),
+    mapSrc(
+      '02Taksi',
+      'https://resources.02taksi.fi/digitransit_02_taksi.zip',
+      false,
+    ),
     /*
     mapSrc(
       'HSLlautta',
diff --git a/hsl/router-config.json b/hsl/router-config.json
@@ -28,8 +28,8 @@
       "maxDuration": "1h",
       "penalty": {
         "FLEXIBLE": {
-          "timePenalty": "10m + 1.9t",
-          "costFactor": 2
+          "timePenalty": "5m + 5t",
+          "costFactor": 1
         }
       }
     },
diff --git a/varely/config.js b/varely/config.js
@@ -14,6 +14,11 @@ module.exports = {
     ),
     mapSrc('Salo', 'https://tvv.fra1.digitaloceanspaces.com/239.zip', true),
     mapSrc('Pori', 'https://tvv.fra1.digitaloceanspaces.com/231.zip', true),
+    mapSrc(
+      '02Taksi',
+      'https://resources.02taksi.fi/digitransit_02_taksi.zip',
+      false,
+    ),
   ],
   osm: ['varely'],
 };
diff --git a/varely/otp-config.json b/varely/otp-config.json
@@ -8,6 +8,7 @@
     "SandboxAPIMapboxVectorTilesApi": true,
     "ActuatorAPI": true,
     "AsyncGraphQLFetchers": false,
-    "DebugRasterTiles": true
+    "DebugRasterTiles": true,
+    "FlexRouting": true
   }
 }
diff --git a/varely/router-config.json b/varely/router-config.json
@@ -25,7 +25,13 @@
       "boardCost": 120
     },
     "accessEgress": {
-      "maxDuration": "1h"
+      "maxDuration": "1h",
+      "penalty": {
+        "FLEXIBLE": {
+          "timePenalty": "5m + 5t",
+          "costFactor": 1
+        }
+      }
     },
     "maxDirectStreetDuration": "2h",
     "maxDirectStreetDurationForMode": {
@@ -51,6 +57,12 @@
   "gtfsApi": {
     "tracingTags": ["digitransit-subscription-id"]
   },
+  "flex": {
+    "maxTransferDuration": "5m",
+    "maxFlexTripDuration": "30m",
+    "maxAccessWalkDuration": "5m",
+    "maxEgressWalkDuration": "5m"
+  },
   "transit": {
     "pagingSearchWindowAdjustments": ["8h", "4h", "4h", "4h", "4h"],
     "dynamicSearchWindow": {
diff --git a/waltti-alt/config.js b/waltti-alt/config.js
@@ -27,6 +27,11 @@ module.exports = {
         },
       },
     ),
+    mapSrc(
+      '02Taksi',
+      'https://resources.02taksi.fi/digitransit_02_taksi.zip',
+      false,
+    ),
     mapSrc(
       'WalttiTest',
       'https://tvv.fra1.digitaloceanspaces.com/229.zip',
diff --git a/waltti-alt/otp-config.json b/waltti-alt/otp-config.json
@@ -8,6 +8,7 @@
     "SandboxAPIMapboxVectorTilesApi": true,
     "ActuatorAPI": true,
     "AsyncGraphQLFetchers": false,
-    "DebugRasterTiles": true
+    "DebugRasterTiles": true,
+    "FlexRouting": true
   }
 }
diff --git a/waltti-alt/router-config.json b/waltti-alt/router-config.json
@@ -25,7 +25,13 @@
       "boardCost": 120
     },
     "accessEgress": {
-      "maxDuration": "1h"
+      "maxDuration": "1h",
+      "penalty": {
+        "FLEXIBLE": {
+          "timePenalty": "5m + 5t",
+          "costFactor": 1
+        }
+      }
     },
     "maxDirectStreetDuration": "4h",
     "maxDirectStreetDurationForMode": {
@@ -51,6 +57,12 @@
   "gtfsApi": {
     "tracingTags": ["digitransit-subscription-id"]
   },
+  "flex": {
+    "maxTransferDuration": "5m",
+    "maxFlexTripDuration": "30m",
+    "maxAccessWalkDuration": "5m",
+    "maxEgressWalkDuration": "5m"
+  },
   "transit": {
     "pagingSearchWindowAdjustments": ["8h", "4h", "4h", "4h", "4h"],
     "dynamicSearchWindow": {
diff --git a/waltti/config.js b/waltti/config.js
@@ -127,6 +127,11 @@ module.exports = {
     ),
     mapSrc('Salo', 'https://tvv.fra1.digitaloceanspaces.com/239.zip', true),
     mapSrc('Kajaani', 'https://tvv.fra1.digitaloceanspaces.com/211.zip', true),
+    mapSrc(
+      '02Taksi',
+      'https://resources.02taksi.fi/digitransit_02_taksi.zip',
+      false,
+    ),
   ],
   osm: ['kajaani', 'oulu', 'rovaniemi', 'southFinland', 'vaasa'],
 };
diff --git a/waltti/otp-config.json b/waltti/otp-config.json
@@ -10,6 +10,7 @@
     "ActuatorAPI": true,
     "AsyncGraphQLFetchers": false,
     "Emission": true,
-    "DebugRasterTiles": true
+    "DebugRasterTiles": true,
+    "FlexRouting": true
   }
 }
diff --git a/waltti/router-config.json b/waltti/router-config.json
@@ -25,7 +25,13 @@
       "boardCost": 120
     },
     "accessEgress": {
-      "maxDuration": "1h"
+      "maxDuration": "1h",
+      "penalty": {
+        "FLEXIBLE": {
+          "timePenalty": "5m + 5t",
+          "costFactor": 1
+        }
+      }
     },
     "maxDirectStreetDuration": "2h",
     "maxDirectStreetDurationForMode": {
@@ -55,6 +61,12 @@
   "gtfsApi": {
     "tracingTags": ["digitransit-subscription-id"]
   },
+  "flex": {
+    "maxTransferDuration": "5m",
+    "maxFlexTripDuration": "30m",
+    "maxAccessWalkDuration": "5m",
+    "maxEgressWalkDuration": "5m"
+  },
   "transit": {
     "pagingSearchWindowAdjustments": ["8h", "4h", "4h", "4h", "4h"],
     "dynamicSearchWindow": {

Original file line number	Diff line number	Diff line change
`@@ -28,8 +28,8 @@`
`28`	`28`	`"maxDuration": "1h",`
`29`	`29`	`"penalty": {`
`30`	`30`	`"FLEXIBLE": {`
`31`		`- "timePenalty": "10m + 1.9t",`
`32`		`- "costFactor": 2`
	`31`	`+ "timePenalty": "5m + 5t",`
	`32`	`+ "costFactor": 1`
`33`	`33`	`}`
`34`	`34`	`}`
`35`	`35`	`},`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@`
`8`	`8`	`"SandboxAPIMapboxVectorTilesApi": true,`
`9`	`9`	`"ActuatorAPI": true,`
`10`	`10`	`"AsyncGraphQLFetchers": false,`
`11`		`- "DebugRasterTiles": true`
	`11`	`+ "DebugRasterTiles": true,`
	`12`	`+ "FlexRouting": true`
`12`	`13`	`}`
`13`	`14`	`}`