diff --git a/configs/finland/config.js b/configs/finland/config.js index 4b03bf83..35fe72da 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, - ), + ], + taxiZone: [ + { + 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 52526c58..5ece5f32 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, + "TaxiZone": 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..2a4f3095 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), ], + taxiZone: [ + { + 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 65794013..434c7bcc 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, + "TaxiZone": true } } diff --git a/configs/waltti-alt/config.js b/configs/waltti-alt/config.js index 41bf594b..62763bdd 100644 --- a/configs/waltti-alt/config.js +++ b/configs/waltti-alt/config.js @@ -33,5 +33,11 @@ module.exports = { 'true', ), ], + taxiZone: [ + { + 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 65794013..434c7bcc 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, + "TaxiZone": true } } diff --git a/configs/waltti/config.js b/configs/waltti/config.js index 2c9258cd..bfa1476e 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), ], + taxiZone: [ + { + 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 08d30e8e..8849a2f3 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, + "TaxiZone": true } }