Upload app.py

src/app.py

@@ -107,12 +107,11 @@ async def get_route_view(route_id: str):
     placeholders = ','.join(['?'] * len(trip_ids))
     
     # We use CAST(? AS VARCHAR) to force DuckDB to match strings to strings
-    # Use COALESCE(departure_time, arrival_time) to match prediction logic
     query = f"""
         SELECT 
             CAST(st.trip_id AS VARCHAR), 
             CAST(st.stop_id AS VARCHAR), 
-            COALESCE(st.departure_time, st.arrival_time) as scheduled_time, 
+            st.arrival_time as scheduled_time, 
             t.trip_headsign
         FROM stop_times st
         JOIN trips t ON CAST(st.trip_id AS VARCHAR) = CAST(t.trip_id AS VARCHAR)
@@ -140,9 +139,12 @@ async def get_route_view(route_id: str):
         if pred_time and stop_id:
             sched_hms = schedule_map.get((str(bus['trip_id']), str(stop_id)))
             if sched_hms:
-                # Math: (Reality Unix - Plan Unix) / 60
-                plan_ts = service_day_ts + hms_to_seconds(sched_hms)
-                raw_delay_mins = round((pred_time - plan_ts) / 60)
+                # DELAY = SCHEDULED - PREDICTED (negative = late, positive = early)
+                # Handle GTFS times >= 24 hours (next day)
+                h, m, s = map(int, sched_hms.split(':'))
+                extra_days = h // 24
+                plan_ts = service_day_ts + (extra_days * 86400) + hms_to_seconds(sched_hms)
+                raw_delay_mins = round((plan_ts - pred_time) / 60)
 
         enriched.append({
             "number": bus['id'],
@@ -183,7 +185,7 @@ async def get_vehicle_view(vehicle_id: str):
         query = """
             SELECT 
                 t.trip_headsign, 
-                COALESCE(st.departure_time, st.arrival_time) as scheduled_time
+                st.arrival_time as scheduled_time
             FROM trips t
             JOIN stop_times st ON CAST(t.trip_id AS VARCHAR) = CAST(st.trip_id AS VARCHAR)
             WHERE CAST(t.trip_id AS VARCHAR) = ? 
@@ -196,13 +198,14 @@ async def get_vehicle_view(vehicle_id: str):
             destination = row[0]
             scheduled_hms = row[1]
             
-            # Math: Reality (Unix Time) - Plan (Service Day + Scheduled Seconds)
-            # Note: predicted_time uses departure.time if available, else arrival.time
-            # So we use COALESCE(departure_time, arrival_time) to match
+            # DELAY = SCHEDULED - PREDICTED (negative = late, positive = early)
             if predicted_time:
                 service_day_ts = get_service_day_start_ts()
-                plan_ts = service_day_ts + hms_to_seconds(scheduled_hms)
-                delay_mins = round((predicted_time - plan_ts) / 60)
+                # Handle GTFS times >= 24 hours (next day)
+                h, m, s = map(int, scheduled_hms.split(':'))
+                extra_days = h // 24
+                plan_ts = service_day_ts + (extra_days * 86400) + hms_to_seconds(scheduled_hms)
+                delay_mins = round((plan_ts - predicted_time) / 60)
     else:
         # If no next_stop_id, try to get destination from trip_id only
         query = """
@@ -246,7 +249,8 @@ async def get_stop_view(stop_code: str):
     # Build vehicles map for quick lookup
     vehicles = {str(v['trip_id']): v for v in vehicles_list}
 
-    now = datetime.now().timestamp()
+    from datetime import timezone
+    now = datetime.now(timezone.utc).timestamp()
     two_hours_out = now + 7200
     arrivals = []
 
@@ -259,9 +263,8 @@ async def get_stop_view(stop_code: str):
             if now <= pred_time <= two_hours_out:
                 
                 # 4. Handshake with DB for destination and schedule
-                # Use COALESCE(departure_time, arrival_time) to match prediction logic
                 query = """
-                    SELECT t.trip_headsign, COALESCE(st.departure_time, st.arrival_time) as scheduled_time, r.route_short_name
+                    SELECT t.trip_headsign, st.arrival_time as scheduled_time, r.route_short_name
                     FROM trips t
                     JOIN stop_times st ON CAST(t.trip_id AS VARCHAR) = CAST(st.trip_id AS VARCHAR)
                     JOIN routes r ON t.route_id = r.route_id
@@ -274,13 +277,19 @@ async def get_stop_view(stop_code: str):
                     # Find the actual bus for fullness (if it's on the road)
                     bus = vehicles.get(trip_id)
                     
-                    plan_ts = get_service_day_start_ts() + hms_to_seconds(row[1])
+                    # DELAY = SCHEDULED - PREDICTED (negative = late, positive = early)
+                    service_day_ts = get_service_day_start_ts()
+                    scheduled_hms = row[1]
+                    # Handle GTFS times >= 24 hours (next day)
+                    h, m, s = map(int, scheduled_hms.split(':'))
+                    extra_days = h // 24
+                    plan_ts = service_day_ts + (extra_days * 86400) + hms_to_seconds(scheduled_hms)
                     
                     arrivals.append({
                         "route": row[2],
                         "destination": row[0],
                         "eta_mins": round((pred_time - now) / 60),
-                        "delay_mins": round((pred_time - plan_ts) / 60),
+                        "delay_mins": round((plan_ts - pred_time) / 60),
                         "fullness": translate_occupancy(bus['occupancy']) if bus else "Unknown",
                         "vehicle_id": bus['id'] if bus else "In Transit"
                     })
@@ -293,9 +302,10 @@ async def get_all_alerts():
     """
     Returns every active service alert for the entire TTC network.
     """
+    from datetime import timezone
     data = await ttc_cache.get_data()
     return {
-        "timestamp": datetime.now().timestamp(),
+        "timestamp": datetime.now(timezone.utc).timestamp(),
         "count": len(data["alerts"]),
         "alerts": data["alerts"]
     }