X-Git-Url: https://wylark.com/src/infoex-autowx.git/blobdiff_plain/63610f54bdd9528db44d38dd3564724e8c72c063..855f04140e7f7b74406661274642fc51809b23fc:/infoex-autowx.py diff --git a/infoex-autowx.py b/infoex-autowx.py index 1844d45..25ef415 100755 --- a/infoex-autowx.py +++ b/infoex-autowx.py @@ -43,7 +43,7 @@ import zeep import zeep.cache import zeep.transports -__version__ = '3.2.1' +__version__ = '3.2.2' LOG = logging.getLogger(__name__) LOG.setLevel(logging.NOTSET) @@ -275,6 +275,9 @@ def main(): LOG.warning("BAD KEY wx_data['%s']", element_cd) continue + if infoex['wx_data'][element_cd] is None: + continue + # do the conversion before the rounding if station['provider'] == 'nrcs' and station['units'] == 'metric': infoex['wx_data'][element_cd] = convert_nrcs_units_to_metric(element_cd, infoex['wx_data'][element_cd]) @@ -286,11 +289,9 @@ def main(): # direction, wind gust, snow depth # 1 decimal place: air temp, baro # Avoid transforming None values - if infoex['wx_data'][element_cd] is None: - continue - elif element_cd in ['wind_speed', 'WSPD', 'wind_direction', - 'RHUM', 'relative_humidity', 'WDIR', - 'wind_gust', 'SNWD', 'snow_depth']: + if element_cd in ['wind_speed', 'WSPD', 'wind_direction', + 'RHUM', 'relative_humidity', 'WDIR', + 'wind_gust', 'SNWD', 'snow_depth']: infoex['wx_data'][element_cd] = round(infoex['wx_data'][element_cd]) elif element_cd in ['TOBS', 'air_temp', 'PRES', 'pressure']: infoex['wx_data'][element_cd] = round(infoex['wx_data'][element_cd], 1)