import datetime
import logging
import os
+import socket
import sys
import time
import urllib3
import zeep.cache
import zeep.transports
-__version__ = '3.4.0'
+__version__ = '3.4.5'
LOG = logging.getLogger(__name__)
LOG.setLevel(logging.NOTSET)
# 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
# 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(',')
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
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
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
"""
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
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
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()
"""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
wylark / infoex-autowx.git / blobdiff