feat: implement handling for multiple activity codes properly

davwheat · Jun 6, 2024 · c8e9a7e · c8e9a7e
1 parent 050ba21
commit c8e9a7e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/functions/api/get-services.ts b/functions/api/get-services.ts
@@ -128,7 +128,7 @@ export interface TimingLocation {
   lateness: any
   associations: Association[] | null
   adhocAlerts: any
-  activities?: string
+  activities?: string[]
 }
 
 export enum AssociationCategory {
@@ -284,9 +284,14 @@ async function processService(service: TrainService): Promise<void> {
       }
     }
 
-    location.activities = serviceData?.locations.find(l => {
+    const activities = serviceData?.locations.find(l => {
       return l.tiploc === location.tiploc && (l.sta === location.sta || l.std === location.std)
-    })?.activities
+    })?.activities as string | undefined
+
+    // Split into array with groups of two chars
+    if (activities) {
+      location.activities = (activities?.match(/.{2}/g) || []).map(a => a.trim())
+    }
   }
 }
 

diff --git a/src/components/AmeyLiveTrainAnnouncements.tsx b/src/components/AmeyLiveTrainAnnouncements.tsx
@@ -64,7 +64,7 @@ function getCallingPoints(
     if (s.isCancelled || s.isOperational || s.isPass) return false
     if (!stations.includes(s.crs)) return false
     // Ignore pick-up only
-    if (s.activities === 'U') return false
+    if (s.activities?.includes('U')) return false
     return true
   })
 
@@ -94,7 +94,7 @@ function getCallingPoints(
         crsCode: getStation(p),
         name: '',
         randomId: '',
-        requestStop: p.activities === 'R',
+        requestStop: p.activities?.includes('R'),
       }
 
       p.associations
@@ -111,7 +111,7 @@ function getCallingPoints(
               if (!stations.includes(s.crs)) return false
               return true
             })
-            .map(l => ({ crsCode: l.crs!!, name: l.locationName, randomId: '', requestStop: p.activities === 'R' }))
+            .map(l => ({ crsCode: l.crs!!, name: l.locationName, randomId: '', requestStop: p.activities?.includes('R') }))
         })
 
       if (i === callingPoints.length - 1 && p.associations?.some(a => a.category === AssociationCategory.LinkedTo && a.trainid === '0B00')) {
@@ -141,7 +141,7 @@ function getCallingPoints(
           crsCode: getStation(p),
           name: '',
           randomId: '',
-          requestStop: p.activities === 'R',
+          requestStop: p.activities?.includes('R'),
         }
 
         if (p.associations?.some(a => a.category === AssociationCategory.LinkedTo && a.trainid !== '0B00')) {
@@ -174,7 +174,7 @@ function getCallingPoints(
             crsCode: getStation(p),
             name: '',
             randomId: '',
-            requestStop: p.activities === 'R',
+            requestStop: p.activities?.includes('R'),
           }
         })
         .filter(Boolean) as CallingAtPoint[]