- 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)
+ rect: Report = msg.rectified()
+ log.debug("rectified: %s", rect)
+ if isinstance(rect, (CoordReport, StatusReport)):
+ zpub.send(Rept(imei=zmsg.imei, payload=rect.json).packed)
+ elif isinstance(rect, HintReport):
+ try:
+ lat, lon, acc = qry.lookup(
+ rect.mcc,
+ rect.mnc,
+ rect.gsm_cells,
+ list((mac, strng) for _, mac, strng in rect.wifi_aps),
+ )
+ log.debug(
+ "Approximated lat=%s, lon=%s, acc=%s for %s",
+ lat,
+ lon,
+ acc,
+ rect,
+ )
+ if proto_needanswer.get(zmsg.proto, False):
+ 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("Sending reponse %s", resp)
+ zpush.send(resp.packed)
+ rept = CoordReport(
+ devtime=rect.devtime,
+ battery_percentage=rect.battery_percentage,
+ accuracy=acc,
+ altitude=None,
+ speed=None,
+ direction=None,
+ latitude=lat,
+ longitude=lon,
+ )
+ log.debug("Sending report %s", rept)
+ zpub.send(
+ Rept(
+ imei=zmsg.imei,
+ payload=rept.json,
+ ).packed
+ )
+ except Exception as e:
+ log.exception(
+ "Lookup for %s rectified as %s resulted in %s",
+ msg,
+ rect,
+ e,
+ )