test using latlon and geopy

test_server.py

@@ -1,6 +1,7 @@
 import pytest
 import requests
-
+from LatLon23 import LatLon
+from geopy import distance
 
 FLOCK_SERVER="http://127.0.0.1:5000"
 
@@ -10,36 +11,69 @@ a = (19.37634,-99.12660)  # playa pie de la cuesta y mirador
 
 b = (19.37521,-99.11923)  # antropólogos y cardiólogos
 
-id1 = None
-id2 = None
+b1 = None
+b2 = None
+
+def flip(coord):
+    return (coord[1], coord[0])
+
+
+class Bike(dict):
+
+    def server_register(self, dest):
+    
+        register_url = "{server}/register/?dest_lon={dest_lon}&dest_lat={dest_lat}"
+        r = requests.get(register_url.format(server=FLOCK_SERVER,
+                                             dest_lon=dest[1],
+                                             dest_lat=dest[0]))
+        out = r.json()
+        assert 'bike_id' in out
+
+        
+        self.update({'bike_id': out['bike_id'], })
+                     # "flock_avg_speed":3.5,
+                     # "flock_distance":0.2105884044243021,
+                     # "flock_heading":71.99999999869847,
+                     # "flock_size": out['flock_size']})
+
+
+    def server_update(self):    
+        update_url = "{server}/update/{bike_id}/?lat={lat}&lon={lon}&speed={speed}&bearing={bearing}"
+        req = requests.get(update_url.format(server=FLOCK_SERVER,
+                                             bike_id=self.bike_id,
+                                             speed=self.speed,
+                                             bearing=self.bearing,
+                                             lat=self.point[0],                                           
+                                             lon=self.point[1]))
+        resp = req.json()
+        print(resp)
+        
+
 
 def test_register():
-    global id1, id2
+    global b1, b2
 
-    dest = UACM
+    b1 = Bike()
+    b1.server_register(dest=UACM)
 
-    url = "{server}/register/?dest_lon={dest_lon}&dest_lat={dest_lat}"
-    r = requests.get(url.format(server=FLOCK_SERVER,
-                                dest_lon=dest[1],
-                                dest_lat=dest[0]))
-    out = r.json()
-    assert 'bike_id' in out
+    #b1.update({''})
+    #id2 = out['bike_id']
 
-    id1 = out['bike_id']
-
-
-    url = "{server}/register/?dest_lon={dest_lon}&dest_lat={dest_lat}"
-    r = requests.get(url.format(server=FLOCK_SERVER,
-                                dest_lon=dest[1],
-                                dest_lat=dest[0]))
-    out = r.json()
-    assert 'bike_id' in out
-    
-    id2 = out['bike_id']
 
 
 def test_update():
-    print(id1, id2)
+    global b1, b2
+
+    t0 = LatLon(*a)
+    t1 = t0.offset(90, 1)
+    
+    print(t0, t1, t0.heading_initial(t1), distance.geodesic(a,
+                                                            (t1.lat, t1.lon)).meters)
+    
+    #b1.server_update(t0[0], lon, speed, bearing)
+
+    #b2.server_update(lat, lon, speed, bearing)    
+    
     assert True