Bundler.toml

@@ -1,4 +1,3 @@
-# https://swiftbundler.dev/documentation/swift-bundler/configuration
 format_version = 2
 
 [apps.AmtrakStatus]
@@ -6,7 +5,6 @@ identifier = 'com.tonybark.AmtrakStatus'
 product = 'AmtrakStatus'
 version = '0.2.103'
 icon = "./assets/icon.png"
-category = "public.app-category.travel"
 
 
 [[apps.AmtrakStatus.overlays]]

Sources/AmtrakStatus/AmtrakClient.swift

@@ -28,10 +28,6 @@ struct AmtrakClient {
         try await get(trainsBaseURL)
     }
 
-    func fetchStaleStatus() async throws -> StaleData {
-        try await get(staleBaseURL)
-    }
-
     func fetchAllTrainStatus(num trainNum: String) async throws -> [Train] {
         let reponse = try await fetchTrain(number: trainNum)
         return reponse.values.flatMap(\.self)

Sources/AmtrakStatus/AmtrakDateFormatting.swift

@@ -26,21 +26,21 @@ struct AmtrakDateFormatting {
         return isoFormatter.date(from: isoString)
     }
     
-    func time(from isoString: String?, in zone: TimeZone?, comparedTo originZone: TimeZone? = nil) -> String? {
+    func time(from isoString: String?, timeZone: TimeZone?, relativeTo otherZone: TimeZone? = nil) -> String? {
         guard let isoString, !isoString.isEmpty, let date = isoFormatter.date(
             from: isoString) else {
             return nil
             }
         
-        timeFormatter.timeZone = zone
+        timeFormatter.timeZone = timeZone
         
         let formatted = timeFormatter.string(from: date)
         
         guard
-            let zone,
+            let timeZone,
-            let originZone,
+            let otherZone,
-            zone.identifier != originZone.identifier,
+            timeZone.identifier != otherZone.identifier,
-            let abbreviation = zone.abbreviation(for: date)
+            let abbreviation = timeZone.abbreviation(for: date)
         else {
             return formatted
         }
@@ -48,29 +48,6 @@ struct AmtrakDateFormatting {
         return "\(formatted) \(abbreviation)"
     }
     
-    
-    func isOnTime(actual: String?, scheduled: String?) -> LateTrain {
-        
-        guard
-            let actualDate = parsedDate(from: actual),
-            let scheduledDate = parsedDate(from: scheduled)
-        else {
-            return .unknown
-        }
-        
-        let differenceInMinutes = Int(actualDate.timeIntervalSince(scheduledDate) / 60)
-        
-        switch differenceInMinutes {
-        case -1...1:
-            return .onTime
-        case ..<0:
-            return .early(minutes: -differenceInMinutes)
-        default:
-            return .late(minutes: differenceInMinutes)
-        }
-    }
-    
-    
     func localTime(timeZone: TimeZone?) -> String {
         let now = Date()
         timeFormatter.timeZone = timeZone

Sources/AmtrakStatus/ContentView.swift

@@ -14,7 +14,6 @@ struct ContentView: View {
     
     let amtrakDate = AmtrakDateFormatting()
     let unknown = "Unknown"
-    let staleDataThreshold: TimeInterval = 60 * 60 * 24 // 24 hours
 
     var body: some View {
         VStack {
@@ -138,7 +137,6 @@ struct ContentView: View {
             }
             
             var zoneCache: [String: TimeZone?] = [code: lookup.timeZone]
-            let staleness = await staleTrainLookup()
 
             var newRows: [TrainStatusRow] = []
             for number in lookup.trainNumbers {
@@ -148,16 +146,15 @@ struct ContentView: View {
                         where: { $0.code == code
                         },
                     )?.platform
-                    let row = await trainStatus(
+                    await newRows
+                        .append(
+                            trainStatus(
                                 for: train,
-                                code: code,
+                                atStationCode: code,
-                                zone: lookup.timeZone,
+                                timeZone: lookup.timeZone,
-                                cache: &zoneCache,
+                                zoneCache: &zoneCache
-                                staleness: staleness
                             )
-                    if let row {
+                        )
-                        newRows.append(row)
-                    }
                 }
             }
 
@@ -172,22 +169,34 @@ struct ContentView: View {
         }
     }
     
-    func trainStatus(
+    func isOnTime(arr: String?, schArr: String?) -> TrainLateness {
-        for train: Train,
-        code stationCode: String,
-        zone timeZone: TimeZone?,
-        cache zoneCache: inout [String: TimeZone?],
-        staleness: [String: TimeInterval]
-    ) async -> TrainStatusRow? {
-        let leg = train.stations?.first { $0.code == stationCode }
        
         guard
-            !isStale(leg, timeZone: timeZone) &&
+            let actualDate = amtrakDate.parsedDate(from: arr),
-            !isDataStale(train.trainID, staleness: staleness)
+            let scheduledDate = amtrakDate.parsedDate(from: schArr)
         else {
-            return nil
+            return .unknown
         }
         
+        let differenceInMinutes = Int(actualDate.timeIntervalSince(scheduledDate) / 60)
+        
+        switch differenceInMinutes {
+        case -1...1:
+            return .onTime
+        case ..<0:
+            return .early(minutes: -differenceInMinutes)
+        default:
+            return .late(minutes: differenceInMinutes)
+        }
+    }
+    
+    func trainStatus(
+        for train: Train,
+        atStationCode code: String,
+        timeZone: TimeZone?,
+        zoneCache: inout [String: TimeZone?]
+    ) async -> TrainStatusRow {
+        let leg = train.stations?.first { $0.code == code }
         let stationName = leg?.name ?? unknown
         let track = leg?.platform ?? ""
         
@@ -201,12 +210,12 @@ struct ContentView: View {
         
         let time = amtrakDate.time(
             from: leg?.arr,
-            in: timeZone,
+            timeZone: timeZone,
-            comparedTo: originZone
+            relativeTo: originZone
         ) ?? amtrakDate.time(
             from: leg?.schArr,
-            in: timeZone,
+            timeZone: timeZone,
-            comparedTo: originZone
+            relativeTo: originZone
         )
         
         currentStation = stationName
@@ -220,53 +229,14 @@ struct ContentView: View {
             train: train.routeName,
             to: train.destName,
             from: train.origName,
-            status: amtrakDate.isOnTime(
+            status: isOnTime(
-                actual: leg?.arr,
+                arr: leg?.arr,
-                scheduled: leg?.schArr
+                schArr: leg?.schArr
             ),
             track: track.isEmpty ? "" : track
         )
     }
     
-    func isStale(_ leg: Station?, timeZone: TimeZone?) -> Bool {
-        guard leg?.status == .departed else { return false }
-        
-        guard
-            let deparatureDate = amtrakDate.parsedDate(
-                from: leg?.dep
-            ) ?? amtrakDate.parsedDate(from: leg?.schDep)
-        else {
-            return false
-        }
-        
-        var calendar = Calendar.current
-        calendar.timeZone = timeZone ?? .current
-        return calendar
-            .compare(
-                deparatureDate,
-                to: Date(),
-                toGranularity: .day
-            ) == .orderedAscending
-    }
-    
-    func isDataStale(
-        _ trainId: String,
-        staleness: [String: TimeInterval]
-    ) -> Bool {
-        guard let timeSince = staleness[trainId] else { return false }
-        return timeSince > staleDataThreshold
-    }
-    
-    func staleTrainLookup() async ->  [String: TimeInterval] {
-        guard let staleData = try? await client.fetchStaleStatus() else {
-            return [:]
-        }
-        return Dictionary(
-            staleData.lastUpdatedArr.map { ( $0.trainID, $0.timeSince) },
-            uniquingKeysWith: { first, _ in first }
-        )
-    }
-    
     func fetchTimeZone(forStationCode code: String, cache: inout [String: TimeZone?]) async -> TimeZone? {
         if let cached = cache[code] {
             return cached

Sources/AmtrakStatus/Models.swift

@@ -81,15 +81,9 @@ struct StationMeta: Codable {
 }
 
 struct StaleData: Codable {
-    var activeTrains: Int
     var avgLastUpdate: Double
-    var lastUpdatedArr: [TrainFreshness]
+    var activeTrains: Int
-    var medianLastUpdate: Double
+    var stale: Bool
-}
-
-struct TrainFreshness: Codable, Sendable {
-    var trainID: String
-    var timeSince: Double
 }
 
 typealias TrainResponse = [String: [Train]]
@@ -105,6 +99,6 @@ struct TrainStatusRow: Identifiable {
     var train: String
     var to: String
     var from: String
-    var status: LateTrain
+    var status: TrainLateness
     var track: String
 }

Sources/AmtrakStatus/TrainLateness.swift

@@ -1,7 +1,7 @@
 import Foundation
 import SwiftCrossUI
 
-enum LateTrain {
+enum TrainLateness {
     case onTime
     case early(minutes: Int)
     case late(minutes: Int)