chore: clean up logging

davwheat · Nov 26, 2023 · 28ba68e · 28ba68e
1 parent 43e076a
commit 28ba68e
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/src/announcement-data/systems/stations/AmeyPhil.tsx b/src/announcement-data/systems/stations/AmeyPhil.tsx
@@ -4702,6 +4702,7 @@ function LiveTrainAnnouncements({ nextTrainHandler, disruptedTrainHandler, syste
   const announceNextTrain = useCallback(
     async function announceNextTrain(train: TrainService, abortController: AbortController) {
       console.log(train)
+      addLog(`Announcing next train: ${train.rid} (${train.std} to ${train.destination[0].locationName})`)
 
       markNextTrainAnnounced(train.rid)
 
@@ -4710,8 +4711,8 @@ function LiveTrainAnnouncements({ nextTrainHandler, disruptedTrainHandler, syste
 
       const delayMins = calculateDelayMins(new Date(train.std), new Date(train.etd))
 
-      addLog(`[Live Trains] Is delayed by ${delayMins} mins`)
-      console.log(`[Live Trains] Is delayed by ${delayMins} mins`)
+      addLog(`Train is delayed by ${delayMins} mins`)
+      console.log(`[Live Trains] Train is delayed by ${delayMins} mins`)
 
       const toc = system.processTocForLiveTrains(train.operator, train.origin[0].crs, train.destination[0].crs)
 
@@ -4746,7 +4747,7 @@ function LiveTrainAnnouncements({ nextTrainHandler, disruptedTrainHandler, syste
         v.split(/(&|and)/).forEach(via => {
           const guessViaCrs = stationNameToCrsMap[via.trim().toLowerCase()]
 
-          addLog(`[Live Trains] Guessed via ${guessViaCrs} for ${via}`)
+          addLog(`Guessed via ${guessViaCrs} for ${via}`)
           console.log(`[Live Trains] Guessed via ${guessViaCrs} for ${via}`)
 
           if (guessViaCrs) {
@@ -4937,15 +4938,19 @@ function LiveTrainAnnouncements({ nextTrainHandler, disruptedTrainHandler, syste
           return false
         }
         if (calculateArrivalInMins(new Date(s.etd)) > MIN_TIME_TO_ANNOUNCE) {
-          addLog(
-            `[Live Trains] Skipping ${s.rid} (${std} to ${s.destination[0].locationName}) as it is more than ${MIN_TIME_TO_ANNOUNCE} mins away`,
-          )
+          addLog(`Skipping ${s.rid} (${std} to ${s.destination[0].locationName}) as it is more than ${MIN_TIME_TO_ANNOUNCE} mins away`)
           console.log(
             `[Live Trains] Skipping ${s.rid} (${std} to ${s.destination[0].locationName}) as it is more than ${MIN_TIME_TO_ANNOUNCE} mins away`,
           )
           return false
         }
 
+        if (s.atdSpecified) {
+          addLog(`Skipping ${s.rid} (${std} to ${s.destination[0].locationName}) as it has already departed`)
+          console.log(`[Live Trains] Skipping ${s.rid} (${std} to ${s.destination[0].locationName}) as it has already departed`)
+          return false
+        }
+
         return true
       })