X-Git-Url: http://www.average.org/gitweb/?p=loctrkd.git;a=blobdiff_plain;f=gps303%2Fopencellid.py;h=1932fa6980c32309cea1628feae10478256b4416;hp=0131dc0305bdb6a4e385f7392470c7aecf5bba52;hb=1888de5a5dd4bdb85f3fb745341920a9996b278e;hpb=5e1ae25333928e02eed519652256bee2e8e06671 diff --git a/gps303/opencellid.py b/gps303/opencellid.py index 0131dc0..1932fa6 100644 --- a/gps303/opencellid.py +++ b/gps303/opencellid.py @@ -14,7 +14,7 @@ def init(conf): ldb = connect(conf["opencellid"]["dbfn"]) -def lookup(mcc, gsm_cells, _): +def lookup(mcc, mnc, gsm_cells, __): lc = ldb.cursor() lc.execute("""attach database ":memory:" as mem""") lc.execute("create table mem.seen (locac int, cellid int, signal int)") @@ -60,7 +60,7 @@ if __name__.endswith("__main__"): init({"opencellid": {"dbfn": sys.argv[2]}}) for timestamp, packet in c: obj = parse_message(packet) - avlat, avlon = lookup(obj.mcc, obj.gsm_cells, obj.wifi_aps) + avlat, avlon = lookup(obj.mcc, obj.mnc, obj.gsm_cells, obj.wifi_aps) print( "{} {:+#010.8g},{:+#010.8g}".format( datetime.fromtimestamp(timestamp), avlat, avlon