Revert "Revert "Revert "Merge pull request #367 from HSLdevcom/DT-603…

…3""" This reverts commit bd98ed5.
HSLdevcom · Oct 17, 2023 · 1f4d80e · 1f4d80e
1 parent 059acbc
commit 1f4d80e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 12 deletions.
diff --git a/config.js b/config.js
@@ -71,9 +71,7 @@ const WALTTI_CONFIG = {
     src('digitraffic', 'https://rata.digitraffic.fi/api/v1/trains/gtfs-passenger-stops.zip', false, undefined, undefined, { gzip: true }),
     src('tampereDRT', 'https://ekstrat.tampere.fi/ekstrat/ptdata/tamperefeed_kutsuliikenne.zip', false),
     src('Pori', 'https://tvv.fra1.digitaloceanspaces.com/231.zip', 'gtfs_shape_mapfit/fit_gtfs_stops.bash'),
-    src('FUNI', 'https://foligtfs.blob.core.windows.net/routeplanner/gtfs-foli-ff.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('RaaseporiELY', 'https://koontikartta.navici.com/tiedostot/gtfs_raasepori.zip', false)
+    src('FUNI', 'https://foligtfs.blob.core.windows.net/routeplanner/gtfs-foli-ff.zip', 'gtfs_shape_mapfit/fit_gtfs_stops.bash')
   ],
   'osm': ['finland'],
   'dem': 'waltti'
@@ -83,7 +81,8 @@ const WALTTI_ALT_CONFIG = {
   'id': 'waltti-alt',
   'src': [
     src('Salo', 'https://tvv.fra1.digitaloceanspaces.com/239.zip', 'gtfs_shape_mapfit/fit_gtfs_stops.bash'),
-    src('Kajaani', 'https://tvv.fra1.digitaloceanspaces.com/211.zip', 'gtfs_shape_mapfit/fit_gtfs_stops.bash')
+    src('Kajaani', 'https://tvv.fra1.digitaloceanspaces.com/211.zip', 'gtfs_shape_mapfit/fit_gtfs_stops.bash'),
+    src('Raasepori', 'https://tvv.fra1.digitaloceanspaces.com/232.zip', 'gtfs_shape_mapfit/fit_gtfs_stops.bash')
   ],
   'osm': ['finland']
 }

diff --git a/router-waltti-alt/router-config.json b/router-waltti-alt/router-config.json
@@ -127,6 +127,14 @@
       "url": "http://digitransit-proxy:8080/out/kajaani.mattersoft.fi/api/gtfsrealtime/v1.0/feed/servicealert",
       "feedId": "Kajaani",
       "fuzzyTripMatching": false
+    },
+    {
+      "id": "raasepori-alerts",
+      "type": "real-time-alerts",
+      "frequency": "30s",
+      "url": "http://digitransit-proxy:8080/out/bosse.mattersoft.fi/api/gtfsrealtime/v1.0/feed/servicealert",
+      "feedId": "Raasepori",
+      "fuzzyTripMatching": false
     }
   ]
 }
diff --git a/router-waltti/router-config.json b/router-waltti/router-config.json
@@ -459,14 +459,6 @@
       "utilizationsFrequencySec": 600,
       "utilizationsUrl": "http://digitransit-proxy:8080/out/p.hsl.fi/api/v1/utilizations.json?limit=-1",
       "hubsUrl": "http://digitransit-proxy:8080/out/p.hsl.fi/api/v1/hubs.json?limit=-1"
-    },
-    {
-      "id": "raasepori-alerts",
-      "type": "real-time-alerts",
-      "frequency": "30s",
-      "url": "http://http://digitransit-proxy:8080/out/bosse.mattersoft.fi/api/gtfsrealtime/v1.0/feed/servicealert",
-      "feedId": "Raasepori",
-      "fuzzyTripMatching": false
     }
   ]
 }