Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DT-5977 rauma and varelyRT to varely, varely data to matka #368

Merged
merged 4 commits into from
Oct 3, 2023
Merged

DT-5977 rauma and varelyRT to varely, varely data to matka #368

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dac4a4e
DT-5977 rauma and varelyRT to varely, varely data to matka
sharhio Sep 26, 2023
20f7b9d
trailing comma removed
sharhio Sep 28, 2023
3e85071
Keep Varely translations.txt
sharhio Oct 2, 2023
c748e1b
unnecessary variable removed
sharhio Oct 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@ const FINLAND_CONFIG = {
src('Pori', 'https://tvv.fra1.digitaloceanspaces.com/231.zip', 'gtfs_shape_mapfit/fit_gtfs_stops.bash'),
src('Viro', 'http://peatus.ee/gtfs/gtfs.zip', false),
src('Vikingline', 'https://fgwgtfsprod.blob.core.windows.net/gtfsout/latest_VIKINGLINE.zip', false),
src('Raasepori', 'https://tvv.fra1.digitaloceanspaces.com/232.zip', 'gtfs_shape_mapfit/fit_gtfs_stops.bash')
src('Raasepori', 'https://tvv.fra1.digitaloceanspaces.com/232.zip', 'gtfs_shape_mapfit/fit_gtfs_stops.bash'),
src('VARELY', 'http://digitransit-proxy:8080/out/varelyadmin.mattersoft.fi/feeds/102.zip', false, undefined)
sharhio marked this conversation as resolved.
Show resolved Hide resolved
],
'osm': ['finland', 'estonia']
}
Expand Down Expand Up @@ -90,8 +91,9 @@ const WALTTI_ALT_CONFIG = {
const VARELY_CONFIG = {
'id': 'varely',
'src': [
src('VARELY', 'http://digitransit-proxy:8080/out/varelyadmin.mattersoft.fi/feeds/102.zip', false, undefined, { 'translations.txt': null }),
src('FOLI', 'http://data.foli.fi/gtfs/gtfs.zip', false)
src('VARELY', 'http://digitransit-proxy:8080/out/varelyadmin.mattersoft.fi/feeds/102.zip', false, undefined),
sharhio marked this conversation as resolved.
Show resolved Hide resolved
src('FOLI', 'http://data.foli.fi/gtfs/gtfs.zip', false),
src('Rauma', 'http://digitransit-proxy:8080/out/raumaadmin.mattersoft.fi/feeds/233.zip', false)
],
'osm': ['finland']
}
Expand Down
17 changes: 17 additions & 0 deletions router-finland/router-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -550,6 +550,23 @@
"url": "http://digitransit-proxy:8080/out/bosse.mattersoft.fi/api/gtfsrealtime/v1.0/feed/servicealert",
"feedId": "Raasepori",
"fuzzyTripMatching": false
},
{
"id": "varely-trip-updates",
"type": "stop-time-updater",
"frequency": "60s",
"url": "http://digitransit-proxy:8080/out/varely.mattersoft.fi/api/gtfsrealtime/v1.0/feed/tripupdate",
"feedId": "VARELY",
"fuzzyTripMatching": false,
"backwardsDelayPropagationType": "ALWAYS"
},
{
"id": "varely-alerts",
"type": "real-time-alerts",
"frequency": "30s",
"url": "http://digitransit-proxy:8080/out/varely.mattersoft.fi/api/gtfsrealtime/v1.0/feed/servicealert",
"feedId": "VARELY",
"fuzzyTripMatching": false
}
]
}
37 changes: 36 additions & 1 deletion router-varely/router-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,5 +83,40 @@
"cacheMaxSeconds": 43200
}
],
"updaters": []
"updaters": [
{
"id": "varely-trip-updates",
"type": "stop-time-updater",
"frequency": "60s",
"url": "http://digitransit-proxy:8080/out/varely.mattersoft.fi/api/gtfsrealtime/v1.0/feed/tripupdate",
"feedId": "VARELY",
"fuzzyTripMatching": false,
"backwardsDelayPropagationType": "ALWAYS"
},
{
"id": "varely-alerts",
"type": "real-time-alerts",
"frequency": "30s",
"url": "http://digitransit-proxy:8080/out/varely.mattersoft.fi/api/gtfsrealtime/v1.0/feed/servicealert",
"feedId": "VARELY",
"fuzzyTripMatching": false
},
{
"id": "rauma-trip-updates",
"type": "stop-time-updater",
"frequency": "60s",
"url": "http://digitransit-proxy:8080/out/rauma.mattersoft.fi/api/gtfsrealtime/v1.0/feed/tripupdate",
"feedId": "Rauma",
"fuzzyTripMatching": false,
"backwardsDelayPropagationType": "ALWAYS"
},
{
"id": "rauma-alerts",
"type": "real-time-alerts",
"frequency": "30s",
"url": "http://digitransit-proxy:8080/out/rauma.mattersoft.fi/api/gtfsrealtime/v1.0/feed/servicealert",
"feedId": "Rauma",
"fuzzyTripMatching": false
}
]
}