Round RH to zero decimal places

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

diff --git a/infoex-autowx.py b/infoex-autowx.py
index 15adf0832a24cd757fd5b989edc729020ee8eee8..b979287e1a38b12d6796a3b590098ee894ba44c8 100755 (executable)
--- a/infoex-autowx.py
+++ b/infoex-autowx.py
@@ -41,7 +41,7 @@ import zeep
 import zeep.cache
 import zeep.transports
 
 import zeep.cache
 import zeep.transports
 

-__version__ = '3.0.2'
+__version__ = '3.1.0'

 
 LOG = logging.getLogger(__name__)
 LOG.setLevel(logging.NOTSET)
 
 LOG = logging.getLogger(__name__)
 LOG.setLevel(logging.NOTSET)


@@ -281,16 +281,17 @@ def main():
         # Massage precision of certain values to fit InfoEx's
         # expectations
         #
         # Massage precision of certain values to fit InfoEx's
         # expectations
         #

-        # 0 decimal places: wind speed, wind direction, wind gust, snow depth
-        # 1 decimal place:  air temp, relative humidity, baro
+        # 0 decimal places: relative humidity, wind speed, wind
+        #                   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',
         # 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']:
+                            'RHUM', 'relative_humidity', 'WDIR',
+                            'wind_gust', 'SNWD', 'snow_depth']:

             infoex['wx_data'][element_cd] = round(infoex['wx_data'][element_cd])
             infoex['wx_data'][element_cd] = round(infoex['wx_data'][element_cd])

-        elif element_cd in ['TOBS', 'air_temp', 'RHUM',
-                            'relative_humidity', 'PRES', 'pressure']:
+        elif element_cd in ['TOBS', 'air_temp', '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


@@ -473,6 +474,9 @@ def get_mesowest_data(begin, end, station):
 
     try:
         observations = json['STATION'][0]['OBSERVATIONS']
 
     try:
         observations = json['STATION'][0]['OBSERVATIONS']

+    except KeyError:
+        LOG.error("Unexpected JSON in MesoWest response")
+        sys.exit(1)

     except ValueError:
         LOG.error("Bad JSON in MesoWest response")
         sys.exit(1)
     except ValueError:
         LOG.error("Bad JSON in MesoWest response")
         sys.exit(1)