From f7c0b13debc37c46acb29956e899d14b13f90ac8 Mon Sep 17 00:00:00 2001
From: Joel Lappalainen <lappalj8@gmail.com>
Date: Mon, 2 Dec 2024 12:27:03 +0200
Subject: [PATCH] Move Kajaani and Salo to waltti and put waltti test feed in
 waltti-alt

---
 config.js                     |  5 +++--
 waltti-alt/router-config.json | 29 ++++++-----------------------
 waltti/router-config.json     | 34 ++++++++++++++++++++++++++++++++++
 3 files changed, 43 insertions(+), 25 deletions(-)

diff --git a/config.js b/config.js
index 0792bcb9..11b17242 100644
--- 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
index c9cb80a3..9c6bf8dc 100644
--- 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
index c65ef902..802a8e60 100644
--- 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
     }
   ]
 }