Merge branch 'more-general-fixes' into develop

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

diff --git a/infoex-autowx.py b/infoex-autowx.py
index cac8c3ee6c1425a6f8ecb5aa0f46947b539252d3..439ff19d0dd05fc4777d8c5ab2e4aab6698e8609 100755 (executable)
--- a/infoex-autowx.py
+++ b/infoex-autowx.py
@@ -39,7 +39,7 @@ import zeep
 import zeep.cache
 import zeep.transports
 
 import zeep.cache
 import zeep.transports
 

-__version__ = '3.0.0'
+__version__ = '3.0.1'

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


@@ -196,7 +196,7 @@ def main():
                       "file")
             sys.exit(1)
 
                       "file")
             sys.exit(1)
 

-    (begin_date, end_date) = setup_time_values()
+    (begin_date, end_date) = setup_time_values(station['provider'])

 
     if station['provider'] == 'python':
         LOG.debug("Getting custom data from external Python program")
 
     if station['provider'] == 'python':
         LOG.debug("Getting custom data from external Python program")


@@ -404,6 +404,10 @@ def get_nrcs_data(begin, end, station):
     client = zeep.Client(wsdl=station['source'], transport=transport)
     remote_data = {}
 
     client = zeep.Client(wsdl=station['source'], transport=transport)
     remote_data = {}
 

+    # massage begin/end date format
+    begin_date_str = begin.strftime('%Y-%m-%d %H:%M:00')
+    end_date_str = end.strftime('%Y-%m-%d %H:%M:00')
+

     for element_cd in station['desired_data']:
         time_element = time.time()
 
     for element_cd in station['desired_data']:
         time_element = time.time()
 


@@ -412,8 +416,8 @@ def get_nrcs_data(begin, end, station):
             stationTriplets=[station['station_id']],
             elementCd=element_cd,
             ordinal=1,
             stationTriplets=[station['station_id']],
             elementCd=element_cd,
             ordinal=1,

-            beginDate=begin,
-            endDate=end)
+            beginDate=begin_date_str,
+            endDate=end_date_str)

 
         LOG.info("Time to get NRCS elementCd '%s': %.3f sec", element_cd,
                  time.time() - time_element)
 
         LOG.info("Time to get NRCS elementCd '%s': %.3f sec", element_cd,
                  time.time() - time_element)


@@ -480,9 +484,11 @@ def get_mesowest_data(begin, end, station):
             if observations[key_name][pos]:
                 remote_data[element_cd] = observations[key_name][pos]
 
             if observations[key_name][pos]:
                 remote_data[element_cd] = observations[key_name][pos]
 

-                # mesowest provides wind_speed in m/s, we want mph
+                # mesowest by default provides wind_speed in m/s, but
+                # we specify 'english' units in the request; either way,
+                # we want mph

                 if element_cd in ('wind_speed', 'wind_gust'):
                 if element_cd in ('wind_speed', 'wind_gust'):

-                    remote_data[element_cd] = ms_to_mph(remote_data[element_cd])
+                    remote_data[element_cd] = kn_to_mph(remote_data[element_cd])

             else:
                 remote_data[element_cd] = None
         else:
             else:
                 remote_data[element_cd] = None
         else:


@@ -531,10 +537,17 @@ def upload_csv(path_to_file, infoex_data):
     os.remove(path_to_file)
 
 # other miscellaneous routines
     os.remove(path_to_file)
 
 # other miscellaneous routines

-def setup_time_values():
+def setup_time_values(provider):

     """establish time bounds of data request(s)"""
     """establish time bounds of data request(s)"""

+
+    # default timezone to UTC (for MesoWest)
+    tz = datetime.timezone.utc
+
+    if provider == 'nrcs':
+        tz = None
+

     # floor time to nearest hour
     # floor time to nearest hour

-    date_time = datetime.datetime.now()
+    date_time = datetime.datetime.now(tz=tz)

     end_date = date_time - datetime.timedelta(minutes=date_time.minute % 60,
                                               seconds=date_time.second,
                                               microseconds=date_time.microsecond)
     end_date = date_time - datetime.timedelta(minutes=date_time.minute % 60,
                                               seconds=date_time.second,
                                               microseconds=date_time.microsecond)


@@ -545,5 +558,9 @@ def ms_to_mph(ms):
     """convert meters per second to miles per hour"""
     return ms * 2.236936
 
     """convert meters per second to miles per hour"""
     return ms * 2.236936
 

+def kn_to_mph(kn):
+    """convert knots to miles per hour"""
+    return kn * 1.150779
+

 if __name__ == "__main__":
     sys.exit(main())
 if __name__ == "__main__":
     sys.exit(main())