Upload app.py

src/app.py

@@ -209,18 +209,23 @@ async def get_vehicle_view(vehicle_id: str):
     next_stop_id = bus.get('next_stop_id')
     predicted_time = bus.get('predicted_time')
 
-    # 3. Handshake with Database (Cast to VARCHAR to avoid type errors)
-    # We get the destination name and the specific scheduled arrival time
+    # 3. Handshake with Database
     destination = "Not in Schedule"
+    shape_id = None  # New field
+    route_color = "FF0000"  # New field
     delay_mins = 0
     
+    # Updated query to pull shape_id and route_color
     if next_stop_id:
         query = """
             SELECT 
                 t.trip_headsign, 
-                st.arrival_time as scheduled_time
+                st.arrival_time as scheduled_time,
+                t.shape_id,
+                r.route_color
             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
             WHERE CAST(t.trip_id AS VARCHAR) = ? 
               AND CAST(st.stop_id AS VARCHAR) = ?
             LIMIT 1
@@ -228,32 +233,33 @@ async def get_vehicle_view(vehicle_id: str):
         row = db.execute(query, [trip_id, str(next_stop_id)]).fetchone()
         
         if row:
-            destination = row[0]
-            scheduled_hms = row[1]
+            destination, scheduled_hms, shape_id, r_color = row
+            route_color = r_color if r_color else "FF0000"
             
-            # DELAY = SCHEDULED - PREDICTED (negative = late, positive = early)
             if predicted_time:
                 service_day_ts = get_service_day_start_ts()
-                # 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
+        # Fallback query if no next_stop_id
         query = """
-            SELECT trip_headsign
-            FROM trips
-            WHERE CAST(trip_id AS VARCHAR) = ?
+            SELECT t.trip_headsign, t.shape_id, r.route_color
+            FROM trips t
+            JOIN routes r ON t.route_id = r.route_id
+            WHERE CAST(t.trip_id AS VARCHAR) = ?
             LIMIT 1
         """
         row = db.execute(query, [trip_id]).fetchone()
         if row:
-            destination = row[0]
+            destination, shape_id, r_color = row
+            route_color = r_color if r_color else "FF0000"
 
     return {
         "vehicle_number": vehicle_id,
         "route_id": bus['route'],
+        "route_color": route_color, # Frontend now gets the color
         "name": destination,
         "location": {
             "lat": bus['lat'],
@@ -261,7 +267,8 @@ async def get_vehicle_view(vehicle_id: str):
         },
         "delay_mins": delay_mins,
         "fullness": translate_occupancy(bus['occupancy']),
-        "trip_id": trip_id
+        "trip_id": trip_id,
+        "shape_id": shape_id # Frontend now gets the ID to fetch lines
     }
 
 @app.get("/api/stop/{stop_code}")