Rewritten for Waldo.

Author: gsledbetter

Procfile

@@ -1 +1 @@
-web: gunicorn lifeguard:app --log-file=-
+web: gunicorn lifeguard:app --timeout 10 --preload

lifeguard.py

@@ -6,131 +6,99 @@
 import pytz
 
 
-class PersonMap:
-    def __init__(self, name):
-        self.name = name
-        self.latitude = 0.0
-        self.longitude = 0.0
-        self.map_id = name + '_map'
-        self.map = Map(identifier=self.map_id, lat=self.latitude,
-                       lng=self.longitude, markers=[(self.latitude, self.longitude)])
-        self.last_update = None
-
-    def update_location(self, lat, lon, dt=None):
-        self.latitude = lat
-        self.longitude = lon
-        self.map = Map(identifier=self.map_id, lat=self.latitude,
-                       lng=self.longitude, markers=[(self.latitude, self.longitude)])
-        self.last_update = dt
-
-
-device_owners = {
-    '0529CF2B-AEBD-4E81-8DD0-A99DDCC4EA60': 'Greg',
-
-}
-
-owner_maps = {
-    'Greg': PersonMap('Greg L.'),
-}
-
-
 app = Flask(__name__)
 GoogleMaps(app)
 tz = pytz.timezone('America/New_York')
 
 
+# Waldo APIs
+devices = {}
+
+
 @app.route('/')
 def home():
-    return render_template('home.html', owner_maps=owner_maps)
+    return render_template('home.html', devices=devices)
 
 
 @app.route('/about')
 def about():
     return render_template('about.html')
 
 
-@app.route('/location', methods=['POST', 'GET'])
-def location():
+class UserMap:
+    def __init__(self, name):
+        self.name = name
+        self.latitude = 42.4343779
+        self.longitude = -83.9891627
+        self.map_id = name + '_map'
+        self.map = Map(identifier=self.map_id, lat=self.latitude,
+                       lng=self.longitude, markers=[(self.latitude, self.longitude)])
+        self.last_update = None
+
+    def update_location(self, lat, lon, dt=None):
+        self.latitude = lat
+        self.longitude = lon
+        self.map = Map(identifier=self.map_id, lat=self.latitude,
+                       lng=self.longitude, markers=[(self.latitude, self.longitude)])
+        self.last_update = dt
+
 
-    device = request.args.get('p')
-    # get time in tz
-    posix_timestamp = request.args.get('t')
-    dt = datetime.fromtimestamp(float(posix_timestamp), tz)
-    latitude = request.args.get('lat')
-    longitude = request.args.get('lng')
+class Device:
+    def __init__(self, device_id, user_id, name):
+        self.device_id = device_id
+        self.name = name
+        self.user_id = user_id
+        self.map = UserMap(name)
 
-    if device in device_owners:
-        owner = device_owners[device]
-        owner_map = owner_maps[owner]
-        owner_map.update_location(latitude, longitude, dt)
-    else:
-        owner = 'unknown (device: ' + device + ')'
+    def update_device(self, user_id, name):
+        self.user_id = user_id
+        self.name = name
 
-    result = 'Lifeguard location updated at ' + dt.strftime('%Y-%m-%d %I:%M:%S %p') + ' for ' + owner + ': ' + latitude + ',' + longitude
-    print(result)
-    return result
 
+@app.route('/devicecheckin', methods=['POST'])
+def device_check_in():
+    checkin_data = request.get_json()
 
-@app.route('/register', methods=['POST', 'GET'])
-def register_user():
+    device_id = checkin_data['id']
+    lat = checkin_data['lat']
+    lng = checkin_data['lng']
+    time = checkin_data['time']
+    #mode = checkin_data['mode']
+    dt = datetime.fromtimestamp(float(time), tz)
 
-    device = request.args.get('p')
-    # get time in tz
-    posix_timestamp = request.args.get('t')
-    dt = datetime.fromtimestamp(float(posix_timestamp), tz)
-    user_id = request.args.get('uid')
-    latitude = request.args.get('lat')
-    longitude = request.args.get('lng')
+    result = "Waldo device check in API result: "
 
-    if device in device_owners:
-        owner_maps[device_owners[device]].update_location(latitude, longitude, dt)
+    if device_id in devices:
+        device = devices[device_id]
+        map = device.map
+        map.update_location(lat, lng, dt)
+        result = result + "updating device {} with location (lat,ln) ({},{}) at {}.".format(device_id, lat, lng, dt)
     else:
-        owner_maps[user_id] = PersonMap(user_id)
-        owner_maps[user_id].update_location(latitude, longitude, dt)
-        device_owners[device] = user_id
-
-    result = 'Lifeguard user registered with user name ' + user_id
-    print(result)
+        result = result + "error due to unknown device."
     return result
 
 
-@app.route('/visit', methods=['POST', 'GET'])
-def visit():
+@app.route('/registration', methods=['POST'])
+def device_registration():
+    registration_data = request.get_json()
 
-    user = request.args.get('user')
-    # get time in tz
-    timestamp = request.args.get('t')
+    device_id = registration_data['deviceId']
+    user_id = registration_data['userId']
+    name = registration_data['name']
 
-    latitude = request.args.get('lat')
-    longitude = request.args.get('lng')
-    arrive = request.args.get('arrive')
-    depart = request.args.get('depart')
+    result = "Waldo user registration API result: "
 
-    if user in owner_maps:
-        owner_map = owner_maps[user]
-        owner_map.update_location(latitude, longitude)
+    if device_id in devices:
+        devices[device_id].update_device(user_id, name)
+        result = result + "updating device {} with user name {} with user ID of {}.".format(device_id, name, user_id)
     else:
-        user = 'Unknown user: ' + user
-
-    result = 'Lifeguard visit update at ' + timestamp + ' for ' + user + ': ' + ' arrived at ' + arrive + \
-             ', departed at ' + depart + ', at location ' + latitude + ',' + longitude
+        device = Device(device_id, user_id, name)
+        devices[device_id] = device
+        result = result + "adding device {} for user name {} with user ID of {}.".format(device_id, name, user_id)
 
-    print(result)
     return result
 
 
-# Waldo APIs
-@app.route('/devicecheckin', methods=['POST'])
-def device_check_in():
-    checkin_data = request.get_json()
-
-    device_id = checkin_data['id']
-    lat = checkin_data['lat']
-    lng = checkin_data['lng']
-    time = checkin_data['time']
-    mode = checkin_data['mode']
-
-
 if __name__ == '__main__':
     app.debug = True
     app.run()

templates/home.html

@@ -3,11 +3,11 @@
         <div class="starter-template">
 
             <h1>Testing Team</h1>
-            {% for owner, owner_map in owner_maps.items() %}
+            {% for device_id, device in devices.items() %}
                 <br/>
                 <p class="lead">
-                    <a href="http://maps.google.com/maps?q={{ owner_map.latitude }},{{  owner_map.longitude }}+(My+Point)&z=15&ll={{ owner_map.latitude }},{{  owner_map.longitude }}">{{owner}}'s Location</a>
-                    - last updated at {{ owner_map.last_update }}
+                    <a href="http://maps.google.com/maps?q={{ device.map.latitude }},{{  device.map.longitude }}+(My+Point)&z=15&ll={{ device.map.latitude }},{{  device.map.longitude }}">{{device.name}}'s Location</a>
+                    - last updated at {{ device.map.last_update }}
                 </p>
                 <br/>
             {% endfor %}