X-Git-Url: https://wylark.com/src/infoex-autowx.git/blobdiff_plain/76933d07912ab0d624a7bd4c16a54e40ae520f19..045b69f96c4a18fb1dbb81f754e51d5fdf1629cc:/infoex-autowx.py?ds=inline diff --git a/infoex-autowx.py b/infoex-autowx.py index aeac27c..1d84ab8 100755 --- a/infoex-autowx.py +++ b/infoex-autowx.py @@ -39,7 +39,7 @@ import zeep import zeep.cache import zeep.transports -__version__ = '3.0.0' +__version__ = '3.0.1' LOG = logging.getLogger(__name__) LOG.setLevel(logging.NOTSET) @@ -266,14 +266,15 @@ def main(): # expectations # # 0 decimal places: wind speed, wind direction, wind gust, snow depth - # 1 decimal place: air temp, baro + # 1 decimal place: air temp, relative humidity, baro # Avoid transforming None values if infoex['wx_data'][element_cd] is None: continue elif element_cd in ['wind_speed', 'WSPD', 'wind_direction', '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']: + elif element_cd in ['TOBS', 'air_temp', 'RHUM', + 'relative_humidity', 'PRES', 'pressure']: infoex['wx_data'][element_cd] = round(infoex['wx_data'][element_cd], 1) # CONSIDER: Casting every value to Float() -- need to investigate if @@ -479,9 +480,11 @@ def get_mesowest_data(begin, end, station): if observations[key_name][pos]: remote_data[element_cd] = observations[key_name][pos] - # mesowest provides wind_speed in m/s, we want mph + # mesowest by default provides wind_speed in m/s, but + # we specify 'english' units in the request; either way, + # we want mph if element_cd in ('wind_speed', 'wind_gust'): - remote_data[element_cd] = ms_to_mph(remote_data[element_cd]) + remote_data[element_cd] = kn_to_mph(remote_data[element_cd]) else: remote_data[element_cd] = None else: @@ -544,5 +547,9 @@ def ms_to_mph(ms): """convert meters per second to miles per hour""" return ms * 2.236936 +def kn_to_mph(kn): + """convert knots to miles per hour""" + return kn * 1.150779 + if __name__ == "__main__": sys.exit(main())