From 37d089acac55bdbfaa07d7523de6700814670a5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konstantin=20Gru=CC=88ndger?= Date: Sat, 8 Jun 2019 14:20:19 +0200 Subject: [PATCH] Bugfix Spider parser (fixes #60) --- ogn/parser/pattern.py | 2 +- tests/parser/test_parse_spider.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ogn/parser/pattern.py b/ogn/parser/pattern.py index 2c36b61..3727935 100644 --- a/ogn/parser/pattern.py +++ b/ogn/parser/pattern.py @@ -45,7 +45,7 @@ PATTERN_SKYLINES_POSITION_COMMENT = re.compile(r""" PATTERN_SPIDER_POSITION_COMMENT = re.compile(r""" id(?P[\d-]+)\s (?P[+-]\d+)dB\s - (?P[A-Z]+)\s + (?P[A-Z0-9]+)\s (?P.+) """, re.VERBOSE | re.MULTILINE) diff --git a/tests/parser/test_parse_spider.py b/tests/parser/test_parse_spider.py index 6aa9fe0..c0d65c2 100644 --- a/tests/parser/test_parse_spider.py +++ b/tests/parser/test_parse_spider.py @@ -5,11 +5,11 @@ from ogn.parser.aprs_comment.spider_parser import SpiderParser class TestStringMethods(unittest.TestCase): def test_position_comment(self): - message = SpiderParser().parse_position("id300234010617040 +19dB LWE 3D") + message = SpiderParser().parse_position("id300234060668560 +30dB K23W 3D") - self.assertEqual(message['address'], "300234010617040") - self.assertEqual(message['signal_power'], 19) - self.assertEqual(message['spider_id'], "LWE") + self.assertEqual(message['address'], "300234060668560") + self.assertEqual(message['signal_power'], 30) + self.assertEqual(message['spider_id'], "K23W") self.assertEqual(message['gps_quality'], "3D")