Merge pull request #368 from HSLdevcom/DT-5977

DT-5977 rauma and varelyRT to varely, varely data to matka
HSLdevcom · Oct 3, 2023 · 91580aa · 91580aa
2 parents bef03a5 + c748e1b
commit 91580aa
Show file tree

Hide file tree

Showing 3 changed files with 58 additions and 4 deletions.
diff --git 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)
   ],
   'osm': ['finland', 'estonia']
 }
@@ -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),
+    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
@@ -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
@@ -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
+    }
+  ]
 }