Fix another issue with MesoWest wind units

[infoex-autowx.git] / infoex-autowx.py

diff --git a/infoex-autowx.py b/infoex-autowx.py
index be66aa405e27d13e4cfd2e89f26d52df5d979063..1d84ab8c0c8219916f0061e475c1928591db3e5a 100755 (executable)
--- 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)
@@ -230,7 +230,7 @@ def main():
                     infoex['wx_data'] = []
             except Exception as exc:
                 LOG.error("Python program for custom Wx data failed in "
-                          "execution: " + str(exc))
+                          "execution: %s", str(exc))
                 sys.exit(1)
 
             LOG.info("Successfully executed external Python program")
@@ -243,7 +243,7 @@ def main():
             sys.exit(1)
         except Exception as exc:
             LOG.error("A problem was encountered when attempting to "
-                      "load your custom Wx program: " + str(exc))
+                      "load your custom Wx program: %s", str(exc))
             sys.exit(1)
 
     LOG.info("Time taken to get all data : %.3f sec", time.time() -
@@ -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
@@ -289,7 +290,7 @@ def main():
 
     LOG.debug("final_data: %s", str(final_data))
 
-    if len(infoex['wx_data']) > 0:
+    if infoex['wx_data']:
         if not write_local_csv(infoex['csv_filename'], final_data):
             LOG.warning('Could not write local CSV file: %s',
                         infoex['csv_filename'])
@@ -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
-                if 'wind_speed' == element_cd:
-                    remote_data[element_cd] = ms_to_mph(remote_data[element_cd])
+                # 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] = 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())