Spider: signal_strength -> signal_power

pull/62/head
Konstantin Gründger 2018-04-28 15:16:02 +02:00
rodzic c8d739eccd
commit 8c874a3226
3 zmienionych plików z 3 dodań i 3 usunięć

Wyświetl plik

@ -13,6 +13,6 @@ class SpiderParser(BaseParser):
def parse_position(aprs_comment):
ac_match = re.search(PATTERN_SPIDER_POSITION_COMMENT, aprs_comment)
return {'id': ac_match.group('id'),
'signal_strength': int(ac_match.group('signal_strength')) if ac_match.group('signal_strength') else None,
'signal_power': int(ac_match.group('signal_power')) if ac_match.group('signal_power') else None,
'spider_id': ac_match.group('spider_id') if ac_match.group('spider_id') else None,
'gps_quality': ac_match.group('gps_quality') if ac_match.group('gps_quality') else None}

Wyświetl plik

@ -44,7 +44,7 @@ PATTERN_SKYLINES_POSITION_COMMENT = re.compile("""
PATTERN_SPIDER_POSITION_COMMENT = re.compile("""
id(?P<id>[\d-]+)\s
(?P<signal_strength>[+-]\d+)dB\s
(?P<signal_power>[+-]\d+)dB\s
(?P<spider_id>[A-Z]+)\s
(?P<gps_quality>.+)
""", re.VERBOSE | re.MULTILINE)

Wyświetl plik

@ -8,7 +8,7 @@ class TestStringMethods(unittest.TestCase):
message = SpiderParser.parse_position("id300234010617040 +19dB LWE 3D")
self.assertEqual(message['id'], "300234010617040")
self.assertEqual(message['signal_strength'], 19)
self.assertEqual(message['signal_power'], 19)
self.assertEqual(message['spider_id'], "LWE")
self.assertEqual(message['gps_quality'], "3D")