Merge branch 'wind-and-baro-fixes' into develop

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

diff --git a/infoex-autowx.py b/infoex-autowx.py
index 3fe07fcbc0754948f02ff22e45d009e588bb3290..cac8c3ee6c1425a6f8ecb5aa0f46947b539252d3 100755 (executable)
--- a/infoex-autowx.py
+++ b/infoex-autowx.py
@@ -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'])
@@ -474,9 +475,14 @@ def get_mesowest_data(begin, end, station):
 
         # we may not have the data at all
         key_name = element_cd + '_set_1'
+
         if key_name in observations:
             if observations[key_name][pos]:
                 remote_data[element_cd] = observations[key_name][pos]
+
+                # mesowest provides wind_speed in m/s, we want mph
+                if element_cd in ('wind_speed', 'wind_gust'):
+                    remote_data[element_cd] = ms_to_mph(remote_data[element_cd])
             else:
                 remote_data[element_cd] = None
         else:
@@ -535,5 +541,9 @@ def setup_time_values():
     begin_date = end_date - datetime.timedelta(hours=3)
     return (begin_date, end_date)
 
+def ms_to_mph(ms):
+    """convert meters per second to miles per hour"""
+    return ms * 2.236936
+
 if __name__ == "__main__":
     sys.exit(main())