mnc: int,
gsm_cells: List[Tuple[int, int, int]],
wifi_aps: List[Tuple[str, int]],
- ) -> Tuple[float, float]:
+ ) -> Tuple[float, float, float]:
...
zpush = zctx.socket(zmq.PUSH) # type: ignore
zpush.connect(conf.get("collector", "listenurl"))
zpub = zctx.socket(zmq.PUB) # type: ignore
- zpub.connect(conf.get("rectifier", "publishurl"))
+ oldmask = umask(0o117)
+ zpub.bind(conf.get("rectifier", "publishurl"))
+ umask(oldmask)
try:
while True:
zpub.send(Rept(imei=zmsg.imei, payload=rect.json).packed)
elif isinstance(rect, HintReport):
try:
- lat, lon = qry.lookup(
+ 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 for %s", lat, lon, rect
+ "Approximated lat=%s, lon=%s, acc=%s for %s",
+ lat,
+ lon,
+ acc,
+ rect,
)
if proto_needanswer.get(zmsg.proto, False):
resp = Resp(
)
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=CoordReport(
- devtime=rect.devtime,
- battery_percentage=rect.battery_percentage,
- accuracy=-1,
- altitude=-1,
- speed=-1,
- direction=-1,
- latitude=lat,
- longitude=lon,
- ).json,
+ payload=rept.json,
).packed
)
except Exception as e:
- log.warning(
+ log.exception(
"Lookup for %s rectified as %s resulted in %s",
msg,
rect,