From 3ac2d05ca878f346f89043ddcc0c430d70d2ae4b Mon Sep 17 00:00:00 2001 From: Alexander Vasarab Date: Wed, 6 Jan 2021 19:22:59 -0800 Subject: [PATCH] Use UTC time when asking MesoWest for data --- infoex-autowx.py | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/infoex-autowx.py b/infoex-autowx.py index 1d84ab8..439ff19 100755 --- a/infoex-autowx.py +++ b/infoex-autowx.py @@ -196,7 +196,7 @@ def main(): "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") @@ -404,6 +404,10 @@ def get_nrcs_data(begin, end, station): 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() @@ -412,8 +416,8 @@ def get_nrcs_data(begin, end, station): 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) @@ -533,10 +537,17 @@ def upload_csv(path_to_file, infoex_data): os.remove(path_to_file) # other miscellaneous routines -def setup_time_values(): +def setup_time_values(provider): """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 - 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) -- 2.30.2