Fix another issue with MesoWest wind units

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

diff --git a/infoex-autowx.py b/infoex-autowx.py
index cac8c3ee6c1425a6f8ecb5aa0f46947b539252d3..1d84ab8c0c8219916f0061e475c1928591db3e5a 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)


@@ -480,9 +480,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:


@@ -545,5 +547,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())