Tweak weather merge for buoy data

mpiannucci · Aug 23, 2021 · 3990f9f · 3990f9f
1 parent d84edbe
commit 3990f9f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/setup.py b/setup.py
@@ -1,7 +1,7 @@
 from setuptools import setup
 
 setup(name='surfpy',
-      version='0.97.2',
+      version='0.97.3',
       description='Wave and weather tools written in pure python',
       url='https://github.com/mpiannucci/surfpy',
       author='Matthew Iannucci',

diff --git a/surfpy/buoydata.py b/surfpy/buoydata.py
@@ -1,3 +1,4 @@
+from math import isnan
 from typing import List
 from . import units
 from .swell import Swell
@@ -133,11 +134,15 @@ def merge_wave_weather_data(wave_data: List[BuoyData], weather_data: List[BuoyDa
                 continue
 
             weather.change_units(units.Units.metric)
-            wave.air_temperature = weather.air_temperature
+            if weather.air_temperature is not None and not isnan(weather.air_temperature):
+                wave.air_temperature = weather.air_temperature
             wave.short_forecast = weather.short_forecast
-            wave.wind_speed = weather.wind_speed
-            wave.wind_direction = weather.wind_direction
-            wave.wind_compass_direction = weather.wind_compass_direction
+            if weather.wind_speed is not None and not isnan(weather.wind_speed):
+                wave.wind_speed = weather.wind_speed
+            if weather.wind_direction is not None and not isnan(weather.wind_direction):
+                wave.wind_direction = weather.wind_direction
+            if weather.wind_compass_direction is not None:
+                wave.wind_compass_direction = weather.wind_compass_direction
             last_weather_index = i
             break