From a43eefadc1fd1ff44efe32c4f885d6e83ae09091 Mon Sep 17 00:00:00 2001
From: Tony Bark <35226681+tonytins@users.noreply.github.com>
Date: Mon, 24 Aug 2026 03:09:49 -0400
Subject: [PATCH] Show local station time; reuse date formatter

- Added localTime(timeZone:) and updateTime(timeZone:) to AmtrakDateFormatting to format the current time for a given timezone.
- In ContentView, make AmtrakDateFormatting is now a shared property with localTimeZone being used at the bottom to show "It is <time> at <station> station".
- trainStatus now saves the station name and timezone (avoiding repeated formatter instantiation) and isOnTime uses the shared formatter.
---
 Sources/AmtrakStatus/AmtrakDateFormatting.swift | 11 +++++++++++
 Sources/AmtrakStatus/ContentView.swift          | 13 ++++++++-----
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/Sources/AmtrakStatus/AmtrakDateFormatting.swift b/Sources/AmtrakStatus/AmtrakDateFormatting.swift
index 0cdb687..d1f4fdd 100644
--- a/Sources/AmtrakStatus/AmtrakDateFormatting.swift
+++ b/Sources/AmtrakStatus/AmtrakDateFormatting.swift
@@ -35,6 +35,17 @@ struct AmtrakDateFormatting {
         return timeFormatter.string(from: date)
     }
     
+    func localTime(timeZone: TimeZone?) -> String {
+        let now = Date()
+        timeFormatter.timeZone = timeZone
+        return timeFormatter.string(from: now)
+    }
+    
+    func updateTime(timeZone: TimeZone?) {
+        let now = Date()
+        timeFormatter.timeZone = timeZone
+    }
+    
     func date(from isoString: String?) -> String? {
         guard let isoString, !isoString.isEmpty, let date = isoFormatter.date(
             from: isoString) else {
diff --git a/Sources/AmtrakStatus/ContentView.swift b/Sources/AmtrakStatus/ContentView.swift
index bd5b2a2..09d601c 100644
--- a/Sources/AmtrakStatus/ContentView.swift
+++ b/Sources/AmtrakStatus/ContentView.swift
@@ -10,7 +10,9 @@ struct ContentView: View {
     @State var isLoading = false
     @State var errorMessage: String?
     @State var currentStation: String = ""
+    @State var localTimeZone: TimeZone?
     
+    let amtrakDate = AmtrakDateFormatting()
     let unknown = "Unknown"
 
     var body: some View {
@@ -79,7 +81,9 @@ struct ContentView: View {
                 if let errorMessage {
                     Text(errorMessage)
                 } else if !currentStation.isEmpty {
-                    Text(currentStation)
+                    Text(
+                        "It is \(amtrakDate.localTime(timeZone: localTimeZone)) at \(currentStation) station"
+                    )
                 }
             }.padding(10)
         }
@@ -162,8 +166,7 @@ struct ContentView: View {
     }
     
     func isOnTime(arr: String?, schArr: String?) -> TrainLateness {
-        let amtrakDate = AmtrakDateFormatting()
-        
+       
         guard
             let actualDate = amtrakDate.parsedDate(from: arr),
             let scheduledDate = amtrakDate.parsedDate(from: schArr)
@@ -185,7 +188,6 @@ struct ContentView: View {
     
     func trainStatus(for train: Train, atStationCode code: String, timeZone: TimeZone?) -> TrainStatusRow {
         let leg = train.stations?.first { $0.code == code }
-        let amtrakDate = AmtrakDateFormatting()
         let stationName = leg?.name ?? unknown
         let arrival = amtrakDate.time(from: leg?.arr, timeZone: timeZone) ?? amtrakDate.time(
             from: leg?.schArr,
@@ -194,7 +196,8 @@ struct ContentView: View {
             from: leg?.schDep,
             timeZone: timeZone)
         
-        currentStation = "\(stationName) station"
+        currentStation = stationName
+        localTimeZone = timeZone
         
         return TrainStatusRow(
             trainID: train.trainID,