fixed data references

server/fetch_radar.py

@@ -2,7 +2,7 @@
 from fastapi import HTTPException
 from models import trafficDataItem
 import asyncio
-from database import trafficDataDict
+import database
 
 async def fetch_radar_data(north: float, west: float, south: float, east: float, results: int = 256, duration: int = 30, frames: int = 3, polylines: bool = True, language: str = "en"):
     url = "https://v6.vbb.transport.rest/radar"
@@ -41,12 +41,11 @@ async def fetch_radar_data_periodically(period_time: int = 1):
             polylines=True, 
             language="en"
         )
-
-        global trafficDataDict 
-        trafficDataDict = dict()
+
+        database.trafficDataDict = dict()
         for movement in radar_data["movements"]:
 
-            trafficDataDict[movement["tripId"]] = trafficDataItem.TrafficDataItem(
+            database.trafficDataDict[movement["tripId"]] = trafficDataItem.TrafficDataItem(
                 id=movement["tripId"],
                 type=movement["line"]["mode"],
                 subType=movement["line"]["product"],

server/routers/trafficData.py

@@ -2,10 +2,10 @@
 from models import trafficDataItem
 from typing import Dict
 
-from database import trafficDataDict
+import database
 
 router = APIRouter()
 
 @router.post("/trafficData/", response_model=Dict[str, trafficDataItem.TrafficDataItem])
 async def read_trafficData(request: trafficDataItem.TrafficDataRequest):
-    return trafficDataDict
+    return database.trafficDataDict

server/routers/updateUtilization.py

@@ -1,13 +1,13 @@
 from fastapi import APIRouter
 from models import trafficDataItem
 
-from database import trafficDataDict
+import database
 
 router = APIRouter()
 
 @router.post("/{tripId}/updateUtilization")
 async def update_bus_utilization(tripId: str, utilization: trafficDataItem.Utilization):
     # Here you can update the utilization data for the specific bus
     # For simplicity, this example just stores the data in the `buses_utilization` dictionary
-    trafficDataDict[tripId].utilization = utilization
+    database.trafficDataDict[tripId].utilization = utilization
     return {"message": f"Updated utilization for bus {tripId}"}