X-Git-Url: https://wylark.com/src/infoex-autowx.git/blobdiff_plain/d0f0a9f2b3f26fce76dedc4e6a510e17f65df24c..HEAD:/infoex-autowx.py?ds=sidebyside

diff --git a/infoex-autowx.py b/infoex-autowx.py
index 3d3da27..9df112c 100755
--- a/infoex-autowx.py
+++ b/infoex-autowx.py
@@ -27,6 +27,7 @@ import csv
 import datetime
 import logging
 import os
+import socket
 import sys
 import time
 import urllib3
@@ -43,7 +44,7 @@ import zeep
 import zeep.cache
 import zeep.transports
 
-__version__ = '3.4.1'
+__version__ = '3.4.5'
 
 LOG = logging.getLogger(__name__)
 LOG.setLevel(logging.NOTSET)
@@ -101,7 +102,7 @@ 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']:
@@ -117,7 +118,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 +345,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
@@ -382,7 +385,10 @@ def main():
             return 1
 
         if not options.dry_run:
-            upload_csv(infoex['csv_filename'], infoex)
+            try:
+                upload_csv(infoex['csv_filename'], infoex)
+            except socket.timeout:
+                LOG.critical("FTP timed out")
 
     LOG.debug('DONE')
     return 0
@@ -478,15 +484,24 @@ 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['tempMaxHourUnit'] = 'tempMaxHourUnit'
         iemap['tempMinHour'] = 'tempMinHour'
+        iemap['tempMinHourUnit'] = 'tempMinHourUnit'
         iemap['hS'] = 'hS'
+        iemap['hsUnit'] = 'hsUnit'
         iemap['baro'] = 'baro'
         iemap['rH'] = 'rH'
         iemap['windSpeedNum'] = 'windSpeedNum'
+        iemap['windSpeedUnit'] = 'windSpeedUnit'
         iemap['windDirectionNum'] = 'windDirectionNum'
         iemap['windGustSpeedNum'] = 'windGustSpeedNum'
+        iemap['dewPointUnit'] = 'dewPointUnit'
+        iemap['hn24AutoUnit'] = 'hn24AutoUnit'
+        iemap['hstAutoUnit'] = 'hstAutoUnit'
 
     return iemap
 
@@ -811,9 +826,9 @@ def convert_units_to_american(element_cd, value):
     # 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)
 
     # baro values also arrive in metric, so convert to imperial
     if element_cd in ['PRES', 'pressure']:
@@ -841,7 +856,7 @@ def upload_csv(path_to_file, infoex_data):
     with open(path_to_file, 'rb') as file_object:
         LOG.debug("uploading FTP file '%s'", infoex_data['host'])
         ftp = FTP(infoex_data['host'], infoex_data['uuid'],
-                  infoex_data['api_key'])
+                  infoex_data['api_key'], timeout=10)
         ftp.storlines('STOR ' + path_to_file, file_object)
         ftp.close()
         file_object.close()