xan/xmet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Further simplify code

Browse source
This commit is contained in:
XANTRONIX Industrial 2025-02-20 13:35:56 -05:00
parent 52978b267f
commit 44bd511347
1 changed files with 18 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lib/nexrad/afos.py
View file

@ -3,8 +3,6 @@ import enum
import datetime import datetime
import shapely import shapely
from typing import Self
from nexrad.db import DatabaseTable from nexrad.db import DatabaseTable
from nexrad.coord import COORD_SYSTEM from nexrad.coord import COORD_SYSTEM
from nexrad.vtec import VTECEvent from nexrad.vtec import VTECEvent
@ -220,11 +218,16 @@ class AFOSMessageParser():
def parse_body(self, line: str): def parse_body(self, line: str):
if line == '&&': if line == '&&':
self.state = AFOSMessageParserState.TAGS self.state = AFOSMessageParserState.TAGS
elif self.timestamp is None: return
if self.timestamp is not None:
return
match = RE_DATE.match(line) match = RE_DATE.match(line)
if match is not None: if match is not None:
tzoffset = TIMEZONES[match['tz'].upper()] tzoffset = TIMEZONES[match['tz'].upper()]
tzinfo = datetime.timezone(datetime.timedelta(hours=tzoffset))
self.timestamp = datetime.datetime( self.timestamp = datetime.datetime(
year = int(match['year']), year = int(match['year']),
@ -233,7 +236,7 @@ class AFOSMessageParser():
hour = int(match['hour']), hour = int(match['hour']),
minute = int(match['minute']), minute = int(match['minute']),
second = 0, second = 0,
tzinfo = datetime.timezone(datetime.timedelta(hours=tzoffset)) tzinfo = tzinfo
).astimezone(datetime.UTC) ).astimezone(datetime.UTC)
def parse_tags(self, line: str): def parse_tags(self, line: str):