From fabb92bc888ddea7b3a4dba620a15312802e7d6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konstantin=20Gru=CC=88ndger?= Date: Sat, 28 Apr 2018 18:45:23 +0200 Subject: [PATCH] Changed spider/spot to
--- ogn/parser/aprs_comment/spider_parser.py | 2 +- ogn/parser/aprs_comment/spot_parser.py | 2 +- tests/parser/test_parse_spider.py | 2 +- tests/parser/test_parse_spot.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ogn/parser/aprs_comment/spider_parser.py b/ogn/parser/aprs_comment/spider_parser.py index 374e458..55e89e7 100644 --- a/ogn/parser/aprs_comment/spider_parser.py +++ b/ogn/parser/aprs_comment/spider_parser.py @@ -12,7 +12,7 @@ class SpiderParser(BaseParser): @staticmethod def parse_position(aprs_comment): ac_match = re.search(PATTERN_SPIDER_POSITION_COMMENT, aprs_comment) - return {'id': ac_match.group('id'), + return {'address': ac_match.group('id'), '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/aprs_comment/spot_parser.py b/ogn/parser/aprs_comment/spot_parser.py index 2e64ead..04d4685 100644 --- a/ogn/parser/aprs_comment/spot_parser.py +++ b/ogn/parser/aprs_comment/spot_parser.py @@ -12,6 +12,6 @@ class SpotParser(BaseParser): @staticmethod def parse_position(aprs_comment): ac_match = re.search(PATTERN_SPOT_POSITION_COMMENT, aprs_comment) - return {'id': ac_match.group('id'), + return {'address': ac_match.group('id'), 'model': int(ac_match.group('model')) if ac_match.group('model') else None, 'status': ac_match.group('status') if ac_match.group('status') else None} diff --git a/tests/parser/test_parse_spider.py b/tests/parser/test_parse_spider.py index eed3e9b..0b3a3fc 100644 --- a/tests/parser/test_parse_spider.py +++ b/tests/parser/test_parse_spider.py @@ -7,7 +7,7 @@ class TestStringMethods(unittest.TestCase): def test_position_comment(self): message = SpiderParser.parse_position("id300234010617040 +19dB LWE 3D") - self.assertEqual(message['id'], "300234010617040") + self.assertEqual(message['address'], "300234010617040") self.assertEqual(message['signal_power'], 19) self.assertEqual(message['spider_id'], "LWE") self.assertEqual(message['gps_quality'], "3D") diff --git a/tests/parser/test_parse_spot.py b/tests/parser/test_parse_spot.py index f437bc8..ff12382 100644 --- a/tests/parser/test_parse_spot.py +++ b/tests/parser/test_parse_spot.py @@ -7,7 +7,7 @@ class TestStringMethods(unittest.TestCase): def test_position_comment(self): message = SpotParser.parse_position("id0-2860357 SPOT3 GOOD") - self.assertEqual(message['id'], "0-2860357") + self.assertEqual(message['address'], "0-2860357") self.assertEqual(message['model'], 3) self.assertEqual(message['status'], "GOOD")