ha7ilm/openwebrx
1
0
Fork 0
mirror of https://github.com/ha7ilm/openwebrx.git synced 2026-02-03 05:54:25 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix coordinate decoding issues

Browse source
This commit is contained in:
Jakob Ketterl 2023-08-24 01:43:19 +02:00
parent 745ba797e1
commit e120ab4be3
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
owrx/adsb/modes.py
View file

@ -186,17 +186,17 @@ class ModeSParser(PickleModule):
def __getCprData(self, icao: str, input):
self.cprCache.addRecord(icao, {
"cpr_format": (input[6] & 0b00000100) >> 2,
"lat_cpr": ((input[6] & 0b00000011) << 15) | (input[7] << 7) | ((input[8] & 0b11111110) > 1),
"lon_cpr": ((input[8] & 0b00000001) << 16) | (input[9] << 8) | (input[10])
"lat_cpr": ((input[6] & 0b00000011) << 15) | (input[7] << 7) | ((input[8] & 0b11111110) >> 1),
"lon_cpr": ((input[8] & 0b00000001) << 16) | (input[9] << 8) | (input[10]),
})
records = self.cprCache.getRecentData(icao)
try:
# records are sorted by timestamp, last should be newest
rev = reversed(records)
odd = next(r for r in rev if r["cpr_format"])
even = next(r for r in rev if not r["cpr_format"])
odd = next(r for r in reversed(records) if r["cpr_format"])
even = next(r for r in reversed(records) if not r["cpr_format"])
newest = next(reversed(records))
lat_cpr_even = even["lat_cpr"] / 2 ** 17
lat_cpr_odd = odd["lat_cpr"] / 2 ** 17
@ -230,7 +230,6 @@ class ModeSParser(PickleModule):
logger.debug("latitude zone mismatch")
return
newest = next(rev)
lat = lat_odd if newest["cpr_format"] else lat_even
lon_cpr_even = even["lon_cpr"] / 2 ** 17