X-Git-Url: https://wylark.com/src/infoex-autowx.git/blobdiff_plain/7cb9041ee4a941cd12e5abe51b7dca5dd2033013..985c75f90b24927c28fecf30d00ebe0bfc727eb6:/infoex-autowx.py?ds=inline

diff --git a/infoex-autowx.py b/infoex-autowx.py
index cce18a2..5bb79f9 100755
--- a/infoex-autowx.py
+++ b/infoex-autowx.py
@@ -43,7 +43,7 @@ import zeep
 import zeep.cache
 import zeep.transports
 
-__version__ = '3.4.0'
+__version__ = '3.4.2'
 
 LOG = logging.getLogger(__name__)
 LOG.setLevel(logging.NOTSET)
@@ -101,11 +101,11 @@ def setup_config(config):
         # NOTE: custom providers don't require units to be specified
         #       because they can do whatever they please with the units
         #       within their own program
-        if station['provider'] != "custom":
+        if station['provider'] != "python":
             station['units'] = config['station']['units']
 
             if station['units'] not in ['metric', 'english', 'american']:
-                print("Please specify either metric, english, or american for the units.")
+                print("Please specify metric, english, or american for the units.")
                 sys.exit(1)
             else:
                 # if units are specified as "American" then we simply
@@ -117,7 +117,9 @@ def setup_config(config):
 
         # massage provider config items
         if station['provider'] == 'nrcs':
-            station['source'] = 'https://www.wcc.nrcs.usda.gov/awdbWebService/services?WSDL'
+            #station['source'] = 'https://www.wcc.nrcs.usda.gov/awdbWebService/services?WSDL'
+            station['source'] = 'https://wcc.sc.egov.usda.gov/awdbWebService/services?WSDL'
+
             station['station_id'] = config['station']['station_id']
             station['desired_data'] = config['station']['desired_data'].split(',')
 
@@ -342,7 +344,7 @@ def main():
         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])
 
-        if station['provider'] != 'custom' and station['units'] == 'american':
+        if station['provider'] != 'python' and station['units'] == 'american':
             infoex['wx_data'][element_cd] = convert_units_to_american(element_cd, infoex['wx_data'][element_cd])
 
         # Massage precision of certain values to fit InfoEx's
@@ -478,10 +480,13 @@ def setup_infoex_counterparts_mapping(provider):
     elif provider == 'python':
         # we expect Python programs to use the InfoEx data type names
         iemap['precipitationGauge'] = 'precipitationGauge'
+        iemap['precipitationGaugeUnit'] = 'precipitationGaugeUnit'
         iemap['tempPres'] = 'tempPres'
+        iemap['tempPresUnit'] = 'tempPresUnit'
         iemap['tempMaxHour'] = 'tempMaxHour'
         iemap['tempMinHour'] = 'tempMinHour'
         iemap['hS'] = 'hS'
+        iemap['hsUnit'] = 'hsUnit'
         iemap['baro'] = 'baro'
         iemap['rH'] = 'rH'
         iemap['windSpeedNum'] = 'windSpeedNum'
@@ -762,26 +767,26 @@ def switch_units_to_american(data_map, mapping):
     """
     replace units with the American mixture of metric and imperial
 
-    Precip values = imperial
-    Wind values = metric
+    Precip values = metric
+    Wind values = imperial
     """
 
     # precip values
-    data_map[mapping['tempMaxHourUnit']] = 'F'
-    data_map[mapping['tempMinHourUnit']] = 'F'
-    data_map[mapping['tempPresUnit']] = 'F'
-    data_map[mapping['dewPointUnit']] = 'F'
+    data_map[mapping['tempMaxHourUnit']] = 'C'
+    data_map[mapping['tempMinHourUnit']] = 'C'
+    data_map[mapping['tempPresUnit']] = 'C'
+    data_map[mapping['dewPointUnit']] = 'C'
 
-    data_map[mapping['precipitationGaugeUnit']] = 'in'
-    data_map[mapping['hsUnit']] = 'in'
-    data_map[mapping['hn24AutoUnit']] = 'in'
-    data_map[mapping['hstAutoUnit']] = 'in'
+    data_map[mapping['precipitationGaugeUnit']] = 'cm'
+    data_map[mapping['hsUnit']] = 'cm'
+    data_map[mapping['hn24AutoUnit']] = 'cm'
+    data_map[mapping['hstAutoUnit']] = 'cm'
 
     data_map[mapping['baroUnit']] = 'inHg'
 
     # wind values
-    data_map[mapping['windSpeedUnit']] = 'm/s'
-    data_map[mapping['windGustSpeedNumUnit']] = 'm/s'
+    data_map[mapping['windSpeedUnit']] = 'mph'
+    data_map[mapping['windGustSpeedNumUnit']] = 'mph'
 
     return data_map
 
@@ -801,29 +806,26 @@ def convert_units_to_american(element_cd, value):
 
     The original unit is always metric.
 
-    Precip values = imperial
-    Wind values = metric
+    Precip values = metric
+    Wind values = imperial
     """
 
-    # temp values
-    if element_cd in ['TMAX', 'TMIN', 'TOBS', 'air_temp', 'air_temp_high_24_hour', 'air_temp_low_24_hour']:
-        value = c_to_f(value)
+    # no need to convert precip values, as they will arrive in metric
+    # units in "American" units mode
+    # # temp values
+    # if element_cd in ['TMAX', 'TMIN', 'TOBS', 'air_temp', 'air_temp_high_24_hour', 'air_temp_low_24_hour']:
+    #     value = c_to_f(value)
 
-    # snow values
-    if element_cd in ['SNWD', 'snow_depth']:
-        value = cm_to_in(mm_to_cm(value))
+    # mesowest provides HS in mm, not cm; we want cm
+    if element_cd == 'snow_depth':
+        value = mm_to_cm(value)
 
-    # likewise for baro values
+    # baro values also arrive in metric, so convert to imperial
     if element_cd in ['PRES', 'pressure']:
-        value = pascal_to_inhg(value)
+        value = inhg_to_pascal(value)
 
-    # no need to convert wind values, as they will arrive in metric
-    # units in "American" units mode
-    # [
-    # 'WSPD',
-    # 'wind_speed', 'wind_gust'
-    # ]
-    # in_to_mm(value)
+    if element_cd in ['WSPD', 'wind_speed', 'wind_gust']:
+        value = ms_to_mph(value)
 
     return value
 
@@ -889,6 +891,10 @@ def pascal_to_inhg(pa):
     """convert pascals to inches of mercury"""
     return float(pa) * 0.00029530
 
+def inhg_to_pascal(inhg):
+    """convert inches of mercury to pascals"""
+    return float(inhg) / 0.00029530
+
 def in_to_mm(inches):
     """convert inches to millimeters"""
     return (float(inches) * 2.54) * 10.0