mirror
/
python-ogn-client
kopia lustrzana https://github.com/glidernet/python-ogn-client
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

The comment is just optional

pull/23/head
Konstantin Gründger 2017-05-07 12:56:06 +02:00
rodzic a90f3ed1a9
commit c98c8eca04
2 zmienionych plików z 3 dodań i 2 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
ogn/parser/pattern.py
Wyświetl plik

@ -1,7 +1,7 @@
import re import re
PATTERN_APRS_POSITION = re.compile(r"^(?P<callsign>.+?)>(?P<dstcall>[A-Z0-9]+),.+,(?P<receiver>.+?):/(?P<time>\d{6})+h(?P<latitude>\d{4}\.\d{2})(?P<latitude_sign>N|S)(?P<symbol_table>.)(?P<longitude>\d{5}\.\d{2})(?P<longitude_sign>E|W)(?P<symbol>.)(?P<course_extension>(?P<course>\d{3})/(?P<ground_speed>\d{3}))?/A=(?P<altitude>\d{6})(?P<pos_extension>\s!W((?P<latitude_enhancement>\d)(?P<longitude_enhancement>\d))!)?\s(?P<comment>.*)$") PATTERN_APRS_POSITION = re.compile(r"^(?P<callsign>.+?)>(?P<dstcall>[A-Z0-9]+),.+,(?P<receiver>.+?):/(?P<time>\d{6})+h(?P<latitude>\d{4}\.\d{2})(?P<latitude_sign>N|S)(?P<symbol_table>.)(?P<longitude>\d{5}\.\d{2})(?P<longitude_sign>E|W)(?P<symbol>.)(?P<course_extension>(?P<course>\d{3})/(?P<ground_speed>\d{3}))?/A=(?P<altitude>\d{6})(?P<pos_extension>\s!W((?P<latitude_enhancement>\d)(?P<longitude_enhancement>\d))!)?(?:\s(?P<comment>.*))?$")
PATTERN_APRS_STATUS = re.compile(r"(?P<callsign>.+?)>(?P<dstcall>[A-Z0-9]+),.+,(?P<receiver>.+?):>(?P<time>\d{6})+h\s(?P<comment>.*)$") PATTERN_APRS_STATUS = re.compile(r"(?P<callsign>.+?)>(?P<dstcall>[A-Z0-9]+),.+,(?P<receiver>.+?):>(?P<time>\d{6})+h\s(?P<comment>.*)$")
# The following regexp patterns are part of the ruby ogn-client. # The following regexp patterns are part of the ruby ogn-client.

3
tests/parser/test_parse.py
Wyświetl plik

@ -14,7 +14,8 @@ class TestStringMethods(unittest.TestCase):
for line in f: for line in f:
if not line[0] == '#': if not line[0] == '#':
aprs = parse_aprs(line, datetime(2015, 4, 10, 17, 0)) aprs = parse_aprs(line, datetime(2015, 4, 10, 17, 0))
parse_ogn_beacon(aprs['comment']) if aprs['comment']:
parse_ogn_beacon(aprs['comment'])
def test_fail_none(self): def test_fail_none(self):
with self.assertRaises(TypeError): with self.assertRaises(TypeError):