X-Git-Url: http://average.org/gitweb/?a=blobdiff_plain;f=gps303%2Flookaside.py;h=1d214896b81fc5e3c73db89fa6a68c9a10412d88;hb=refs%2Ftags%2F1.02;hp=085cbe9a31b65c65057d6fa150158560658ef4f4;hpb=80e795c08def3466884223357798cd1aff265212;p=loctrkd.git

diff --git a/gps303/lookaside.py b/gps303/lookaside.py
index 085cbe9..1d21489 100644
--- a/gps303/lookaside.py
+++ b/gps303/lookaside.py
@@ -1,32 +1,29 @@
 """ Estimate coordinates from WIFI_POSITIONING and send back """
 
+from configparser import ConfigParser
 from datetime import datetime, timezone
+from importlib import import_module
 from logging import getLogger
+from os import umask
 from struct import pack
 import zmq
 
 from . import common
-from .gps303proto import parse_message, proto_by_name, WIFI_POSITIONING
-from .opencellid import qry_cell
-from .zmsg import Bcast, LocEvt, Resp
+from .gps303proto import parse_message, WIFI_POSITIONING
+from .zmsg import Bcast, Resp, topic
 
 log = getLogger("gps303/lookaside")
 
 
-def runserver(conf):
-    zctx = zmq.Context()
-    zpub = zctx.socket(zmq.PUB)
-    zpub.bind(conf.get("lookaside", "publishurl"))
-    zsub = zctx.socket(zmq.SUB)
+def runserver(conf: ConfigParser) -> None:
+    qry = import_module("." + conf.get("lookaside", "backend"), __package__)
+    qry.init(conf)
+    # Is this https://github.com/zeromq/pyzmq/issues/1627 still not fixed?!
+    zctx = zmq.Context()  # type: ignore
+    zsub = zctx.socket(zmq.SUB)  # type: ignore
     zsub.connect(conf.get("collector", "publishurl"))
-    for protoname in (
-        "GPS_POSITIONING",
-        "GPS_OFFLINE_POSITIONING",
-        "WIFI_POSITIONING",
-    ):
-        topic = pack("B", proto_by_name(protoname))
-        zsub.setsockopt(zmq.SUBSCRIBE, topic)
-    zpush = zctx.socket(zmq.PUSH)
+    zsub.setsockopt(zmq.SUBSCRIBE, topic(WIFI_POSITIONING.PROTO))
+    zpush = zctx.socket(zmq.PUSH)  # type: ignore
     zpush.connect(conf.get("collector", "listenurl"))
 
     try:
@@ -40,32 +37,25 @@ def runserver(conf):
                 datetime.fromtimestamp(zmsg.when).astimezone(tz=timezone.utc),
                 msg,
             )
-            if isinstance(msg, WIFI_POSITIONING):
-                is_gps = False
-                lat, lon = qry_cell(
-                    conf["opencellid"]["dbfn"], msg.mcc, msg.gsm_cells
+            try:
+                lat, lon = qry.lookup(
+                    msg.mcc, msg.mnc, msg.gsm_cells, msg.wifi_aps
                 )
                 resp = Resp(
-                    imei=zmsg.imei, packet=msg.Out(lat=lat, lon=lon).packed
+                    imei=zmsg.imei,
+                    when=zmsg.when,  # not the current time, but the original!
+                    packet=msg.Out(latitude=lat, longitude=lon).packed,
                 )
                 log.debug("Response for lat=%s, lon=%s: %s", lat, lon, resp)
                 zpush.send(resp.packed)
-            else:
-                is_gps = True
-                lat = msg.latitude
-                lon = msg.longitude
-            zpub.send(
-                LocEvt(
-                    imei=zmsg.imei,
-                    devtime=msg.devtime,
-                    is_gps=is_gps,
-                    lat=lat,
-                    lon=lon,
-                ).packed
-            )
+            except Exception as e:
+                log.warning("Lookup for %s resulted in %s", msg, e)
 
     except KeyboardInterrupt:
-        pass
+        zsub.close()
+        zpush.close()
+        zctx.destroy()  # type: ignore
+        qry.shut()
 
 
 if __name__.endswith("__main__"):