WIP: Improve scantime

.gitignore

@@ -7,3 +7,4 @@ templates/footer.html
 *.so
 *.dll
 *.dylib
+*.data

config.py.example

@@ -15,6 +15,12 @@ PROXIES = None  # Insert dictionary with 'http' and 'https' keys to enable
 
 SCAN_RADIUS = 70  # metres
 
+
+# Higher value, fewer scanpoints are necessary, however there's obviously
+# a lower cap and the runtime increases exponentially, so don't set it
+# much higher
+SAMPLES_PER_POINT = 5 
+
 ACCOUNTS = [
     ('ash_ketchum', 'pik4chu', 'ptc'),
     ('ziemniak_kalafior', 'ogorek', 'google'),

db.py

@@ -427,3 +427,26 @@ def get_all_spawn_coords(session, pokemon_id=None):
     if config.REPORT_SINCE:
         points = points.filter(Sighting.expire_timestamp > get_since())
     return points.all()
+
+def get_known_spawnpoints(session):
+    query = ('''
+        SELECT lat, lon
+        FROM sightings
+        WHERE
+            lat >= {lat_start} AND 
+            lat <= {lat_end} AND
+            lon >= {lon_start} AND
+            lon <= {lon_end}
+        GROUP BY spawn_id;
+    '''.format(
+        lat_start=min(config.MAP_START[0], config.MAP_END[0]),
+        lat_end=max(config.MAP_START[0], config.MAP_END[0]),
+        lon_start=min(config.MAP_START[1], config.MAP_END[1]),
+        lon_end=max(config.MAP_START[1], config.MAP_END[1])
+    ))
+    query = session.execute(query)
+    results = []
+    for x in query.fetchall():
+        results.append((float(x[0]), float(x[1])))
+    return results
+

requirements.txt

@@ -9,3 +9,6 @@ werkzeug==0.11.10
 sqlalchemy==1.0.14
 -e git+https://github.com/keyphact/pgoapi.git@39ea20d31b770dd7bc83180d60283e171090e16d#egg=pgoapi
 enum34==1.1.6
+intervaltree==2.1.0
+numpy==1.11.1
+scipy==0.18.0