From dac4a4e4fc0614dc9e86a0d25b556fab75c67b05 Mon Sep 17 00:00:00 2001 From: sharhio Date: Tue, 26 Sep 2023 15:33:53 +0300 Subject: [PATCH 1/4] DT-5977 rauma and varelyRT to varely, varely data to matka --- config.js | 6 +++-- router-finland/router-config.json | 17 ++++++++++++++ router-varely/router-config.json | 37 ++++++++++++++++++++++++++++++- 3 files changed, 57 insertions(+), 3 deletions(-) diff --git a/config.js b/config.js index 5747e05d..3cab7b86 100644 --- a/config.js +++ b/config.js @@ -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, { 'translations.txt': null }), ], 'osm': ['finland', 'estonia'] } @@ -91,7 +92,8 @@ 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('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'] } diff --git a/router-finland/router-config.json b/router-finland/router-config.json index 386c5037..7eda62fc 100644 --- a/router-finland/router-config.json +++ b/router-finland/router-config.json @@ -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 } ] } diff --git a/router-varely/router-config.json b/router-varely/router-config.json index 3fe3e20b..fd0ac65f 100644 --- a/router-varely/router-config.json +++ b/router-varely/router-config.json @@ -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 + } + ] } From 20f7b9d8df119d302cc0d550103b77a1d1943270 Mon Sep 17 00:00:00 2001 From: sharhio Date: Thu, 28 Sep 2023 14:00:02 +0300 Subject: [PATCH 2/4] trailing comma removed --- config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.js b/config.js index 3cab7b86..a468b901 100644 --- a/config.js +++ b/config.js @@ -46,7 +46,7 @@ const FINLAND_CONFIG = { 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('VARELY', 'http://digitransit-proxy:8080/out/varelyadmin.mattersoft.fi/feeds/102.zip', false, undefined, { 'translations.txt': null }), + src('VARELY', 'http://digitransit-proxy:8080/out/varelyadmin.mattersoft.fi/feeds/102.zip', false, undefined, { 'translations.txt': null }) ], 'osm': ['finland', 'estonia'] } From 3e850717f420f2fef25ff76f0854909ccff768ee Mon Sep 17 00:00:00 2001 From: sharhio Date: Mon, 2 Oct 2023 15:20:54 +0300 Subject: [PATCH 3/4] Keep Varely translations.txt --- config.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config.js b/config.js index a468b901..5ca12bff 100644 --- a/config.js +++ b/config.js @@ -46,7 +46,7 @@ const FINLAND_CONFIG = { 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('VARELY', 'http://digitransit-proxy:8080/out/varelyadmin.mattersoft.fi/feeds/102.zip', false, undefined, { 'translations.txt': null }) + src('VARELY', 'http://digitransit-proxy:8080/out/varelyadmin.mattersoft.fi/feeds/102.zip', false, undefined) ], 'osm': ['finland', 'estonia'] } @@ -91,7 +91,7 @@ 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('VARELY', 'http://digitransit-proxy:8080/out/varelyadmin.mattersoft.fi/feeds/102.zip', false, undefined), src('FOLI', 'http://data.foli.fi/gtfs/gtfs.zip', false), src('Rauma', 'http://digitransit-proxy:8080/out/raumaadmin.mattersoft.fi/feeds/233.zip', false) ], From c748e1b8cffd700eade3d19068317c84928f3560 Mon Sep 17 00:00:00 2001 From: sharhio Date: Tue, 3 Oct 2023 10:33:18 +0300 Subject: [PATCH 4/4] unnecessary variable removed --- config.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config.js b/config.js index 5ca12bff..2b7bacb9 100644 --- a/config.js +++ b/config.js @@ -46,7 +46,7 @@ const FINLAND_CONFIG = { 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('VARELY', 'http://digitransit-proxy:8080/out/varelyadmin.mattersoft.fi/feeds/102.zip', false, undefined) + src('VARELY', 'http://digitransit-proxy:8080/out/varelyadmin.mattersoft.fi/feeds/102.zip', false) ], 'osm': ['finland', 'estonia'] } @@ -91,7 +91,7 @@ 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), + src('VARELY', 'http://digitransit-proxy:8080/out/varelyadmin.mattersoft.fi/feeds/102.zip', false), src('FOLI', 'http://data.foli.fi/gtfs/gtfs.zip', false), src('Rauma', 'http://digitransit-proxy:8080/out/raumaadmin.mattersoft.fi/feeds/233.zip', false) ],