X-Git-Url: https://wylark.com/src/infoex-autowx.git/blobdiff_plain/cfda323d245b20f761c821e22cb19edaf98974c0..1a565eb58a2617c918cfc4e5d96d0adaaa233788:/infoex-autowx.py?ds=inline

diff --git a/infoex-autowx.py b/infoex-autowx.py
index c2d20f7..7ecf36e 100755
--- a/infoex-autowx.py
+++ b/infoex-autowx.py
@@ -29,6 +29,7 @@ import logging
 import os
 import sys
 import time
+import urllib3
 import importlib.util
 
 from ftplib import FTP
@@ -42,11 +43,13 @@ import zeep
 import zeep.cache
 import zeep.transports
 
-__version__ = '3.1.0'
+__version__ = '3.1.1'
 
 LOG = logging.getLogger(__name__)
 LOG.setLevel(logging.NOTSET)
 
+urllib3.disable_warnings()
+
 def get_parser():
     """Return OptionParser for this program"""
     parser = ArgumentParser()
@@ -96,11 +99,7 @@ def setup_config(config):
             station['source'] = 'https://www.wcc.nrcs.usda.gov/awdbWebService/services?WSDL'
             station['station_id'] = config['station']['station_id']
             station['desired_data'] = config['station']['desired_data'].split(',')
-
-            # XXX: For NRCS, we're manually overriding units for now! Once
-            #      unit conversion is supported for NRCS, REMOVE THIS!
-            if 'units' not in station:
-                station['units'] = 'imperial'
+            station['units'] = config['station']['units']
 
         if station['provider'] == 'mesowest':
             station['source'] = 'https://api.synopticdata.com/v2/stations/timeseries'
@@ -201,15 +200,15 @@ def main():
     iemap = setup_infoex_counterparts_mapping(station['provider'])
 
     # override units if user selected metric
-    try:
-        if station['units'] == 'metric':
-            final_data = switch_units_to_metric(final_data, fmap)
-    except KeyError:
+    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':
+        final_data = switch_units_to_metric(final_data, fmap)
+
     (begin_date, end_date) = setup_time_values(station)
 
     if station['provider'] == 'python':
@@ -271,12 +270,17 @@ def main():
     final_data[fmap['Location UUID']] = infoex['location_uuid']
     final_data[fmap['obDate']] = final_end_date.strftime('%m/%d/%Y')
     final_data[fmap['obTime']] = final_end_date.strftime('%H:%M')
+    final_data[fmap['timeZone']] = station['tz'].zone
 
     for element_cd in infoex['wx_data']:
         if element_cd not in iemap:
             LOG.warning("BAD KEY wx_data['%s']", element_cd)
             continue
 
+        # do the conversion before the rounding
+        if station['provider'] == 'nrcs' and station['units'] == 'metric':
+            infoex['wx_data'][element_cd] = convert_nrcs_units_to_metric(element_cd, infoex['wx_data'][element_cd])
+
         # Massage precision of certain values to fit InfoEx's
         # expectations
         #
@@ -417,6 +421,7 @@ def setup_infoex_counterparts_mapping(provider):
 def get_nrcs_data(begin, end, station):
     """get the data we're after from the NRCS WSDL"""
     transport = zeep.transports.Transport(cache=zeep.cache.SqliteCache())
+    transport.session.verify = False
     client = zeep.Client(wsdl=station['source'], transport=transport)
     remote_data = {}
 
@@ -533,13 +538,29 @@ def switch_units_to_metric(data_map, mapping):
     #       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['hsUnit']] = 'm'
+    data_map[mapping['precipitationGaugeUnit']] = 'C'
+    data_map[mapping['hsUnit']] = 'cm'
     data_map[mapping['windSpeedUnit']] = 'm/s'
     data_map[mapping['windGustSpeedNumUnit']] = 'm/s'
+    data_map[mapping['dewPointUnit']] = 'C'
+    data_map[mapping['hn24AutoUnit']] = 'cm'
+    data_map[mapping['hstAutoUnit']] = 'cm'
 
     return data_map
 
+def convert_nrcs_units_to_metric(element_cd, value):
+    """convert NRCS values from English to metric"""
+    if element_cd == 'TOBS':
+        value = f_to_c(value)
+    elif element_cd == 'SNWD':
+        value = in_to_cm(value)
+    elif element_cd == 'PREC':
+        value = in_to_cm(value)
+    return value
+
 # CSV operations
 def write_local_csv(path_to_file, data):
     """Write the specified CSV file to disk"""
@@ -582,6 +603,14 @@ def setup_time_values(station):
     begin_date = end_date - datetime.timedelta(hours=3)
     return (begin_date, end_date)
 
+def f_to_c(f):
+    """convert Fahrenheit to Celsius"""
+    return (float(f) - 32) * 5.0/9.0
+
+def in_to_cm(inches):
+    """convert inches to centimetrs"""
+    return float(inches) * 2.54
+
 def ms_to_mph(ms):
     """convert meters per second to miles per hour"""
     return ms * 2.236936