From 495f3209882eba4a1367fba2303d0f2c612f39f7 Mon Sep 17 00:00:00 2001 From: Junzi Sun Date: Fri, 30 Nov 2018 23:36:58 +0100 Subject: [PATCH] fix exceptions --- pyModeS/decoder/adsb.py | 6 +++--- pyModeS/streamer/stream.py | 22 +++++++++++----------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/pyModeS/decoder/adsb.py b/pyModeS/decoder/adsb.py index ab71f20..d2b9a6a 100644 --- a/pyModeS/decoder/adsb.py +++ b/pyModeS/decoder/adsb.py @@ -323,10 +323,10 @@ def nic_v2(msg, NICa, NICbc): else: NICs = NICa*2 + NICbc - if isinstance(NIC, dict): - NIC = NIC[NICs] - try: + if isinstance(NIC, dict): + NIC = NIC[NICs] + Rc = uncertainty.NICv2[NIC][NICs]['Rc'] except KeyError: Rc = uncertainty.NA diff --git a/pyModeS/streamer/stream.py b/pyModeS/streamer/stream.py index 5d23620..de996f6 100644 --- a/pyModeS/streamer/stream.py +++ b/pyModeS/streamer/stream.py @@ -100,17 +100,17 @@ class Stream(): elif ('t0' in self.acs[icao]) and ('t1' in self.acs[icao]) and \ (abs(self.acs[icao]['t0'] - self.acs[icao]['t1']) < 10): # use multi message decoding - # try: - latlon = pms.adsb.position( - self.acs[icao][0], - self.acs[icao][1], - self.acs[icao]['t0'], - self.acs[icao]['t1'], - self.lat0, self.lon0 - ) - # except: - # # mix of surface and airborne position message - # continue + try: + latlon = pms.adsb.position( + self.acs[icao][0], + self.acs[icao][1], + self.acs[icao]['t0'], + self.acs[icao]['t1'], + self.lat0, self.lon0 + ) + except: + # mix of surface and airborne position message + continue else: latlon = None