Merge branch 'main' into deploy

davwheat · Jun 17, 2024 · 1c0b4e9 · 1c0b4e9
2 parents 446a0ec + 439d25b
commit 1c0b4e9
Showing 1 changed file with 97 additions and 58 deletions.
diff --git a/src/data/liveTrains/shortPlatforms.ts b/src/data/liveTrains/shortPlatforms.ts
@@ -510,10 +510,7 @@ const data: Record<
     },
   },
   FOD: {
-    '1': {
-      SN: 'front.6',
-    },
-    '2': {
+    '*': {
       SN: 'front.6',
     },
   },
@@ -565,18 +562,12 @@ const data: Record<
     },
   },
   HMT: {
-    '1': {
-      SN: 'front.3',
-    },
-    '2': {
+    '*': {
       SN: 'front.3',
     },
   },
   HME: {
-    '1': {
-      SN: 'front.4',
-    },
-    '2': {
+    '*': {
       SN: 'front.4',
     },
   },
@@ -628,10 +619,7 @@ const data: Record<
     },
   },
   IMW: {
-    '1': {
-      SN: 'front.8',
-    },
-    '2': {
+    '*': {
       SN: 'front.8',
     },
   },
@@ -665,10 +653,7 @@ const data: Record<
     },
   },
   LIH: {
-    '1': {
-      SN: 'front.6',
-    },
-    '2': {
+    '*': {
       SN: 'front.6',
     },
   },
@@ -684,10 +669,7 @@ const data: Record<
     },
   },
   LFD: {
-    '1': {
-      SN: 'front.8',
-    },
-    '2': {
+    '*': {
       SN: 'front.8',
     },
   },
@@ -700,30 +682,27 @@ const data: Record<
     },
   },
   LRB: {
-    '1': {
-      SN: 'front.6',
-    },
-    '2': {
+    '*': {
       SN: 'front.6',
     },
   },
   LRG: {
-    '1': {
-      SN: 'front.10',
-    },
-    '2': {
+    '*': {
       SN: 'front.10',
     },
   },
   VIC: {
     '3': {
       SN: 'front.9',
+      TL: 'front.9',
     },
     '4': {
       SN: 'front.9',
+      TL: 'front.9',
     },
     '8': {
       SN: 'front.10',
+      TL: 'front.10',
     },
     '*': {
       SE: 'front.9',
@@ -735,48 +714,30 @@ const data: Record<
     },
   },
   MTC: {
-    '1': {
-      SN: 'front.9',
-      TL: 'front.9',
-    },
-    '2': {
+    '*': {
       SN: 'front.9',
       TL: 'front.9',
     },
   },
   MIJ: {
-    '1': {
-      SN: 'front.7',
-      TL: 'front.7',
-    },
-    '2': {
+    '*': {
       SN: 'front.7',
       TL: 'front.7',
     },
   },
   MDS: {
-    '1': {
-      SN: 'front.8',
-      TL: 'front.8',
-    },
-    '2': {
+    '*': {
       SN: 'front.8',
       TL: 'front.8',
     },
   },
   MCB: {
-    '1': {
-      SN: 'front.4',
-    },
-    '2': {
+    '*': {
       SN: 'front.4',
     },
   },
   NTL: {
-    '1': {
-      SN: 'front.8',
-    },
-    '2': {
+    '*': {
       SN: 'front.8',
     },
   },
@@ -855,21 +816,27 @@ const data: Record<
   NWD: {
     '1': {
       SN: southernTurboElectro('front.7', 'front.10'),
+      TL: 'front.10',
     },
     '2': {
       SN: southernTurboElectro('front.7', 'front.10'),
+      TL: 'front.10',
     },
     '3': {
       SN: southernTurboElectro('front.7', 'front.10'),
+      TL: 'front.10',
     },
     '4': {
       SN: southernTurboElectro('front.7', 'front.10'),
+      TL: 'front.10',
     },
     '5': {
       SN: southernTurboElectro('front.7', 'front.10'),
+      TL: 'front.10',
     },
     '6': {
       SN: southernTurboElectro('front.7', 'front.9'),
+      TL: 'front.9',
     },
     '*': {
       SE: 'front.8',
@@ -1606,9 +1573,6 @@ const data: Record<
       TL: 'front.7',
     },
   },
-
-  // ---- SE DATA -----
-
   BEG: {
     '*': {
       SE: 'front.3',
@@ -1805,6 +1769,15 @@ const data: Record<
     },
   },
   DVP: {
+    '1': {
+      SE: southeasternHs1('front.8', 'front.12'),
+    },
+    '2': {
+      SE: southeasternHs1('front.8', 'front.10'),
+    },
+    '3': {
+      SE: 'front.8',
+    },
     '*': {
       SE: 'front.8',
     },
@@ -2175,6 +2148,54 @@ const data: Record<
       TL: 'front.7',
     },
   },
+  MEL: {
+    '*': {
+      TL: 'front.4',
+      GN: 'front.4',
+    },
+  },
+  STH: {
+    '1': {
+      TL: 'front.4',
+      GN: 'front.4',
+    },
+    '2': {
+      GN: 'front.8',
+      TL: 'front.8',
+    },
+  },
+  FXN: {
+    '1': {
+      TL: 'front.5',
+      GN: 'front.5',
+    },
+    '2': {
+      GN: 'front.8',
+      TL: 'front.8',
+    },
+  },
+  WTG: {
+    '*': {
+      TL: 'front.4',
+      GN: 'front.4',
+    },
+  },
+  LTP: {
+    '1': {
+      TL: 'front.4',
+      GN: 'front.4',
+    },
+  },
+  NBA: {
+    '1': {
+      TL: 'front.7',
+      GN: 'front.7',
+    },
+    '7': {
+      TL: 'front.7',
+      GN: 'front.7',
+    },
+  },
 }
 
 function southernTurboElectro(turboLen: `${'front' | 'middle' | 'rear'}.${number}`, electroLen: `${'front' | 'middle' | 'rear'}.${number}`) {
@@ -2194,3 +2215,21 @@ function southernTurboElectro(turboLen: `${'front' | 'middle' | 'rear'}.${number
     return electroLen
   }
 }
+
+function southeasternHs1(nonHs1: `${'front' | 'middle' | 'rear'}.${number}`, hs1: `${'front' | 'middle' | 'rear'}.${number}`) {
+  return (trainService: TrainService): `${'front' | 'middle' | 'rear'}.${number}` | null => {
+    const hs1Stations = ['STP', 'EBD', 'SFA', 'ASI', 'AFK']
+
+    if (
+      trainService.origin.some(s => hs1Stations.includes(s.crs)) ||
+      trainService.destination.some(s => hs1Stations.includes(s.crs)) ||
+      trainService.origin.some(s => hs1Stations.includes(s.crs)) ||
+      trainService.destination.some(s => hs1Stations.includes(s.crs)) ||
+      trainService.subsequentLocations.some(s => hs1Stations.includes(s.crs || ''))
+    ) {
+      return hs1
+    }
+
+    return nonHs1
+  }
+}