Skip to content

Commit 5799865

Browse files
authored
Merge pull request #535 from HSLdevcom/remove-flex-and-car-transit-for-release-v2
Remove flex, car transit, and Kuopio data for release v2
2 parents cadb537 + e189ae3 commit 5799865

14 files changed

Lines changed: 16 additions & 102 deletions

finland/router-config.json

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,6 @@
3535
"maxStopCountForMode": {
3636
"BIKE": 0,
3737
"CAR": 0
38-
},
39-
"penalty": {
40-
"FLEXIBLE": {
41-
"timePenalty": "20m + 3t",
42-
"costFactor": 1
43-
}
4438
}
4539
},
4640
"maxDirectStreetDuration": "100h",
@@ -74,11 +68,10 @@
7468
"tracingTags": ["digitransit-subscription-id"]
7569
},
7670
"flex": {
77-
"maxTransferDuration": "5m",
78-
"maxFlexTripDuration": "1h",
71+
"maxTransferDuration": "1m",
72+
"maxFlexTripDuration": "3h",
7973
"maxAccessWalkDuration": "5m",
80-
"maxEgressWalkDuration": "5m",
81-
"maxFlexStopCount": 300
74+
"maxEgressWalkDuration": "5m"
8275
},
8376
"transit": {
8477
"pagingSearchWindowAdjustments": ["8h", "4h", "4h", "4h", "4h"],

hsl/config.js

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,6 @@ module.exports = {
1010
undefined,
1111
{ 'trips.txt': 'trips2.txt' },
1212
),
13-
mapSrc(
14-
'02Taksi',
15-
'https://resources.02taksi.fi/digitransit_02_taksi.zip',
16-
false,
17-
),
1813
/*
1914
mapSrc(
2015
'HSLlautta',

hsl/router-config.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
"maxDuration": "1h",
2929
"penalty": {
3030
"FLEXIBLE": {
31-
"timePenalty": "20m + 3t",
32-
"costFactor": 1
31+
"timePenalty": "10m + 1.9t",
32+
"costFactor": 2
3333
}
3434
}
3535
},
@@ -110,8 +110,7 @@
110110
"maxTransferDuration": "5m",
111111
"maxFlexTripDuration": "30m",
112112
"maxAccessWalkDuration": "5m",
113-
"maxEgressWalkDuration": "5m",
114-
"maxFlexStopCount": 100
113+
"maxEgressWalkDuration": "5m"
115114
},
116115
"transit": {
117116
"maxSearchWindow": "8h",

kela/build-config.json

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,8 @@
1515
"wheelchairAccessibility": {
1616
"enabled": true
1717
}
18-
},
19-
{ "modes": "CAR" }
20-
],
21-
"transferParametersForMode": {
22-
"CAR": {
23-
"disableDefaultTransfers": true,
24-
"carsAllowedStopMaxTransferDuration": "2h"
2518
}
26-
},
19+
],
2720
"boardingLocationTags": ["ref", "ref:findt", "ref:findr"],
2821
"osmDefaults": {
2922
"timeZone": "Europe/Helsinki",

kela/router-config.json

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@
2828
"maxDuration": "8h",
2929
"maxStopCount": "400",
3030
"maxDurationForMode": {
31-
"CAR": "2h"
31+
"CAR": "1m"
3232
},
3333
"maxStopCountForMode": {
34-
"CAR": 0
34+
"CAR": 1
3535
}
3636
},
3737
"maxDirectStreetDuration": "100h",
@@ -79,9 +79,6 @@
7979
"walk": {
8080
"speed": 1.67
8181
}
82-
},
83-
{
84-
"modes": "CAR"
8582
}
8683
]
8784
},

varely/config.js

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,6 @@ module.exports = {
1414
),
1515
mapSrc('Salo', 'https://tvv.fra1.digitaloceanspaces.com/239.zip', true),
1616
mapSrc('Pori', 'https://tvv.fra1.digitaloceanspaces.com/231.zip', true),
17-
mapSrc(
18-
'02Taksi',
19-
'https://resources.02taksi.fi/digitransit_02_taksi.zip',
20-
false,
21-
),
2217
],
2318
osm: ['varely'],
2419
};

varely/otp-config.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
"SandboxAPIMapboxVectorTilesApi": true,
99
"ActuatorAPI": true,
1010
"AsyncGraphQLFetchers": false,
11-
"DebugRasterTiles": true,
12-
"FlexRouting": true
11+
"DebugRasterTiles": true
1312
}
1413
}

varely/router-config.json

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,7 @@
2525
"boardCost": 120
2626
},
2727
"accessEgress": {
28-
"maxDuration": "1h",
29-
"penalty": {
30-
"FLEXIBLE": {
31-
"timePenalty": "20m + 3t",
32-
"costFactor": 1
33-
}
34-
}
28+
"maxDuration": "1h"
3529
},
3630
"maxDirectStreetDuration": "2h",
3731
"maxDirectStreetDurationForMode": {
@@ -57,13 +51,6 @@
5751
"gtfsApi": {
5852
"tracingTags": ["digitransit-subscription-id"]
5953
},
60-
"flex": {
61-
"maxTransferDuration": "5m",
62-
"maxFlexTripDuration": "30m",
63-
"maxAccessWalkDuration": "5m",
64-
"maxEgressWalkDuration": "5m",
65-
"maxFlexStopCount": 100
66-
},
6754
"transit": {
6855
"pagingSearchWindowAdjustments": ["8h", "4h", "4h", "4h", "4h"],
6956
"dynamicSearchWindow": {

waltti-alt/config.js

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,6 @@ module.exports = {
2727
},
2828
},
2929
),
30-
mapSrc(
31-
'02Taksi',
32-
'https://resources.02taksi.fi/digitransit_02_taksi.zip',
33-
false,
34-
),
3530
],
3631
osm: ['oulu', 'southFinland'],
3732
};

waltti-alt/otp-config.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
"SandboxAPIMapboxVectorTilesApi": true,
99
"ActuatorAPI": true,
1010
"AsyncGraphQLFetchers": false,
11-
"DebugRasterTiles": true,
12-
"FlexRouting": true
11+
"DebugRasterTiles": true
1312
}
1413
}

0 commit comments

Comments
 (0)