diff --git a/main.py b/main.py index ea8b26d..7ac448b 100644 --- a/main.py +++ b/main.py @@ -19,8 +19,8 @@ from geopy.distance import geodesic from os import path import pickle -FLOCK_SERVER="http://192.168.0.8:5000" - +#FLOCK_SERVER="http://192.168.0.8:5000" +FLOCK_SERVER="http://awelo.ath.cx:5000" class IconButton(ButtonBehavior, Image): pass @@ -201,8 +201,9 @@ class FlockompassApp(App): else: flock_distance = "%0.1f km" % flock_distance - self.dashboard_flock = "Flock: %s\nVel: %0.1f km/h" % (flock_distance, - self.session_data['flock_avg_speed'] * 1.609344) + self.dashboard_flock = "%s @ %s\nvel: %0.1f km/h" % (self.session_data['flock_size'], + flock_distance, + self.session_data['flock_avg_speed'] * 1.609344) else: self.dashboard_flock = "no flocks" @@ -306,7 +307,8 @@ class FlockompassApp(App): r = requests.get(register_url.format(server=FLOCK_SERVER, dest_lon=self.session_data['dest_lon'], - dest_lat=self.session_data['dest_lat'])) + dest_lat=self.session_data['dest_lat']), + timeout=0.5) out = r.json() self.session_data['bike_id'] = out['bike_id'] @@ -323,7 +325,8 @@ class FlockompassApp(App): speed=self.session_data['speed'], bearing=self.session_data['bearing'], lat=self.session_data['lat'], - lon=self.session_data['lon'])) + lon=self.session_data['lon']), + timeout=0.5) resp = req.json() print('server update ¡¡¡¡¡¡¡¡', req, resp) self.session_data.update(resp)