fix N/A for non departed services

tgoulder4 · Aug 27, 2023 · ca76f28 · ca76f28
1 parent 97e9b44
commit ca76f28
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/dist/src/trackTrain.js b/dist/src/trackTrain.js
@@ -287,15 +287,16 @@ function getCurrentState($) {
     const noReport = lastActioned.find(".noreport").length != 0;
     const passStation = lastActioned.find(".pass").length != 0;
     //if arr,dep,stopshere
-    if (isActualArrival && isActualDeparture) {
+    if ((isActualArrival && isActualDeparture) ||
+        (!isActualArrival && isActualDeparture && !passStation)) {
         return stateObject("Departed", (0, getInfo_1.getInfo)(lastActioned).body, "continue", callingPoints);
     }
     //if arr,dep,stopshere
     if (isActualArrival && !isActualDeparture) {
         return stateObject("At platform", (0, getInfo_1.getInfo)(lastActioned).body, "continue", callingPoints);
     }
     //if dep,!stopshere
-    if (passStation) {
+    if (!isActualArrival && isActualDeparture && passStation) {
         return stateObject("Passed", (0, getInfo_1.getInfo)(lastActioned).body, "continue", callingPoints);
     }
     //if dep, !stopshere

diff --git a/src/trackTrain.ts b/src/trackTrain.ts
@@ -315,7 +315,10 @@ export function getCurrentState($: cheerio.Root): state {
   const noReport = lastActioned.find(".noreport").length != 0;
   const passStation = lastActioned.find(".pass").length != 0;
   //if arr,dep,stopshere
-  if (isActualArrival && isActualDeparture) {
+  if (
+    (isActualArrival && isActualDeparture) ||
+    (!isActualArrival && isActualDeparture && !passStation)
+  ) {
     return stateObject(
       "Departed",
       getInfo(lastActioned).body,
@@ -333,7 +336,7 @@ export function getCurrentState($: cheerio.Root): state {
     );
   }
   //if dep,!stopshere
-  if (passStation) {
+  if (!isActualArrival && isActualDeparture && passStation) {
     return stateObject(
       "Passed",
       getInfo(lastActioned).body,