Merge branch 'various-small-chores' into develop

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

diff --git a/infoex-autowx.py b/infoex-autowx.py
index 7ecf36eaab34e3b47fc95994489222525d32b5ac..1844d4574682202fa00307d06c13510aab1a6e2f 100755 (executable)
--- a/infoex-autowx.py
+++ b/infoex-autowx.py
@@ -43,7 +43,7 @@ import zeep
 import zeep.cache
 import zeep.transports
 
-__version__ = '3.1.1'
+__version__ = '3.2.1'
 
 LOG = logging.getLogger(__name__)
 LOG.setLevel(logging.NOTSET)
@@ -155,6 +155,10 @@ def setup_logging(log_level):
         #LOG.addHandler(logging.handlers.SysLogHandler())
         # fallback to stdout
         handler = logging.StreamHandler(sys.stdout)
+        formatter = logging.Formatter('%(asctime)s.%(msecs)03d '
+            '%(levelname)s %(module)s - %(funcName)s: %(message)s',
+            '%Y-%m-%d %H:%M:%S')
+        handler.setFormatter(formatter)
         LOG.addHandler(handler)
 
     # ugly, but passable
@@ -200,13 +204,7 @@ def main():
     iemap = setup_infoex_counterparts_mapping(station['provider'])
 
     # override units if user selected metric
-    if 'units' not in station:
-        if station['provider'] != 'python':
-            LOG.error("Please specify the units in the configuration "
-                      "file")
-            sys.exit(1)
-
-    if station['units'] == 'metric':
+    if station['provider'] != 'python' and station['units'] == 'metric':
         final_data = switch_units_to_metric(final_data, fmap)
 
     (begin_date, end_date) = setup_time_values(station)
@@ -296,6 +294,8 @@ def main():
             infoex['wx_data'][element_cd] = round(infoex['wx_data'][element_cd])
         elif element_cd in ['TOBS', 'air_temp', 'PRES', 'pressure']:
             infoex['wx_data'][element_cd] = round(infoex['wx_data'][element_cd], 1)
+        elif element_cd in ['PREC', 'precip_accum']:
+            infoex['wx_data'][element_cd] = round(infoex['wx_data'][element_cd], 2)
 
         # CONSIDER: Casting every value to Float() -- need to investigate if
         #           any possible elementCds we may want are any other data
@@ -468,7 +468,12 @@ def get_mesowest_data(begin, end, station):
 
     # construct final, completed API URL
     api_req_url = station['source'] + '&start=' + begin_date_str + '&end=' + end_date_str
-    req = requests.get(api_req_url)
+
+    try:
+        req = requests.get(api_req_url)
+    except requests.exceptions.ConnectionError:
+        LOG.error("Could not connect to '%s'", api_req_url)
+        sys.exit(1)
 
     try:
         json = req.json()
@@ -533,15 +538,10 @@ def switch_units_to_metric(data_map, mapping):
 
     # NOTE: to update this, use the fmap<->final_data mapping laid out
     #       in setup_infoex_fields_mapping ()
-    #
-    # NOTE: this only 'works' with MesoWest for now, as the MesoWest API
-    #       itself handles the unit conversion; in the future, we will also
-    #       support NRCS unit conversion, but this must be done by this
-    #       program.
     data_map[mapping['tempMaxHourUnit']] = 'C'
     data_map[mapping['tempMinHourUnit']] = 'C'
     data_map[mapping['tempPresUnit']] = 'C'
-    data_map[mapping['precipitationGaugeUnit']] = 'C'
+    data_map[mapping['precipitationGaugeUnit']] = 'mm'
     data_map[mapping['hsUnit']] = 'cm'
     data_map[mapping['windSpeedUnit']] = 'm/s'
     data_map[mapping['windGustSpeedNumUnit']] = 'm/s'
@@ -558,7 +558,7 @@ def convert_nrcs_units_to_metric(element_cd, value):
     elif element_cd == 'SNWD':
         value = in_to_cm(value)
     elif element_cd == 'PREC':
-        value = in_to_cm(value)
+        value = in_to_mm(value)
     return value
 
 # CSV operations
@@ -611,6 +611,10 @@ def in_to_cm(inches):
     """convert inches to centimetrs"""
     return float(inches) * 2.54
 
+def in_to_mm(inches):
+    """convert inches to millimeters"""
+    return (float(inches) * 2.54) * 10.0
+
 def ms_to_mph(ms):
     """convert meters per second to miles per hour"""
     return ms * 2.236936