X-Git-Url: http://average.org/gitweb/?a=blobdiff_plain;f=gps303%2Flookaside.py;h=7655f55e4bb095655b41d525aba89cf0a4b12c87;hb=1888de5a5dd4bdb85f3fb745341920a9996b278e;hp=b42ce06f378a5ae10fe9a642475556ab577d6859;hpb=3b94b72763b7db9e9665d60c3dd26812bd134a8d;p=loctrkd.git

diff --git a/gps303/lookaside.py b/gps303/lookaside.py
index b42ce06..7655f55 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,14 @@ 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":
-        raise NotImplementedError(
-            "Lookaside only implements opencellid backend"
-        )
+    qry = import_module("." + conf.get("lookaside", "backend"), __package__)
+    qry.init(conf)
     zctx = zmq.Context()
     zsub = zctx.socket(zmq.SUB)
     zsub.connect(conf.get("collector", "publishurl"))
@@ -37,16 +35,17 @@ def runserver(conf):
                 datetime.fromtimestamp(zmsg.when).astimezone(tz=timezone.utc),
                 msg,
             )
-            lat, lon = qry_cell(
-                conf["opencellid"]["dbfn"], msg.mcc, msg.gsm_cells
-            )
-            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)
-            zpush.send(resp.packed)
+            try:
+                lat, lon = qry.lookup(msg.mcc, msg.mnc, 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)
+                zpush.send(resp.packed)
+            except Exception as e:
+                log.warning("Lookup for %s resulted in %s", msg, e)
 
     except KeyboardInterrupt:
         pass