diff --git a/finland/router-config.json b/finland/router-config.json index eeaa77e9..4bab089c 100644 --- a/finland/router-config.json +++ b/finland/router-config.json @@ -35,12 +35,6 @@ "maxStopCountForMode": { "BIKE": 0, "CAR": 0 - }, - "penalty": { - "FLEXIBLE": { - "timePenalty": "20m + 3t", - "costFactor": 1 - } } }, "maxDirectStreetDuration": "100h", @@ -74,11 +68,10 @@ "tracingTags": ["digitransit-subscription-id"] }, "flex": { - "maxTransferDuration": "5m", - "maxFlexTripDuration": "1h", + "maxTransferDuration": "1m", + "maxFlexTripDuration": "3h", "maxAccessWalkDuration": "5m", - "maxEgressWalkDuration": "5m", - "maxFlexStopCount": 300 + "maxEgressWalkDuration": "5m" }, "transit": { "pagingSearchWindowAdjustments": ["8h", "4h", "4h", "4h", "4h"], diff --git a/hsl/config.js b/hsl/config.js index c0983c91..8096be0b 100644 --- a/hsl/config.js +++ b/hsl/config.js @@ -10,11 +10,6 @@ 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 index 1ae45773..efebb5c2 100644 --- a/hsl/router-config.json +++ b/hsl/router-config.json @@ -28,8 +28,8 @@ "maxDuration": "1h", "penalty": { "FLEXIBLE": { - "timePenalty": "20m + 3t", - "costFactor": 1 + "timePenalty": "10m + 1.9t", + "costFactor": 2 } } }, @@ -110,8 +110,7 @@ "maxTransferDuration": "5m", "maxFlexTripDuration": "30m", "maxAccessWalkDuration": "5m", - "maxEgressWalkDuration": "5m", - "maxFlexStopCount": 100 + "maxEgressWalkDuration": "5m" }, "transit": { "maxSearchWindow": "8h", diff --git a/kela/build-config.json b/kela/build-config.json index 60c029a5..1738376a 100644 --- a/kela/build-config.json +++ b/kela/build-config.json @@ -15,15 +15,8 @@ "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 index 7f306ee9..4f7fa183 100644 --- a/kela/router-config.json +++ b/kela/router-config.json @@ -28,10 +28,10 @@ "maxDuration": "8h", "maxStopCount": "400", "maxDurationForMode": { - "CAR": "60m" + "CAR": "1m" }, "maxStopCountForMode": { - "CAR": 0 + "CAR": 1 } }, "maxDirectStreetDuration": "100h", @@ -79,9 +79,6 @@ "walk": { "speed": 1.67 } - }, - { - "modes": "CAR" } ] }, diff --git a/varely/config.js b/varely/config.js index eaeb0dbc..d196b3aa 100644 --- a/varely/config.js +++ b/varely/config.js @@ -14,11 +14,6 @@ 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 index 465d6a8c..65794013 100644 --- a/varely/otp-config.json +++ b/varely/otp-config.json @@ -8,7 +8,6 @@ "SandboxAPIMapboxVectorTilesApi": true, "ActuatorAPI": true, "AsyncGraphQLFetchers": false, - "DebugRasterTiles": true, - "FlexRouting": true + "DebugRasterTiles": true } } diff --git a/varely/router-config.json b/varely/router-config.json index d5607a7e..cabdcd7f 100644 --- a/varely/router-config.json +++ b/varely/router-config.json @@ -25,13 +25,7 @@ "boardCost": 120 }, "accessEgress": { - "maxDuration": "1h", - "penalty": { - "FLEXIBLE": { - "timePenalty": "20m + 3t", - "costFactor": 1 - } - } + "maxDuration": "1h" }, "maxDirectStreetDuration": "2h", "maxDirectStreetDurationForMode": { @@ -57,13 +51,6 @@ "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 index f0009aa9..76b34bf6 100644 --- a/waltti-alt/config.js +++ b/waltti-alt/config.js @@ -27,11 +27,6 @@ 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 index 465d6a8c..65794013 100644 --- a/waltti-alt/otp-config.json +++ b/waltti-alt/otp-config.json @@ -8,7 +8,6 @@ "SandboxAPIMapboxVectorTilesApi": true, "ActuatorAPI": true, "AsyncGraphQLFetchers": false, - "DebugRasterTiles": true, - "FlexRouting": true + "DebugRasterTiles": true } } diff --git a/waltti-alt/router-config.json b/waltti-alt/router-config.json index 9b51e26b..e1f4accb 100644 --- a/waltti-alt/router-config.json +++ b/waltti-alt/router-config.json @@ -25,13 +25,7 @@ "boardCost": 120 }, "accessEgress": { - "maxDuration": "1h", - "penalty": { - "FLEXIBLE": { - "timePenalty": "20m + 3t", - "costFactor": 1 - } - } + "maxDuration": "1h" }, "maxDirectStreetDuration": "4h", "maxDirectStreetDurationForMode": { @@ -57,13 +51,6 @@ "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 index 0cbdfefe..439afaf7 100644 --- a/waltti/config.js +++ b/waltti/config.js @@ -49,13 +49,7 @@ module.exports = { ), mapSrc( 'Kuopio', - 'https://tvv.fra1.digitaloceanspaces.com/221.zip', - true, - undefined, - { - 'fare_attributes.txt': 'digitransit_fare_attributes.txt', - 'fare_rules.txt': 'digitransit_fare_rules.txt', - }, + 'https://karttapalvelu.kuopio.fi/google_transit/google_transit.zip', ), mapSrc( 'OULU', @@ -127,11 +121,6 @@ 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 index fcdd7b40..08d30e8e 100644 --- a/waltti/otp-config.json +++ b/waltti/otp-config.json @@ -10,7 +10,6 @@ "ActuatorAPI": true, "AsyncGraphQLFetchers": false, "Emission": true, - "DebugRasterTiles": true, - "FlexRouting": true + "DebugRasterTiles": true } } diff --git a/waltti/router-config.json b/waltti/router-config.json index 95981a1c..6536cf75 100644 --- a/waltti/router-config.json +++ b/waltti/router-config.json @@ -25,13 +25,7 @@ "boardCost": 120 }, "accessEgress": { - "maxDuration": "1h", - "penalty": { - "FLEXIBLE": { - "timePenalty": "20m + 3t", - "costFactor": 1 - } - } + "maxDuration": "1h" }, "maxDirectStreetDuration": "2h", "maxDirectStreetDurationForMode": { @@ -61,13 +55,6 @@ "gtfsApi": { "tracingTags": ["digitransit-subscription-id"] }, - "flex": { - "maxTransferDuration": "5m", - "maxFlexTripDuration": "30m", - "maxAccessWalkDuration": "5m", - "maxEgressWalkDuration": "5m", - "maxFlexStopCount": 100 - }, "transit": { "pagingSearchWindowAdjustments": ["8h", "4h", "4h", "4h", "4h"], "dynamicSearchWindow": {