X-Git-Url: http://average.org/gitweb/?a=blobdiff_plain;f=gps303%2Flookaside.py;h=6924757ec344a7992b8b3aed510f536ecef2c66a;hb=5e1ae25333928e02eed519652256bee2e8e06671;hp=dd5a449bdbcfa771fd5358f25b1d56afd52b386a;hpb=5e1e7a4d37a1e149d5e899dada7b55a863cd8e64;p=loctrkd.git

diff --git a/gps303/lookaside.py b/gps303/lookaside.py
index dd5a449..6924757 100644
--- a/gps303/lookaside.py
+++ b/gps303/lookaside.py
@@ -1,6 +1,7 @@
 """ Estimate coordinates from WIFI_POSITIONING and send back """
 
 from datetime import datetime, timezone
+from importlib import import_module
 from logging import getLogger
 from os import umask
 from struct import pack
@@ -8,18 +9,23 @@ import zmq
 
 from . import common
 from .gps303proto import parse_message, WIFI_POSITIONING
-from .opencellid import qry_cell
 from .zmsg import Bcast, Resp, topic
 
 log = getLogger("gps303/lookaside")
 
 
 def runserver(conf):
+    if conf.get("lookaside", "backend") == "opencellid":
+        qry = import_module(".opencellid", __package__)
+    else:
+        raise NotImplementedError(
+            "Lookaside only implements opencellid backend"
+        )
+    qry.init(conf)
     zctx = zmq.Context()
     zsub = zctx.socket(zmq.SUB)
     zsub.connect(conf.get("collector", "publishurl"))
-    tosub = topic(WIFI_POSITIONING.PROTO)
-    zsub.setsockopt(zmq.SUBSCRIBE, tosub)
+    zsub.setsockopt(zmq.SUBSCRIBE, topic(WIFI_POSITIONING.PROTO))
     zpush = zctx.socket(zmq.PUSH)
     zpush.connect(conf.get("collector", "listenurl"))
 
@@ -34,11 +40,10 @@ def runserver(conf):
                 datetime.fromtimestamp(zmsg.when).astimezone(tz=timezone.utc),
                 msg,
             )
-            lat, lon = qry_cell(
-                conf["opencellid"]["dbfn"], msg.mcc, msg.gsm_cells
-            )
+            lat, lon = qry.lookup(msg.mcc, msg.gsm_cells, msg.wifi_aps)
             resp = Resp(
                 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)