fix: add hbg specific vp message handling

stadtnavi · Dec 12, 2024 · 34b7478 · 34b7478
1 parent c8b1cc1
commit 34b7478
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 5 deletions.
diff --git a/app/configurations/realtimeUtils.js b/app/configurations/realtimeUtils.js
@@ -286,12 +286,43 @@ export default {
     active: true,
   },
   hbg: {
-    mqttTopicResolver: function mqttTopicResolver() {
-      return '/gtfsrt/vp/#';
+    mqttTopicResolver: function hbgTopicResolver(
+      route,
+      direction,
+      tripStartTime,
+      headsign,
+      feedId,
+      tripId,
+      geoHash,
+    ) {
+      return (
+        '/gtfsrt/vp/' +
+        feedId +
+        '/+/+/+/' +
+        route +
+        '/' +
+        '+' + // direction is not available in VVS GTFS-RT-VP feed
+        '/' +
+        '+' + // headsign is not available in VVS GTFS-RT-VP feed
+        '/' +
+        tripId +
+        '/+/' +
+        '+' + // tripstartTime is not available in VVS GTFS-RT-VP feed
+        '/+/' +
+        geoHash[0] +
+        '/' +
+        geoHash[1] +
+        '/' +
+        geoHash[2] +
+        '/' +
+        geoHash[3] +
+        '/#'
+      );
     },
 
     // this value is overridden in config.herrenberg.js
     mqtt: 'wss://vehiclepositions.stadtnavi.eu/mqtt/',
+    topicFeedId: 'hbg',
 
     gtfsrt: true,
 

diff --git a/app/util/gtfsRtParser.js b/app/util/gtfsRtParser.js
@@ -30,7 +30,7 @@ export const parseFeedMQTT = (feedParser, data, topic, agency) => {
     ,
     ,
     ,
-    ,
+    feedId,
     ,
     ,
     mode,
@@ -55,8 +55,8 @@ export const parseFeedMQTT = (feedParser, data, topic, agency) => {
       const { trip, position, vehicle } = vehiclePos;
       if (trip && position && vehicle) {
         const message = {
-          id: `${agency}:${vehicleId}`,
-          route: `${agency}:${routeId}`,
+          id: `${feedId}:${vehicleId}`,
+          route: `${feedId}:${routeId}`,
           direction:
             directionId === '' ? undefined : parseInt(directionId, 10) || 0,
           tripStartTime: