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 4b58427eb8555f77d5e871a1ebf9edc0be895b7e..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 "
                     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")
                 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 "
             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() -
             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
         # 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])
         # 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
             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))
 
 
     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'])
         if not write_local_csv(infoex['csv_filename'], final_data):
             LOG.warning('Could not write local CSV file: %s',
                         infoex['csv_filename'])