From 2c0d29f1546b9a7dc52d894ae4e07fc1acde71ca Mon Sep 17 00:00:00 2001
From: rgarcia-herrera <rgarcia@iecologia.unam.mx>
Date: Mon, 14 Sep 2020 14:20:56 -0500
Subject: [PATCH] test resets the db

---
 model.py       |  5 +++--
 test_server.py | 50 ++++++++++++++++++++++++++++++--------------------
 2 files changed, 33 insertions(+), 22 deletions(-)

diff --git a/model.py b/model.py
index 808438d..c57ccde 100644
--- a/model.py
+++ b/model.py
@@ -24,11 +24,13 @@ class Flock:
         n = 0
         for b in bikes:
 
+            # next point is determined by the distance travelled since the last update
             dt = datetime.datetime.now() - b['last_update']
             progress = (b['speed'] * dt.seconds) / 1000  # in km
             point = LatLon(b['point'][1], b['point'][0])
             next_point = point.offset(b['bearing'], progress)
-            
+
+            # collect all speeds, bearings and next points, to find centroid and average speed
             speeds.append(b['speed'])
             bearings.append(b.get('bearing', 0))
             lats.append(float(next_point.lat))
@@ -43,7 +45,6 @@ class Flock:
         if n > 0:
             self.size = n
             self.mean_speed = sum(speeds) / float(len(speeds))
-
             
             self.centroid = LatLon(Latitude(sum(lats) / len(lats)),
                                    Longitude(sum(lons) / len(lons)))
diff --git a/test_server.py b/test_server.py
index 2acc65e..02f85fa 100644
--- a/test_server.py
+++ b/test_server.py
@@ -15,6 +15,15 @@ points = [
 
 bikes = []
 
+from pymongo import MongoClient
+
+client = MongoClient()
+db = client.test
+col = db["bike"] 
+d = col.delete_many({})
+print(d)
+
+
 def flip(coord):
     return (coord[1], coord[0])
 
@@ -96,32 +105,33 @@ def test_update():
 
 
 
-# def test_flock_forward():
-#     """
-#     Bike 1 is closely followed by 2. Bike 1 updates at t=0, bike 2
-#     twenty seconds later.
+def test_flock_forward():
+    """
+    Bike 1 is closely followed by 2. Bike 1 updates at t=0, bike 2
+    twenty seconds later.
 
-#     test for proper distances, flock heading, dest heading, etc.
-#     """
-#     global b1, b2
+    test for proper distances, flock heading, dest heading, etc.
+    """
+    global bikes
 
-#     # 
-#     t0 = LatLon(*a)
-#     t1 = t0.offset(90, 1)
+    # 
+    t0 = LatLon(*points[0])
+    t1 = t0.offset(45, 1)
     
-#     b1.update(
-#         {'speed': 3,
-#          'bearing': t0.heading_initial(t1),
-#          'lat': t1.lat,
-#          'lon': t1.lon,
-#          })
+    bikes[0].update(
+        {'speed': 3,
+         'bearing': t0.heading_initial(t1),
+         'lat': t1.lat,
+         'lon': t1.lon,
+        })
     
-#     b1.server_update()
+    bikes[0].server_update()
 
-#     print(b1)
-#     #b2.server_update(lat, lon, speed, bearing)    
+    print(bikes)
+
+    #b2.server_update(lat, lon, speed, bearing)    
     
-#     assert True
+    assert True