Merge branch 'release-3.2.0'

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

diff --git a/infoex-autowx.py b/infoex-autowx.py
index e03a2b01e0bbbc589ae740a5950f88c36d33d080..6594cc693612b24d14af1edb07d68200b35b7b59 100755 (executable)
--- a/infoex-autowx.py
+++ b/infoex-autowx.py
@@ -43,7 +43,7 @@ import zeep
 import zeep.cache
 import zeep.transports
 
 import zeep.cache
 import zeep.transports
 

-__version__ = '3.1.1'
+__version__ = '3.2.0'

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


@@ -536,7 +536,7 @@ def switch_units_to_metric(data_map, mapping):
     data_map[mapping['tempMaxHourUnit']] = 'C'
     data_map[mapping['tempMinHourUnit']] = 'C'
     data_map[mapping['tempPresUnit']] = 'C'
     data_map[mapping['tempMaxHourUnit']] = 'C'
     data_map[mapping['tempMinHourUnit']] = 'C'
     data_map[mapping['tempPresUnit']] = 'C'

-    data_map[mapping['precipitationGaugeUnit']] = 'C'
+    data_map[mapping['precipitationGaugeUnit']] = 'mm'

     data_map[mapping['hsUnit']] = 'cm'
     data_map[mapping['windSpeedUnit']] = 'm/s'
     data_map[mapping['windGustSpeedNumUnit']] = 'm/s'
     data_map[mapping['hsUnit']] = 'cm'
     data_map[mapping['windSpeedUnit']] = 'm/s'
     data_map[mapping['windGustSpeedNumUnit']] = 'm/s'


@@ -553,7 +553,7 @@ def convert_nrcs_units_to_metric(element_cd, value):
     elif element_cd == 'SNWD':
         value = in_to_cm(value)
     elif element_cd == 'PREC':
     elif element_cd == 'SNWD':
         value = in_to_cm(value)
     elif element_cd == 'PREC':

-        value = in_to_cm(value)
+        value = in_to_mm(value)

     return value
 
 # CSV operations
     return value
 
 # CSV operations


@@ -606,6 +606,10 @@ def in_to_cm(inches):
     """convert inches to centimetrs"""
     return float(inches) * 2.54
 
     """convert inches to centimetrs"""
     return float(inches) * 2.54
 

+def in_to_mm(inches):
+    """convert inches to millimeters"""
+    return (float(inches) * 2.54) * 10.0
+

 def ms_to_mph(ms):
     """convert meters per second to miles per hour"""
     return ms * 2.236936
 def ms_to_mph(ms):
     """convert meters per second to miles per hour"""
     return ms * 2.236936