X-Git-Url: http://average.org/gitweb/?a=blobdiff_plain;f=gps303%2Fmkgpx.py;h=02a08256a10c2e3e692ba68a0ccd5577f467f4e7;hb=bf48ccad4b4b91e7d7e09d1087f5953bc2db97d7;hp=f694b7ee80cd5c69de49805be79d1e18f2cf061b;hpb=8bf5efdf4f5d069b108e6fd8140f5ebd930b538e;p=loctrkd.git

diff --git a/gps303/mkgpx.py b/gps303/mkgpx.py
index f694b7e..02a0825 100644
--- a/gps303/mkgpx.py
+++ b/gps303/mkgpx.py
@@ -1,26 +1,24 @@
+""" Example that produces gpx from events in evstore """
+
+# run as:
+# python -m gps303.mkgpx <sqlite-file> <IMEI>
+# Generated gpx is emitted to stdout
+
 from datetime import datetime, timezone
 from sqlite3 import connect
 import sys
 
-from .gps303proto import *
-from .opencellid import qry_cell
+from .zx303proto import *
 
 db = connect(sys.argv[1])
 c = db.cursor()
 c.execute(
-    "select tstamp, packet from events where proto in ({})".format(
-        ", ".join(
-            [
-                str(n)
-                for n in (
-                    WIFI_POSITIONING.PROTO,
-                    WIFI_OFFLINE_POSITIONING.PROTO,
-                    GPS_POSITIONING.PROTO,
-                    GPS_OFFLINE_POSITIONING.PROTO,
-                )
-            ]
-        )
-    )
+    """select tstamp, is_incoming, packet from events
+       where imei = ?
+       and ((is_incoming = false and proto = ?) 
+         or (is_incoming = true and proto = ?))
+       order by tstamp""",
+    (sys.argv[2], proto_name(WIFI_POSITIONING), proto_name(GPS_POSITIONING)),
 )
 
 print(
@@ -35,16 +33,9 @@ xmlns="http://www.topografix.com/GPX/1/1">
 """
 )
 
-for tstamp, packet in c:
-    msg = parse_message(packet)
-    if isinstance(msg, (WIFI_POSITIONING, WIFI_OFFLINE_POSITIONING)):
-        lat, lon = qry_cell(sys.argv[2], msg.mcc, msg.gsm_cells)
-        if lat is None or lon is None:
-            continue
-    elif isinstance(msg, (GPS_POSITIONING, GPS_OFFLINE_POSITIONING)):
-        lat, lon = msg.latitude, msg.longitude
-    else:
-        continue
+for tstamp, is_incoming, packet in c:
+    msg = parse_message(packet, is_incoming=is_incoming)
+    lat, lon = msg.latitude, msg.longitude
     isotime = (
         datetime.fromtimestamp(tstamp).astimezone(tz=timezone.utc).isoformat()
     )