FGFS-4.1/pyModeS
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix hidden altitude() call

Browse Source
This commit is contained in:
Junzi Sun 2019-10-29 22:24:59 +01:00
parent cf3828d2a0
commit 3f24f78d3a
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pyModeS/decoder/adsb.py
View File

@ -23,7 +23,7 @@ from pyModeS.decoder import uncertainty
from pyModeS.decoder.bds.bds05 import ( from pyModeS.decoder.bds.bds05 import (
airborne_position, airborne_position,
airborne_position_with_ref, airborne_position_with_ref,
altitude, altitude as altitude05,
) )
from pyModeS.decoder.bds.bds06 import ( from pyModeS.decoder.bds.bds06 import (
surface_position, surface_position,
@ -128,18 +128,13 @@ def altitude(msg):
if tc < 5 or tc == 19 or tc > 22: if tc < 5 or tc == 19 or tc > 22:
raise RuntimeError("%s: Not a position message" % msg) raise RuntimeError("%s: Not a position message" % msg)
if tc >= 5 and tc <= 8: elif tc >= 5 and tc <= 8:
# surface position, altitude 0 # surface position, altitude 0
return 0 return 0
msgbin = common.hex2bin(msg)
q = msgbin[47]
if q:
n = common.bin2int(msgbin[40:47] + msgbin[48:52])
alt = n * 25 - 1000
return alt
else: else:
return None # airborn position
return altitude05(msg)
def velocity(msg, rtn_sources=False): def velocity(msg, rtn_sources=False):