Merge pull request #533 from HSLdevcom/revert-532-remove-flex-and-car-transit-for-release

VillePihlava · web-flow · commit 0dfab2ced2cb · 2026-03-26T13:12:01.000+02:00
Revert "Remove flex, car transit, and Kuopio data 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": "20m + 3t",
+          "costFactor": 1
+        }
       }
     },
     "maxDirectStreetDuration": "100h",
@@ -68,10 +74,11 @@
     "tracingTags": ["digitransit-subscription-id"]
   },
   "flex": {
-    "maxTransferDuration": "1m",
-    "maxFlexTripDuration": "3h",
+    "maxTransferDuration": "5m",
+    "maxFlexTripDuration": "1h",
     "maxAccessWalkDuration": "5m",
-    "maxEgressWalkDuration": "5m"
+    "maxEgressWalkDuration": "5m",
+    "maxFlexStopCount": 300
   },
   "transit": {
     "pagingSearchWindowAdjustments": ["8h", "4h", "4h", "4h", "4h"],
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": "20m + 3t",
+          "costFactor": 1
         }
       }
     },
@@ -110,7 +110,8 @@
     "maxTransferDuration": "5m",
     "maxFlexTripDuration": "30m",
     "maxAccessWalkDuration": "5m",
-    "maxEgressWalkDuration": "5m"
+    "maxEgressWalkDuration": "5m",
+    "maxFlexStopCount": 100
   },
   "transit": {
     "maxSearchWindow": "8h",
diff --git a/kela/build-config.json b/kela/build-config.json
@@ -15,8 +15,15 @@
       "wheelchairAccessibility": {
         "enabled": true
       }
-    }
+    },
+    { "modes": "CAR" }
   ],
+  "transferParametersForMode": {
+    "CAR": {
+      "disableDefaultTransfers": true,
+      "carsAllowedStopMaxTransferDuration": "60m"
+    }
+  },
   "boardingLocationTags": ["ref", "ref:findt", "ref:findr"],
   "osmDefaults": {
     "timeZone": "Europe/Helsinki",
diff --git a/kela/router-config.json b/kela/router-config.json
@@ -28,10 +28,10 @@
       "maxDuration": "8h",
       "maxStopCount": "400",
       "maxDurationForMode": {
-        "CAR": "1m"
+        "CAR": "60m"
       },
       "maxStopCountForMode": {
-        "CAR": 1
+        "CAR": 0
       }
     },
     "maxDirectStreetDuration": "100h",
@@ -79,6 +79,9 @@
         "walk": {
           "speed": 1.67
         }
+      },
+      {
+        "modes": "CAR"
       }
     ]
   },
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": "20m + 3t",
+          "costFactor": 1
+        }
+      }
     },
     "maxDirectStreetDuration": "2h",
     "maxDirectStreetDurationForMode": {
@@ -51,6 +57,13 @@
   "gtfsApi": {
     "tracingTags": ["digitransit-subscription-id"]
   },
+  "flex": {
+    "maxTransferDuration": "5m",
+    "maxFlexTripDuration": "30m",
+    "maxAccessWalkDuration": "5m",
+    "maxEgressWalkDuration": "5m",
+    "maxFlexStopCount": 100
+  },
   "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,
+    ),
   ],
   osm: ['oulu', 'southFinland'],
 };
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": "20m + 3t",
+          "costFactor": 1
+        }
+      }
     },
     "maxDirectStreetDuration": "4h",
     "maxDirectStreetDurationForMode": {
@@ -51,6 +57,13 @@
   "gtfsApi": {
     "tracingTags": ["digitransit-subscription-id"]
   },
+  "flex": {
+    "maxTransferDuration": "5m",
+    "maxFlexTripDuration": "30m",
+    "maxAccessWalkDuration": "5m",
+    "maxEgressWalkDuration": "5m",
+    "maxFlexStopCount": 100
+  },
   "transit": {
     "pagingSearchWindowAdjustments": ["8h", "4h", "4h", "4h", "4h"],
     "dynamicSearchWindow": {
diff --git a/waltti/config.js b/waltti/config.js
@@ -49,7 +49,13 @@ module.exports = {
     ),
     mapSrc(
       'Kuopio',
-      'https://karttapalvelu.kuopio.fi/google_transit/google_transit.zip',
+      'https://tvv.fra1.digitaloceanspaces.com/221.zip',
+      true,
+      undefined,
+      {
+        'fare_attributes.txt': 'digitransit_fare_attributes.txt',
+        'fare_rules.txt': 'digitransit_fare_rules.txt',
+      },
     ),
     mapSrc(
       'OULU',
@@ -121,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": "20m + 3t",
+          "costFactor": 1
+        }
+      }
     },
     "maxDirectStreetDuration": "2h",
     "maxDirectStreetDurationForMode": {
@@ -55,6 +61,13 @@
   "gtfsApi": {
     "tracingTags": ["digitransit-subscription-id"]
   },
+  "flex": {
+    "maxTransferDuration": "5m",
+    "maxFlexTripDuration": "30m",
+    "maxAccessWalkDuration": "5m",
+    "maxEgressWalkDuration": "5m",
+    "maxFlexStopCount": 100
+  },
   "transit": {
     "pagingSearchWindowAdjustments": ["8h", "4h", "4h", "4h", "4h"],
     "dynamicSearchWindow": {

Original file line number	Diff line number	Diff line change
`@@ -28,10 +28,10 @@`
`28`	`28`	`"maxDuration": "8h",`
`29`	`29`	`"maxStopCount": "400",`
`30`	`30`	`"maxDurationForMode": {`
`31`		`- "CAR": "1m"`
	`31`	`+ "CAR": "60m"`
`32`	`32`	`},`
`33`	`33`	`"maxStopCountForMode": {`
`34`		`- "CAR": 1`
	`34`	`+ "CAR": 0`
`35`	`35`	`}`
`36`	`36`	`},`
`37`	`37`	`"maxDirectStreetDuration": "100h",`
`@@ -79,6 +79,9 @@`
`79`	`79`	`"walk": {`
`80`	`80`	`"speed": 1.67`
`81`	`81`	`}`
	`82`	`+ },`
	`83`	`+ {`
	`84`	`+ "modes": "CAR"`
`82`	`85`	`}`
`83`	`86`	`]`
`84`	`87`	`},`
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`	`}`