From a9a87ac59052c429f62004f0f6ad90d7609471d1 Mon Sep 17 00:00:00 2001 From: Ville Pihlava Date: Wed, 26 Aug 2026 15:55:00 +0300 Subject: [PATCH 1/2] Revert "Remove flex and carpickupzone test configuration" --- configs/finland/config.js | 11 ++++++----- configs/finland/otp-config.json | 3 ++- configs/finland/router-config.json | 14 +++++++++++--- configs/varely/config.js | 6 ++++++ configs/varely/otp-config.json | 3 ++- configs/waltti-alt/config.js | 6 ++++++ configs/waltti-alt/otp-config.json | 3 ++- configs/waltti/config.js | 6 ++++++ configs/waltti/otp-config.json | 3 ++- 9 files changed, 43 insertions(+), 12 deletions(-) diff --git a/configs/finland/config.js b/configs/finland/config.js index 4b03bf83..76afbe85 100644 --- a/configs/finland/config.js +++ b/configs/finland/config.js @@ -116,11 +116,12 @@ module.exports = { 'https://minfoapi.matkahuolto.fi/gtfs/177/gtfs.zip', true, ), - mapSrc( - '02Taksi', - 'https://resources.02taksi.fi/digitransit_02_taksi.zip', - false, - ), + ], + carPickupZone: [ + { + id: '02Taksi_carpickupzone', + url: 'https://gtfsdata.blob.core.windows.net/finland/02Taksi-carpickupzone-gtfs.zip', + }, ], netex: [ { diff --git a/configs/finland/otp-config.json b/configs/finland/otp-config.json index 52526c58..ad132b10 100644 --- a/configs/finland/otp-config.json +++ b/configs/finland/otp-config.json @@ -11,6 +11,7 @@ "AsyncGraphQLFetchers": false, "Emission": true, "DebugRasterTiles": true, - "FlexRouting": true + "FlexRouting": true, + "CarPickupZone": true } } diff --git a/configs/finland/router-config.json b/configs/finland/router-config.json index 6e0ef429..42b63e1a 100644 --- a/configs/finland/router-config.json +++ b/configs/finland/router-config.json @@ -35,6 +35,12 @@ "maxStopCountForMode": { "BIKE": 0, "CAR": 0 + }, + "penalty": { + "FLEXIBLE": { + "timePenalty": "10m + 2t", + "costFactor": 1 + } } }, "maxDirectStreetDuration": "100h", @@ -68,10 +74,12 @@ "tracingTags": ["digitransit-subscription-id"] }, "flex": { - "maxTransferDuration": "1m", - "maxFlexTripDuration": "3h", + "maxTransferDuration": "5m", + "maxFlexTripDuration": "40m", "maxAccessWalkDuration": "5m", - "maxEgressWalkDuration": "5m" + "maxEgressWalkDuration": "5m", + "boardCost": 600, + "reluctance": 5.0 }, "transit": { "pagingSearchWindowAdjustments": ["8h", "4h", "4h", "4h", "4h"], diff --git a/configs/varely/config.js b/configs/varely/config.js index d6afe59d..c360d83e 100644 --- a/configs/varely/config.js +++ b/configs/varely/config.js @@ -15,5 +15,11 @@ module.exports = { mapSrc('Salo', 'https://tvv.fra1.digitaloceanspaces.com/239.zip', true), mapSrc('Pori', 'https://tvv.fra1.digitaloceanspaces.com/231.zip', true), ], + carPickupZone: [ + { + id: '02Taksi_carpickupzone', + url: 'https://gtfsdata.blob.core.windows.net/finland/02Taksi-carpickupzone-gtfs.zip', + }, + ], osm: ['varely'], }; diff --git a/configs/varely/otp-config.json b/configs/varely/otp-config.json index 65794013..d08f3103 100644 --- a/configs/varely/otp-config.json +++ b/configs/varely/otp-config.json @@ -8,6 +8,7 @@ "SandboxAPIMapboxVectorTilesApi": true, "ActuatorAPI": true, "AsyncGraphQLFetchers": false, - "DebugRasterTiles": true + "DebugRasterTiles": true, + "CarPickupZone": true } } diff --git a/configs/waltti-alt/config.js b/configs/waltti-alt/config.js index 41bf594b..00a96d52 100644 --- a/configs/waltti-alt/config.js +++ b/configs/waltti-alt/config.js @@ -33,5 +33,11 @@ module.exports = { 'true', ), ], + carPickupZone: [ + { + id: '02Taksi_carpickupzone', + url: 'https://gtfsdata.blob.core.windows.net/finland/02Taksi-carpickupzone-gtfs.zip', + }, + ], osm: ['oulu', 'southFinland'], }; diff --git a/configs/waltti-alt/otp-config.json b/configs/waltti-alt/otp-config.json index 65794013..d08f3103 100644 --- a/configs/waltti-alt/otp-config.json +++ b/configs/waltti-alt/otp-config.json @@ -8,6 +8,7 @@ "SandboxAPIMapboxVectorTilesApi": true, "ActuatorAPI": true, "AsyncGraphQLFetchers": false, - "DebugRasterTiles": true + "DebugRasterTiles": true, + "CarPickupZone": true } } diff --git a/configs/waltti/config.js b/configs/waltti/config.js index 2c9258cd..06630cfd 100644 --- a/configs/waltti/config.js +++ b/configs/waltti/config.js @@ -128,5 +128,11 @@ module.exports = { mapSrc('Salo', 'https://tvv.fra1.digitaloceanspaces.com/239.zip', true), mapSrc('Kajaani', 'https://tvv.fra1.digitaloceanspaces.com/211.zip', true), ], + carPickupZone: [ + { + id: '02Taksi_carpickupzone', + url: 'https://gtfsdata.blob.core.windows.net/finland/02Taksi-carpickupzone-gtfs.zip', + }, + ], osm: ['kajaani', 'oulu', 'rovaniemi', 'southFinland', 'vaasa'], }; diff --git a/configs/waltti/otp-config.json b/configs/waltti/otp-config.json index 08d30e8e..977bb877 100644 --- a/configs/waltti/otp-config.json +++ b/configs/waltti/otp-config.json @@ -10,6 +10,7 @@ "ActuatorAPI": true, "AsyncGraphQLFetchers": false, "Emission": true, - "DebugRasterTiles": true + "DebugRasterTiles": true, + "CarPickupZone": true } } From 1badcef147eec635a8e119b8d24f8ccf69e69418 Mon Sep 17 00:00:00 2001 From: Ville Pihlava Date: Mon, 7 Sep 2026 12:52:40 +0300 Subject: [PATCH 2/2] Rename carPickupZone to taxiZone. --- configs/finland/config.js | 6 +++--- configs/finland/otp-config.json | 2 +- configs/varely/config.js | 6 +++--- configs/varely/otp-config.json | 2 +- configs/waltti-alt/config.js | 6 +++--- configs/waltti-alt/otp-config.json | 2 +- configs/waltti/config.js | 6 +++--- configs/waltti/otp-config.json | 2 +- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/configs/finland/config.js b/configs/finland/config.js index 76afbe85..35fe72da 100644 --- a/configs/finland/config.js +++ b/configs/finland/config.js @@ -117,10 +117,10 @@ module.exports = { true, ), ], - carPickupZone: [ + taxiZone: [ { - id: '02Taksi_carpickupzone', - url: 'https://gtfsdata.blob.core.windows.net/finland/02Taksi-carpickupzone-gtfs.zip', + id: '02Taksi', + url: 'https://gtfsdata.blob.core.windows.net/finland/02Taksi-taxizone.zip', }, ], netex: [ diff --git a/configs/finland/otp-config.json b/configs/finland/otp-config.json index ad132b10..5ece5f32 100644 --- a/configs/finland/otp-config.json +++ b/configs/finland/otp-config.json @@ -12,6 +12,6 @@ "Emission": true, "DebugRasterTiles": true, "FlexRouting": true, - "CarPickupZone": true + "TaxiZone": true } } diff --git a/configs/varely/config.js b/configs/varely/config.js index c360d83e..2a4f3095 100644 --- a/configs/varely/config.js +++ b/configs/varely/config.js @@ -15,10 +15,10 @@ module.exports = { mapSrc('Salo', 'https://tvv.fra1.digitaloceanspaces.com/239.zip', true), mapSrc('Pori', 'https://tvv.fra1.digitaloceanspaces.com/231.zip', true), ], - carPickupZone: [ + taxiZone: [ { - id: '02Taksi_carpickupzone', - url: 'https://gtfsdata.blob.core.windows.net/finland/02Taksi-carpickupzone-gtfs.zip', + id: '02Taksi', + url: 'https://gtfsdata.blob.core.windows.net/finland/02Taksi-taxizone.zip', }, ], osm: ['varely'], diff --git a/configs/varely/otp-config.json b/configs/varely/otp-config.json index d08f3103..434c7bcc 100644 --- a/configs/varely/otp-config.json +++ b/configs/varely/otp-config.json @@ -9,6 +9,6 @@ "ActuatorAPI": true, "AsyncGraphQLFetchers": false, "DebugRasterTiles": true, - "CarPickupZone": true + "TaxiZone": true } } diff --git a/configs/waltti-alt/config.js b/configs/waltti-alt/config.js index 00a96d52..62763bdd 100644 --- a/configs/waltti-alt/config.js +++ b/configs/waltti-alt/config.js @@ -33,10 +33,10 @@ module.exports = { 'true', ), ], - carPickupZone: [ + taxiZone: [ { - id: '02Taksi_carpickupzone', - url: 'https://gtfsdata.blob.core.windows.net/finland/02Taksi-carpickupzone-gtfs.zip', + id: '02Taksi', + url: 'https://gtfsdata.blob.core.windows.net/finland/02Taksi-taxizone.zip', }, ], osm: ['oulu', 'southFinland'], diff --git a/configs/waltti-alt/otp-config.json b/configs/waltti-alt/otp-config.json index d08f3103..434c7bcc 100644 --- a/configs/waltti-alt/otp-config.json +++ b/configs/waltti-alt/otp-config.json @@ -9,6 +9,6 @@ "ActuatorAPI": true, "AsyncGraphQLFetchers": false, "DebugRasterTiles": true, - "CarPickupZone": true + "TaxiZone": true } } diff --git a/configs/waltti/config.js b/configs/waltti/config.js index 06630cfd..bfa1476e 100644 --- a/configs/waltti/config.js +++ b/configs/waltti/config.js @@ -128,10 +128,10 @@ module.exports = { mapSrc('Salo', 'https://tvv.fra1.digitaloceanspaces.com/239.zip', true), mapSrc('Kajaani', 'https://tvv.fra1.digitaloceanspaces.com/211.zip', true), ], - carPickupZone: [ + taxiZone: [ { - id: '02Taksi_carpickupzone', - url: 'https://gtfsdata.blob.core.windows.net/finland/02Taksi-carpickupzone-gtfs.zip', + id: '02Taksi', + url: 'https://gtfsdata.blob.core.windows.net/finland/02Taksi-taxizone.zip', }, ], osm: ['kajaani', 'oulu', 'rovaniemi', 'southFinland', 'vaasa'], diff --git a/configs/waltti/otp-config.json b/configs/waltti/otp-config.json index 977bb877..8849a2f3 100644 --- a/configs/waltti/otp-config.json +++ b/configs/waltti/otp-config.json @@ -11,6 +11,6 @@ "AsyncGraphQLFetchers": false, "Emission": true, "DebugRasterTiles": true, - "CarPickupZone": true + "TaxiZone": true } }