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

diff --git a/gps303/lookaside.py b/gps303/lookaside.py
index b42ce06..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,17 +9,19 @@ 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":
+    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"))
@@ -37,9 +40,7 @@ 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!