Merge pull request #425 from HSLdevcom/DT-6575

DT-6575 Move Kajaani and Salo to waltti and put waltti test feed in waltti-alt
HSLdevcom · Dec 2, 2024 · 055050a · 055050a
2 parents 3d6a043 + f7c0b13
commit 055050a
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 25 deletions.
diff --git a/config.js b/config.js
@@ -92,6 +92,8 @@ const routers = {
       mapSrc('FUNI', 'https://foligtfs.blob.core.windows.net/routeplanner/gtfs-foli-ff.zip', true),
       mapSrc('Raasepori', 'https://tvv.fra1.digitaloceanspaces.com/232.zip', true),
       mapSrc('KotkaLautat', 'https://koontikartta.navici.com/tiedostot/gtfs_lautat.zip', true, ['waltti/gtfs-rules/only-kotka-ferries.rule']),
+      mapSrc('Salo', 'https://tvv.fra1.digitaloceanspaces.com/239.zip', true),
+      mapSrc('Kajaani', 'https://tvv.fra1.digitaloceanspaces.com/211.zip', true),
     ],
     osm: ['finland'],
     dem: 'waltti'
@@ -100,8 +102,7 @@ const routers = {
   'waltti-alt': {
     id: 'waltti-alt',
     src: [
-      mapSrc('Salo', 'https://tvv.fra1.digitaloceanspaces.com/239.zip', true),
-      mapSrc('Kajaani', 'https://tvv.fra1.digitaloceanspaces.com/211.zip', true)
+      mapSrc('WalttiTest', 'http://digitransit-proxy:8080/out/lmjadmin.mattersoft.fi/feeds/229.zip', true),
     ],
     osm: ['finland']
   },

diff --git a/waltti-alt/router-config.json b/waltti-alt/router-config.json
@@ -106,37 +106,20 @@
   },
   "updaters": [
     {
-      "id": "salo-trip-updates",
+      "id": "walttitest-trip-updates",
       "type": "stop-time-updater",
       "frequency": "60s",
-      "url": "http://digitransit-proxy:8080/out/paikku.mattersoft.fi/api/gtfsrealtime/v1.0/feed/tripupdate",
-      "feedId": "Salo",
+      "url": "http://digitransit-proxy:8080/out/lmj.mattersoft.fi/api/gtfsrealtime/v1.0/feed/tripupdate",
+      "feedId": "WalttiTest",
       "fuzzyTripMatching": false,
       "backwardsDelayPropagationType": "ALWAYS"
     },
     {
-      "id": "salo-alerts",
+      "id": "walttitest-alerts",
       "type": "real-time-alerts",
       "frequency": "30s",
-      "url": "http://digitransit-proxy:8080/out/paikku.mattersoft.fi/api/gtfsrealtime/v1.0/feed/servicealert",
-      "feedId": "Salo",
-      "fuzzyTripMatching": false
-    },
-    {
-      "id": "kajaani-trip-updates",
-      "type": "stop-time-updater",
-      "frequency": "60s",
-      "url": "http://digitransit-proxy:8080/out/kajaani.mattersoft.fi/api/gtfsrealtime/v1.0/feed/tripupdate",
-      "feedId": "Kajaani",
-      "fuzzyTripMatching": false,
-      "backwardsDelayPropagationType": "ALWAYS"
-    },
-    {
-      "id": "kajaani-alerts",
-      "type": "real-time-alerts",
-      "frequency": "30s",
-      "url": "http://digitransit-proxy:8080/out/kajaani.mattersoft.fi/api/gtfsrealtime/v1.0/feed/servicealert",
-      "feedId": "Kajaani",
+      "url": "http://digitransit-proxy:8080/out/lmj.mattersoft.fi/api/gtfsrealtime/v1.0/feed/servicealert",
+      "feedId": "WalttiTest",
       "fuzzyTripMatching": false
     }
   ]

diff --git a/waltti/router-config.json b/waltti/router-config.json
@@ -529,6 +529,40 @@
       "frequency": "30s",
       "url": "https://gbfs.urbansharing.com/tampere.onurbansharing.com/gbfs.json",
       "overloadingAllowed": true
+    },
+    {
+      "id": "salo-trip-updates",
+      "type": "stop-time-updater",
+      "frequency": "60s",
+      "url": "http://digitransit-proxy:8080/out/paikku.mattersoft.fi/api/gtfsrealtime/v1.0/feed/tripupdate",
+      "feedId": "Salo",
+      "fuzzyTripMatching": false,
+      "backwardsDelayPropagationType": "ALWAYS"
+    },
+    {
+      "id": "salo-alerts",
+      "type": "real-time-alerts",
+      "frequency": "30s",
+      "url": "http://digitransit-proxy:8080/out/paikku.mattersoft.fi/api/gtfsrealtime/v1.0/feed/servicealert",
+      "feedId": "Salo",
+      "fuzzyTripMatching": false
+    },
+    {
+      "id": "kajaani-trip-updates",
+      "type": "stop-time-updater",
+      "frequency": "60s",
+      "url": "http://digitransit-proxy:8080/out/kajaani.mattersoft.fi/api/gtfsrealtime/v1.0/feed/tripupdate",
+      "feedId": "Kajaani",
+      "fuzzyTripMatching": false,
+      "backwardsDelayPropagationType": "ALWAYS"
+    },
+    {
+      "id": "kajaani-alerts",
+      "type": "real-time-alerts",
+      "frequency": "30s",
+      "url": "http://digitransit-proxy:8080/out/kajaani.mattersoft.fi/api/gtfsrealtime/v1.0/feed/servicealert",
+      "feedId": "Kajaani",
+      "fuzzyTripMatching": false
     }
   ]
 }