Upload app.py

src/app.py

@@ -107,11 +107,12 @@ 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), 
-            st.arrival_time, 
+            COALESCE(st.departure_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)
@@ -182,7 +183,7 @@ async def get_vehicle_view(vehicle_id: str):
         query = """
             SELECT 
                 t.trip_headsign, 
-                st.arrival_time 
+                COALESCE(st.departure_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,6 +197,8 @@ async def get_vehicle_view(vehicle_id: str):
             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
             if predicted_time:
                 service_day_ts = get_service_day_start_ts()
                 plan_ts = service_day_ts + hms_to_seconds(scheduled_hms)
@@ -256,8 +259,9 @@ 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, st.arrival_time, r.route_short_name
+                    SELECT t.trip_headsign, COALESCE(st.departure_time, 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