routes begin to show .

1 files changed, 15 insertions, 80 deletions

diff --git a/dashboard_website/db.py b/dashboard_website/db.py
index a071671..892fa0b 100644
--- a/dashboard_website/db.py
+++ b/dashboard_website/db.py
@@ -1,100 +1,27 @@
 # stores and manages clue DB
 # also manages currently available bike teams
+from datastructs import *
 import router
 import csv, time
 
-# time since last ping before deactivating/deleting
-BIKE_TIMEOUT = 60 
-BIKE_DELETE = 1800 # time before bike deletes itself
-
-# data structures
-class Point:
-    def __init__(self, lat, long):
-        self.longitude = long
-        self.latitude = lat
-    
-    def toJSON(self):
-        json_dict = {'longitude' : self.longitude,
-                     'latitude' : self.latitude}
-        return json_dict
-    
-    def setCoords(self, lat, long):
-        self.longitude = long
-        self.latitude = lat
-
-    def move(self, d_lat, d_long):
-        self.longitude += d_long
-        self.latitude += d_lat
-
-    def __str__(self):
-        return f"{self.longitude},{self.latitude}"
-
-class Clue(Point):
-    def __init__(self, lat, long, name, info, status):
-        self.longitude = long
-        self.latitude = lat
-        self.name = name
-        self.info = info
-        self.status = status # UNVISITED | ASSIGNED | VISITED 
-    
-    def visit(self):
-        self.status = "VISITED"
-
-    def toJSON(self):
-        json_dict = {'longitude' : self.longitude,
-                     'latitude' : self.latitude,
-                     'clue_name' : self.name.replace('"', "'"),
-                     'clue_info' : self.info.replace('"', "'"),
-                     'clue_status' : self.status}
-        return json_dict
-
-class Bike(Point):
-    def __init__(self, lat, long, name, status):
-        self.longitude = long
-        self.latitude = lat
-        self.name = name
-        self.last_contact = time.time()
-        self.target = "N/A"
-        self.route_to_next = [] # list of coords if target isnt' N/A
-        self.status = status # ACTIVE | INACTIVE
-    
-    def setTarget(self, clue_name):
-        self.target = clue_name
-
-    def ping(self):
-        self.status = "ACTIVE"
-        self.last_contact = time.time()
-    
-    def checkStatus(self):
-        if time.time() - self.last_contact > BIKE_TIMEOUT:
-            self.status = "INACTIVE"
-            self.target = "N/A"
-            if time.time() - self.last_contact > BIKE_DELETE:
-                return -1
-        return 0
-
-    def toJSON(self):
-        json_dict = {'longitude' : self.longitude,
-                     'latitude' : self.latitude,
-                     'time_since_last_contact' : time.time()-self.last_contact,
-                     'team_name' : self.name,
-                     'team_status' : self.status,
-                     'target_clue' : self.target}
-        return json_dict
 
 # variables
 homeBase = Point(42.340226, -71.088395) # krentzman, can be changed on dashboard
 clues = []
 bikes = []
+routes = {"clusters" : [], "individual_routes" : []} #geojson polylines, both between all the clusters
 assigned_clues = []
 clues_last_changed = time.time()
 home_last_changed = time.time()
+routes_last_changed = time.time() 
 
 # called every time a node is added
 # a bike is added/removed
 # determines/assigns clusters, and assigns routes to bikes
 def updateRoutes():
-    clusters = router.getClusters(bikes, clues, homeBase)
+    clusters, paths = router.getClusters(bikes, clues, homeBase)
+    routes['clusters'] = paths
+    routes_last_changed = time.time()
 
 # interface functions
 def getTime():
@@ -110,6 +37,12 @@ def setHomeBase(latitude, longitude):
     home_last_changed = time.time()
 
 
+def getRoutesJSON(timestamp):
+    if timestamp < 0 or routes_last_changed - timestamp > 0:
+        return routes
+    return False
+
+
 def addBike(team_name, latitude, longitude):
     for bike in bikes:
         if bike.name == team_name: # already exists
@@ -128,6 +61,7 @@ def pingBike(team_name, latitude, longitude):
     else: # bike team does not exist yet
         newBike = Bike(latitude, longitude, team_name, "ACTIVE")
         bikes.append(newBike)
+        updateRoutes()
 
 
 def getBikesJSON():
@@ -174,6 +108,7 @@ with open("all_clues.csv", newline='') as f:
 bike1 = Bike(42.340226, -71.088395, 'speedster', 'ACTIVE')
 bike2 = Bike(42.320226, -71.100395, 'slowpoke', "ACTIVE")
 bike1.setTarget("Clue #6")
+bikes.append(bike1); bikes.append(bike2)
+updateRoutes()
 def moveBike2Test():
     bike1.move(0, -0.001); bike1.ping();
-bikes.append(bike1); bikes.append(bike2)
\ No newline at end of file