fix old code

This commit is contained in:
Cyberes 2024-09-03 17:16:18 -06:00
parent 36e5d96e7a
commit 365c73e16b
1 changed files with 6 additions and 8 deletions

View File

@ -9,7 +9,7 @@ import numpy as np
import paho.mqtt.client as mqtt import paho.mqtt.client as mqtt
from redis import Redis from redis import Redis
from lib.tecmap import plot_tec_map, parse_ionex_datetime from lib.tecmap import plot_tec_map
logging.basicConfig(level=logging.INFO) logging.basicConfig(level=logging.INFO)
@ -62,22 +62,20 @@ def main():
redis = Redis(host='localhost', port=6379, db=0) redis = Redis(host='localhost', port=6379, db=0)
while True: while True:
utc_hr = datetime.utcnow().hour
logging.info('Fetching latest IONEX data')
logging.info(f'Using hour {utc_hr}')
data = redis.get('tecmap_data') data = redis.get('tecmap_data')
while data is None: while data is None:
logging.warning('Redis has not been populated yet. Is cache.py running? Sleeping 10s...') logging.warning('Redis has not been populated yet. Is cache.py running? Sleeping 10s...')
time.sleep(10) time.sleep(10)
ionex_data = pickle.loads(data) ionex_data = pickle.loads(data)
utc_hr = datetime.utcnow().hour
logging.info(f'Using hour {utc_hr}')
avg_tec = None avg_tec = None
for tecmap, epoch in ionex_data: for tecmap, epoch in ionex_data:
parsed_dt = parse_ionex_datetime(epoch) if epoch.hour == utc_hr:
if parsed_dt.hour == utc_hr:
avg_tec = np.mean(plot_tec_map(tecmap, [float(LON_RANGE_MIN), float(LON_RANGE_MAX)], [float(LAT_RANGE_MIN), float(LAT_RANGE_MAX)])[0]) avg_tec = np.mean(plot_tec_map(tecmap, [float(LON_RANGE_MIN), float(LON_RANGE_MAX)], [float(LAT_RANGE_MIN), float(LAT_RANGE_MAX)])[0])
logging.info(f'Data timestamp: {parsed_dt.isoformat()}') logging.info(f'Data timestamp: {epoch.isoformat()}')
break break
latest = round(avg_tec, 1) latest = round(avg_tec, 1)
publish('vtec', latest) publish('vtec', latest)