diff --git a/ogn/parser/aprs_comment/spider_parser.py b/ogn/parser/aprs_comment/spider_parser.py index 6fbcbc8..374e458 100644 --- a/ogn/parser/aprs_comment/spider_parser.py +++ b/ogn/parser/aprs_comment/spider_parser.py @@ -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} diff --git a/ogn/parser/pattern.py b/ogn/parser/pattern.py index a107364..68f00f5 100644 --- a/ogn/parser/pattern.py +++ b/ogn/parser/pattern.py @@ -44,7 +44,7 @@ PATTERN_SKYLINES_POSITION_COMMENT = re.compile(""" PATTERN_SPIDER_POSITION_COMMENT = re.compile(""" id(?P[\d-]+)\s - (?P[+-]\d+)dB\s + (?P[+-]\d+)dB\s (?P[A-Z]+)\s (?P.+) """, re.VERBOSE | re.MULTILINE) diff --git a/tests/parser/test_parse_spider.py b/tests/parser/test_parse_spider.py index 3779c76..eed3e9b 100644 --- a/tests/parser/test_parse_spider.py +++ b/tests/parser/test_parse_spider.py @@ -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")