Fix more RAOB parsing issues
This commit is contained in:
parent
db22113c55
commit
f4bcbbce84
1 changed files with 12 additions and 6 deletions
|
@ -102,6 +102,7 @@ class RAOBObs():
|
||||||
self.tokens: list[str] = list()
|
self.tokens: list[str] = list()
|
||||||
|
|
||||||
def read(self, token: str):
|
def read(self, token: str):
|
||||||
|
if token != '':
|
||||||
self.tokens.append(token)
|
self.tokens.append(token)
|
||||||
|
|
||||||
def parse_timestamp(self, token: str):
|
def parse_timestamp(self, token: str):
|
||||||
|
@ -130,7 +131,6 @@ class RAOBObs():
|
||||||
if token[0:2] == '//':
|
if token[0:2] == '//':
|
||||||
temp = None
|
temp = None
|
||||||
else:
|
else:
|
||||||
print(f"Got token {token}")
|
|
||||||
tenths = int(token[2])
|
tenths = int(token[2])
|
||||||
sign = 1 if tenths % 2 == 0 else -1
|
sign = 1 if tenths % 2 == 0 else -1
|
||||||
|
|
||||||
|
@ -348,14 +348,20 @@ class RAOBObs():
|
||||||
|
|
||||||
def parse_ttbb_sample(self, tokens: list[str]) -> dict:
|
def parse_ttbb_sample(self, tokens: list[str]) -> dict:
|
||||||
hp = self.parse_pressure(tokens[0])
|
hp = self.parse_pressure(tokens[0])
|
||||||
td = self.parse_temp_dewpoint(tokens[1])
|
|
||||||
|
|
||||||
return {
|
ret = {
|
||||||
'pressure': hp['pressure'],
|
'pressure': hp['pressure'],
|
||||||
'temp': td['temp'],
|
'temp': None,
|
||||||
'dewpoint': td['dewpoint']
|
'dewpoint': None
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if len(tokens) > 1:
|
||||||
|
td = self.parse_temp_dewpoint(tokens[1])
|
||||||
|
ret['temp'] = td['temp']
|
||||||
|
ret['dewpoint'] = td['dewpoint']
|
||||||
|
|
||||||
|
return ret
|
||||||
|
|
||||||
def parse_ttbb(self) -> dict:
|
def parse_ttbb(self) -> dict:
|
||||||
station = self.tokens[0]
|
station = self.tokens[0]
|
||||||
timestamp = self.tokens[1]
|
timestamp = self.tokens[1]
|
||||||
|
|
Loading…
Add table
Reference in a new issue