If windGustDir is missing, substitute windDir.

weewx · Feb 13, 2022 · 9dc4da8 · 9dc4da8
1 parent 279bb45
commit 9dc4da8
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/bin/weewx/wxxtypes.py b/bin/weewx/wxxtypes.py
@@ -98,11 +98,18 @@ def calc_windDir(self, key, data, db_manager):
         return ValueTuple(val, 'degree_compass', 'group_direction')
 
     def calc_windGustDir(self, key, data, db_manager):
-        # Return the current gust direction if windGust is non-zero, otherwise, None
-        if 'windGust' not in data or 'windGustDir' not in data:
+        """If windGustDir is missing, substitute windDir.
+        Set windGustDir to None if windGust is zero."""
+        if 'windGust' not in data:
             raise weewx.CannotCalculate
         if self.force_null and data['windGust'] == 0:
+            # windGust is zero. Force windGustDir to None
             val = None
+        elif 'windGustDir' not in data:
+            # windGustDir is missing. If available, substitute windDir.
+            if 'windDir' not in data:
+                raise weewx.CannotCalculate
+            val = data['windDir']
         else:
             val = data['windGustDir']
         return ValueTuple(val, 'degree_compass', 'group_direction')

diff --git a/docs/changes.txt b/docs/changes.txt
@@ -9,6 +9,8 @@ Fixed spelling mistakes in the Norwegian translations.  Thanks to Aslak! PR#746
 Supply a sensible default context for group_deltatime when no context has been
 specified.
 
+If windGustDir is missing, substitute windDir.
+
 
 4.6.2 02/10/2022
 Removed diagnostic code that was inadverently left in the titlebar.inc file