Reverse American units -- precip values in metric, wind values in imperial/English

diff --git a/README.md b/README.md
index 2a988b302e03ad5c392c02688e718d256a70a3c0..93fdea25ee88635a7d88c3913ac8e4196d9694d4 100644 (file)
--- a/README.md
+++ b/README.md
@@ -82,7 +82,7 @@ options.
 `token = # MesoWest API token -- only applies when type is mesowest #`  
 `station_id = # the NRCS/MesoWest identifier for a particular station #`  
 `desired_data = # a comma-delimited list of fields you're interested in #`  
-`units = # either english, metric, or "American" #`  
+`units = # either english, metric, or american #`  
 `tz = # any entry from the Olson tz database e.g. America/Denver #`  
 `path = # the filesystem path to the Python program -- only applies when type is python #`  
 `wind_mode = # normal or average -- only applies when type is mesowest #`  

diff --git a/infoex-autowx.py b/infoex-autowx.py
index cce18a20792411381e3e59979753c24426c31c93..3598b1701f61dbc7259011a70062f13b3da64b32 100755 (executable)
--- a/infoex-autowx.py
+++ b/infoex-autowx.py
@@ -105,7 +105,7 @@ def setup_config(config):
             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
@@ -762,26 +762,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 +801,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))
+    # # snow values
+    # if element_cd in ['SNWD', 'snow_depth']:
+    #     value = cm_to_in(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 +886,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