Skip to content

Commit 226e22a

Browse files
authored
Merge pull request #550 from HSLdevcom/remove-flex-and-others
Remove flex test configurations
2 parents f3f42fb + fd7036b commit 226e22a

12 files changed

Lines changed: 10 additions & 75 deletions

finland/router-config.json

Lines changed: 2 additions & 8 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": "5m + 5t",
42-
"costFactor": 1
43-
}
4438
}
4539
},
4640
"maxDirectStreetDuration": "100h",
@@ -74,8 +68,8 @@
7468
"tracingTags": ["digitransit-subscription-id"]
7569
},
7670
"flex": {
77-
"maxTransferDuration": "5m",
78-
"maxFlexTripDuration": "40m",
71+
"maxTransferDuration": "1m",
72+
"maxFlexTripDuration": "3h",
7973
"maxAccessWalkDuration": "5m",
8074
"maxEgressWalkDuration": "5m"
8175
},

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-
'Uber',
15-
'https://gtfsdata.blob.core.windows.net/hsl/ubertaksi-gtfs.zip',
16-
false,
17-
),
1813
/*
1914
mapSrc(
2015
'HSLlautta',

hsl/router-config.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
"maxDuration": "1h",
2929
"penalty": {
3030
"FLEXIBLE": {
31-
"timePenalty": "5m + 5t",
32-
"costFactor": 1
31+
"timePenalty": "10m + 1.9t",
32+
"costFactor": 2
3333
}
3434
}
3535
},

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 & 13 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": "5m + 5t",
32-
"costFactor": 1
33-
}
34-
}
28+
"maxDuration": "1h"
3529
},
3630
"maxDirectStreetDuration": "2h",
3731
"maxDirectStreetDurationForMode": {
@@ -57,12 +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-
},
6654
"transit": {
6755
"pagingSearchWindowAdjustments": ["8h", "4h", "4h", "4h", "4h"],
6856
"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
mapSrc(
3631
'WalttiTest',
3732
'https://tvv.fra1.digitaloceanspaces.com/229.zip',

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
}

waltti-alt/router-config.json

Lines changed: 1 addition & 13 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": "5m + 5t",
32-
"costFactor": 1
33-
}
34-
}
28+
"maxDuration": "1h"
3529
},
3630
"maxDirectStreetDuration": "4h",
3731
"maxDirectStreetDurationForMode": {
@@ -57,12 +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-
},
6654
"transit": {
6755
"pagingSearchWindowAdjustments": ["8h", "4h", "4h", "4h", "4h"],
6856
"dynamicSearchWindow": {

waltti/config.js

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -127,11 +127,6 @@ module.exports = {
127127
),
128128
mapSrc('Salo', 'https://tvv.fra1.digitaloceanspaces.com/239.zip', true),
129129
mapSrc('Kajaani', 'https://tvv.fra1.digitaloceanspaces.com/211.zip', true),
130-
mapSrc(
131-
'02Taksi',
132-
'https://resources.02taksi.fi/digitransit_02_taksi.zip',
133-
false,
134-
),
135130
],
136131
osm: ['kajaani', 'oulu', 'rovaniemi', 'southFinland', 'vaasa'],
137132
};

0 commit comments

Comments
 (0)