Fix geo search

jonthornton · jonthornton · commit 68d112ad1a0a · 2017-03-25T18:36:46.000-04:00
diff --git a/app.py b/app.py
@@ -96,10 +96,8 @@ def by_location():
         response.status_code = 400
         return response
 
-    return jsonify({
-        'data': mta.get_by_point(location, 5),
-        'updated': mta.last_update()
-        })
+    data = mta.get_by_point(location, 5)
+    return _make_envelope(data)
 
 @app.route('/by-route/<route>', methods=['GET'])
 @cross_origin
@@ -128,9 +126,18 @@ def routes():
         'updated': mta.last_update()
         })
 
+def _envelope_reduce(a, b):
+    if a['last_update'] and b['last_update']:
+        return a if a['last_update'] < b['last_update'] else b
+    elif a['last_update']:
+        return a
+    else:
+        return b
+
 def _make_envelope(data):
-    reduce_func = lambda a,b: a if a['last_update'] < b['last_update'] else b
-    time = reduce(reduce_func, data)['last_update']
+    time = None
+    if data:
+        time = reduce(_envelope_reduce, data)['last_update']
 
     return jsonify({
         'data': data,
diff --git a/mtapi/mtapi.py b/mtapi/mtapi.py
@@ -16,6 +16,8 @@ def distance(p1, p2):
 class Mtapi(object):
 
     class _Station(object):
+        last_update = None
+
         def __init__(self, json):
             self.json = json
             self.trains = {}
@@ -31,13 +33,12 @@ def add_train(self, route_id, direction, train_time, feed_time):
                 'time': train_time
             })
             self.last_update = feed_time
-            self.has_data = True
 
         def clear_train_data(self):
             self.trains['N'] = []
             self.trains['S'] = []
             self.routes = set()
-            self.has_data = False
+            self.last_update = None
 
         def sort_trains(self, max_trains):
             self.trains['S'] = sorted(self.trains['S'], key=itemgetter('time'))[:max_trains]
@@ -48,8 +49,7 @@ def serialize(self):
                 'N': self.trains['N'],
                 'S': self.trains['S'],
                 'routes': self.routes,
-                'last_update': self.last_update,
-                'hasData': self.has_data
+                'last_update': self.last_update
             }
             out.update(self.json)
             return out
@@ -183,9 +183,10 @@ def get_by_point(self, point, limit=5):
             self._update()
 
         with self._read_lock:
-            sortable_stations = copy.deepcopy(self._stations)
+            sortable_stations = copy.deepcopy(self._stations).values()
 
         sortable_stations.sort(key=lambda x: distance(x['location'], point))
+        sortable_stations = map(lambda x: x.serialize(), sortable_stations)
         return sortable_stations[:limit]
 
     def get_routes(self):
