From 4508e341c9ec35f14dab387f6856220f50ca29ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= Date: Tue, 29 Aug 2023 21:14:37 +0200 Subject: [PATCH] Add wind gust to AEMET hourly forecasts (#99289) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Álvaro Fernández Rojas --- homeassistant/components/aemet/const.py | 1 + homeassistant/components/aemet/weather.py | 3 + .../aemet/weather_update_coordinator.py | 2 + .../aemet/fixtures/station-3195-data.json | 115 ++++++++++++---- .../aemet/fixtures/station-list-data.json | 15 +- .../aemet/snapshots/test_weather.ambr | 129 ++++++++++++++++++ 6 files changed, 239 insertions(+), 26 deletions(-) diff --git a/homeassistant/components/aemet/const.py b/homeassistant/components/aemet/const.py index bd10d09bea0..c6c4a9c1628 100644 --- a/homeassistant/components/aemet/const.py +++ b/homeassistant/components/aemet/const.py @@ -33,6 +33,7 @@ ATTR_API_FORECAST_TEMP = "temperature" ATTR_API_FORECAST_TEMP_LOW = "templow" ATTR_API_FORECAST_TIME = "datetime" ATTR_API_FORECAST_WIND_BEARING = "wind_bearing" +ATTR_API_FORECAST_WIND_MAX_SPEED = "wind_max_speed" ATTR_API_FORECAST_WIND_SPEED = "wind_speed" ATTR_API_HUMIDITY = "humidity" ATTR_API_PRESSURE = "pressure" diff --git a/homeassistant/components/aemet/weather.py b/homeassistant/components/aemet/weather.py index 60289f4723a..e3a1922c2f1 100644 --- a/homeassistant/components/aemet/weather.py +++ b/homeassistant/components/aemet/weather.py @@ -6,6 +6,7 @@ from homeassistant.components.weather import ( ATTR_FORECAST_NATIVE_PRECIPITATION, ATTR_FORECAST_NATIVE_TEMP, ATTR_FORECAST_NATIVE_TEMP_LOW, + ATTR_FORECAST_NATIVE_WIND_GUST_SPEED, ATTR_FORECAST_NATIVE_WIND_SPEED, ATTR_FORECAST_PRECIPITATION_PROBABILITY, ATTR_FORECAST_TIME, @@ -35,6 +36,7 @@ from .const import ( ATTR_API_FORECAST_TEMP_LOW, ATTR_API_FORECAST_TIME, ATTR_API_FORECAST_WIND_BEARING, + ATTR_API_FORECAST_WIND_MAX_SPEED, ATTR_API_FORECAST_WIND_SPEED, ATTR_API_HUMIDITY, ATTR_API_PRESSURE, @@ -69,6 +71,7 @@ FORECAST_MAP = { ATTR_API_FORECAST_TEMP: ATTR_FORECAST_NATIVE_TEMP, ATTR_API_FORECAST_TIME: ATTR_FORECAST_TIME, ATTR_API_FORECAST_WIND_BEARING: ATTR_FORECAST_WIND_BEARING, + ATTR_API_FORECAST_WIND_MAX_SPEED: ATTR_FORECAST_NATIVE_WIND_GUST_SPEED, ATTR_API_FORECAST_WIND_SPEED: ATTR_FORECAST_NATIVE_WIND_SPEED, }, } diff --git a/homeassistant/components/aemet/weather_update_coordinator.py b/homeassistant/components/aemet/weather_update_coordinator.py index 016dd2ba75c..c6e27374f8f 100644 --- a/homeassistant/components/aemet/weather_update_coordinator.py +++ b/homeassistant/components/aemet/weather_update_coordinator.py @@ -56,6 +56,7 @@ from .const import ( ATTR_API_FORECAST_TEMP_LOW, ATTR_API_FORECAST_TIME, ATTR_API_FORECAST_WIND_BEARING, + ATTR_API_FORECAST_WIND_MAX_SPEED, ATTR_API_FORECAST_WIND_SPEED, ATTR_API_HUMIDITY, ATTR_API_PRESSURE, @@ -333,6 +334,7 @@ class WeatherUpdateCoordinator(DataUpdateCoordinator): ), ATTR_API_FORECAST_TEMP: self._get_temperature(day, hour), ATTR_API_FORECAST_TIME: dt_util.as_utc(forecast_dt).isoformat(), + ATTR_API_FORECAST_WIND_MAX_SPEED: self._get_wind_max_speed(day, hour), ATTR_API_FORECAST_WIND_SPEED: self._get_wind_speed(day, hour), ATTR_API_FORECAST_WIND_BEARING: self._get_wind_bearing(day, hour), } diff --git a/tests/components/aemet/fixtures/station-3195-data.json b/tests/components/aemet/fixtures/station-3195-data.json index b050ee16d67..bbde98b1cb2 100644 --- a/tests/components/aemet/fixtures/station-3195-data.json +++ b/tests/components/aemet/fixtures/station-3195-data.json @@ -1,5 +1,6 @@ [ { + "dv": 100.0, "idema": "3195", "lon": -3.678095, "fint": "2021-01-08T14:00:00", @@ -14,9 +15,12 @@ "ta": 0.1, "tamax": 0.2, "tpr": -0.3, - "rviento": 132.0 + "rviento": 132.0, + "vv": 1.0, + "vmax": 10.0 }, { + "dv": 101.0, "idema": "3195", "lon": -3.678095, "fint": "2021-01-08T15:00:00", @@ -31,9 +35,12 @@ "ta": 0.2, "tamax": 0.3, "tpr": 0.0, - "rviento": 154.0 + "rviento": 154.0, + "vv": 1.1, + "vmax": 10.1 }, { + "dv": 102.0, "idema": "3195", "lon": -3.678095, "fint": "2021-01-08T16:00:00", @@ -48,9 +55,12 @@ "ta": 0.3, "tamax": 0.3, "tpr": 0.0, - "rviento": 177.0 + "rviento": 177.0, + "vv": 1.2, + "vmax": 10.2 }, { + "dv": 103.0, "idema": "3195", "lon": -3.678095, "fint": "2021-01-08T17:00:00", @@ -65,9 +75,12 @@ "ta": 0.1, "tamax": 0.3, "tpr": 0.0, - "rviento": 174.0 + "rviento": 174.0, + "vv": 1.3, + "vmax": 10.3 }, { + "dv": 104.0, "idema": "3195", "lon": -3.678095, "fint": "2021-01-08T18:00:00", @@ -82,9 +95,12 @@ "ta": -0.1, "tamax": 0.1, "tpr": -0.3, - "rviento": 163.0 + "rviento": 163.0, + "vv": 1.4, + "vmax": 10.4 }, { + "dv": 105.0, "idema": "3195", "lon": -3.678095, "fint": "2021-01-08T19:00:00", @@ -99,9 +115,12 @@ "ta": -0.3, "tamax": 0.0, "tpr": -0.5, - "rviento": 79.0 + "rviento": 79.0, + "vv": 1.5, + "vmax": 10.5 }, { + "dv": 106.0, "idema": "3195", "lon": -3.678095, "fint": "2021-01-08T20:00:00", @@ -116,9 +135,12 @@ "ta": -0.6, "tamax": -0.3, "tpr": -0.7, - "rviento": 0.0 + "rviento": 0.0, + "vv": 1.6, + "vmax": 10.6 }, { + "dv": 107.0, "idema": "3195", "lon": -3.678095, "fint": "2021-01-08T21:00:00", @@ -133,9 +155,12 @@ "ta": -0.7, "tamax": -0.5, "tpr": -0.7, - "rviento": 0.0 + "rviento": 0.0, + "vv": 1.7, + "vmax": 10.7 }, { + "dv": 108.0, "idema": "3195", "lon": -3.678095, "fint": "2021-01-08T22:00:00", @@ -150,9 +175,12 @@ "ta": -0.8, "tamax": -0.7, "tpr": -1.0, - "rviento": 0.0 + "rviento": 0.0, + "vv": 1.8, + "vmax": 10.8 }, { + "dv": 109.0, "idema": "3195", "lon": -3.678095, "fint": "2021-01-08T23:00:00", @@ -167,9 +195,12 @@ "ta": -0.9, "tamax": -0.7, "tpr": -1.0, - "rviento": 0.0 + "rviento": 0.0, + "vv": 1.9, + "vmax": 10.9 }, { + "dv": 110.0, "idema": "3195", "lon": -3.678095, "fint": "2021-01-09T00:00:00", @@ -184,9 +215,12 @@ "ta": -1.0, "tamax": -0.8, "tpr": -1.2, - "rviento": 0.0 + "rviento": 0.0, + "vv": 2.0, + "vmax": 11.0 }, { + "dv": 111.0, "idema": "3195", "lon": -3.678095, "fint": "2021-01-09T01:00:00", @@ -201,9 +235,12 @@ "ta": -1.3, "tamax": -1.0, "tpr": -1.4, - "rviento": 0.0 + "rviento": 0.0, + "vv": 2.1, + "vmax": 11.1 }, { + "dv": 112.0, "idema": "3195", "lon": -3.678095, "fint": "2021-01-09T02:00:00", @@ -218,9 +255,12 @@ "ta": -1.4, "tamax": -1.3, "tpr": -1.4, - "rviento": 0.0 + "rviento": 0.0, + "vv": 2.2, + "vmax": 11.2 }, { + "dv": 113.0, "idema": "3195", "lon": -3.678095, "fint": "2021-01-09T03:00:00", @@ -235,9 +275,12 @@ "ta": -1.4, "tamax": -1.4, "tpr": -1.4, - "rviento": 0.0 + "rviento": 0.0, + "vv": 2.3, + "vmax": 11.3 }, { + "dv": 114.0, "idema": "3195", "lon": -3.678095, "fint": "2021-01-09T04:00:00", @@ -252,9 +295,12 @@ "ta": -1.5, "tamax": -1.4, "tpr": -1.7, - "rviento": 0.0 + "rviento": 0.0, + "vv": 2.4, + "vmax": 11.4 }, { + "dv": 115.0, "idema": "3195", "lon": -3.678095, "fint": "2021-01-09T05:00:00", @@ -269,9 +315,12 @@ "ta": -1.5, "tamax": -1.4, "tpr": -1.7, - "rviento": 0.0 + "rviento": 0.0, + "vv": 2.5, + "vmax": 11.5 }, { + "dv": 116.0, "idema": "3195", "lon": -3.678095, "fint": "2021-01-09T06:00:00", @@ -286,9 +335,12 @@ "ta": -1.6, "tamax": -1.5, "tpr": -1.7, - "rviento": 0.0 + "rviento": 0.0, + "vv": 2.6, + "vmax": 11.6 }, { + "dv": 117.0, "idema": "3195", "lon": -3.678095, "fint": "2021-01-09T07:00:00", @@ -303,9 +355,12 @@ "ta": -1.6, "tamax": -1.6, "tpr": -1.7, - "rviento": 0.0 + "rviento": 0.0, + "vv": 2.7, + "vmax": 11.7 }, { + "dv": 118.0, "idema": "3195", "lon": -3.678095, "fint": "2021-01-09T08:00:00", @@ -320,9 +375,12 @@ "ta": -1.6, "tamax": -1.5, "tpr": -1.7, - "rviento": 0.0 + "rviento": 0.0, + "vv": 2.8, + "vmax": 11.8 }, { + "dv": 119.0, "idema": "3195", "lon": -3.678095, "fint": "2021-01-09T09:00:00", @@ -337,9 +395,12 @@ "ta": -1.3, "tamax": -1.3, "tpr": -1.4, - "rviento": 0.0 + "rviento": 0.0, + "vv": 2.9, + "vmax": 11.9 }, { + "dv": 120.0, "idema": "3195", "lon": -3.678095, "fint": "2021-01-09T10:00:00", @@ -354,9 +415,12 @@ "ta": -1.2, "tamax": -1.1, "tpr": -1.4, - "rviento": 0.0 + "rviento": 0.0, + "vv": 3.0, + "vmax": 12.0 }, { + "dv": 121.0, "idema": "3195", "lon": -3.678095, "fint": "2021-01-09T11:00:00", @@ -371,9 +435,12 @@ "ta": -1.0, "tamax": -1.0, "tpr": -1.2, - "rviento": 0.0 + "rviento": 0.0, + "vv": 3.1, + "vmax": 12.1 }, { + "dv": 122.0, "idema": "3195", "lon": -3.678095, "fint": "2021-01-09T12:00:00", @@ -388,6 +455,8 @@ "ta": -0.7, "tamax": -0.6, "tpr": -0.7, - "rviento": 0.0 + "rviento": 0.0, + "vv": 3.2, + "vmax": 12.2 } ] diff --git a/tests/components/aemet/fixtures/station-list-data.json b/tests/components/aemet/fixtures/station-list-data.json index 2507cca7328..d540b0fad1c 100644 --- a/tests/components/aemet/fixtures/station-list-data.json +++ b/tests/components/aemet/fixtures/station-list-data.json @@ -1,5 +1,6 @@ [ { + "dv": 90.0, "idema": "3194U", "lon": -3.724167, "fint": "2021-01-08T14:00:00", @@ -11,9 +12,12 @@ "tamin": 0.6, "ta": 0.9, "tamax": 1.0, - "tpr": 0.6 + "tpr": 0.6, + "vv": 2.0, + "vmax": 2.5 }, { + "dv": 120.0, "idema": "3194Y", "lon": -3.813369, "fint": "2021-01-08T14:00:00", @@ -24,9 +28,12 @@ "hr": 93.0, "tamin": 0.5, "ta": 0.6, - "tamax": 0.6 + "tamax": 0.6, + "vv": 3.0, + "vmax": 3.5 }, { + "dv": 100.0, "idema": "3195", "lon": -3.678095, "fint": "2021-01-08T14:00:00", @@ -41,6 +48,8 @@ "ta": 0.1, "tamax": 0.2, "tpr": -0.3, - "rviento": 132.0 + "rviento": 132.0, + "vv": 1.0, + "vmax": 10.0 } ] diff --git a/tests/components/aemet/snapshots/test_weather.ambr b/tests/components/aemet/snapshots/test_weather.ambr index e9c922f041e..3078cab4480 100644 --- a/tests/components/aemet/snapshots/test_weather.ambr +++ b/tests/components/aemet/snapshots/test_weather.ambr @@ -65,6 +65,7 @@ 'precipitation_probability': 100, 'temperature': 0.0, 'wind_bearing': 90.0, + 'wind_gust_speed': 24.0, 'wind_speed': 15.0, }), dict({ @@ -74,6 +75,7 @@ 'precipitation_probability': 100, 'temperature': 0.0, 'wind_bearing': 135.0, + 'wind_gust_speed': 22.0, 'wind_speed': 15.0, }), dict({ @@ -83,6 +85,7 @@ 'precipitation_probability': 100, 'temperature': 0.0, 'wind_bearing': 135.0, + 'wind_gust_speed': 24.0, 'wind_speed': 14.0, }), dict({ @@ -92,6 +95,7 @@ 'precipitation_probability': 100, 'temperature': 1.0, 'wind_bearing': 135.0, + 'wind_gust_speed': 20.0, 'wind_speed': 10.0, }), dict({ @@ -101,6 +105,7 @@ 'precipitation_probability': 100, 'temperature': 1.0, 'wind_bearing': 135.0, + 'wind_gust_speed': 14.0, 'wind_speed': 8.0, }), dict({ @@ -110,6 +115,7 @@ 'precipitation_probability': 100, 'temperature': 1.0, 'wind_bearing': 135.0, + 'wind_gust_speed': 13.0, 'wind_speed': 9.0, }), dict({ @@ -119,6 +125,7 @@ 'precipitation_probability': 100, 'temperature': 1.0, 'wind_bearing': 90.0, + 'wind_gust_speed': 13.0, 'wind_speed': 7.0, }), dict({ @@ -128,6 +135,7 @@ 'precipitation_probability': 100, 'temperature': 1.0, 'wind_bearing': 135.0, + 'wind_gust_speed': 12.0, 'wind_speed': 8.0, }), dict({ @@ -137,6 +145,7 @@ 'precipitation_probability': 100, 'temperature': 1.0, 'wind_bearing': 135.0, + 'wind_gust_speed': 12.0, 'wind_speed': 6.0, }), dict({ @@ -145,6 +154,7 @@ 'precipitation_probability': 100, 'temperature': 1.0, 'wind_bearing': 90.0, + 'wind_gust_speed': 8.0, 'wind_speed': 6.0, }), dict({ @@ -153,6 +163,7 @@ 'precipitation_probability': 100, 'temperature': 1.0, 'wind_bearing': 45.0, + 'wind_gust_speed': 9.0, 'wind_speed': 6.0, }), dict({ @@ -161,6 +172,7 @@ 'precipitation_probability': 100, 'temperature': 1.0, 'wind_bearing': 90.0, + 'wind_gust_speed': 11.0, 'wind_speed': 8.0, }), dict({ @@ -169,6 +181,7 @@ 'precipitation_probability': None, 'temperature': 1.0, 'wind_bearing': 45.0, + 'wind_gust_speed': 12.0, 'wind_speed': 6.0, }), dict({ @@ -177,6 +190,7 @@ 'precipitation_probability': 10, 'temperature': 0.0, 'wind_bearing': 45.0, + 'wind_gust_speed': 10.0, 'wind_speed': 5.0, }), dict({ @@ -185,6 +199,7 @@ 'precipitation_probability': 10, 'temperature': 0.0, 'wind_bearing': 0.0, + 'wind_gust_speed': 11.0, 'wind_speed': 6.0, }), dict({ @@ -193,6 +208,7 @@ 'precipitation_probability': 10, 'temperature': 0.0, 'wind_bearing': 0.0, + 'wind_gust_speed': 9.0, 'wind_speed': 6.0, }), dict({ @@ -201,6 +217,7 @@ 'precipitation_probability': 10, 'temperature': -1.0, 'wind_bearing': 45.0, + 'wind_gust_speed': 12.0, 'wind_speed': 8.0, }), dict({ @@ -209,6 +226,7 @@ 'precipitation_probability': 10, 'temperature': -1.0, 'wind_bearing': 0.0, + 'wind_gust_speed': 11.0, 'wind_speed': 5.0, }), dict({ @@ -217,6 +235,7 @@ 'precipitation_probability': 10, 'temperature': -1.0, 'wind_bearing': 0.0, + 'wind_gust_speed': 13.0, 'wind_speed': 9.0, }), dict({ @@ -225,6 +244,7 @@ 'precipitation_probability': 15, 'temperature': -2.0, 'wind_bearing': 45.0, + 'wind_gust_speed': 18.0, 'wind_speed': 13.0, }), dict({ @@ -233,6 +253,7 @@ 'precipitation_probability': 15, 'temperature': -1.0, 'wind_bearing': 45.0, + 'wind_gust_speed': 25.0, 'wind_speed': 17.0, }), dict({ @@ -241,6 +262,7 @@ 'precipitation_probability': 15, 'temperature': -1.0, 'wind_bearing': 45.0, + 'wind_gust_speed': 31.0, 'wind_speed': 21.0, }), dict({ @@ -249,6 +271,7 @@ 'precipitation_probability': 15, 'temperature': 0.0, 'wind_bearing': 45.0, + 'wind_gust_speed': 32.0, 'wind_speed': 21.0, }), dict({ @@ -257,6 +280,7 @@ 'precipitation_probability': 15, 'temperature': 2.0, 'wind_bearing': 45.0, + 'wind_gust_speed': 30.0, 'wind_speed': 21.0, }), dict({ @@ -265,6 +289,7 @@ 'precipitation_probability': 15, 'temperature': 3.0, 'wind_bearing': 45.0, + 'wind_gust_speed': 32.0, 'wind_speed': 22.0, }), dict({ @@ -273,6 +298,7 @@ 'precipitation_probability': 5, 'temperature': 3.0, 'wind_bearing': 45.0, + 'wind_gust_speed': 32.0, 'wind_speed': 20.0, }), dict({ @@ -281,6 +307,7 @@ 'precipitation_probability': 5, 'temperature': 3.0, 'wind_bearing': 45.0, + 'wind_gust_speed': 30.0, 'wind_speed': 19.0, }), dict({ @@ -289,6 +316,7 @@ 'precipitation_probability': 5, 'temperature': 4.0, 'wind_bearing': 45.0, + 'wind_gust_speed': 28.0, 'wind_speed': 17.0, }), dict({ @@ -297,6 +325,7 @@ 'precipitation_probability': 5, 'temperature': 3.0, 'wind_bearing': 45.0, + 'wind_gust_speed': 25.0, 'wind_speed': 16.0, }), dict({ @@ -305,6 +334,7 @@ 'precipitation_probability': 5, 'temperature': 2.0, 'wind_bearing': 45.0, + 'wind_gust_speed': 24.0, 'wind_speed': 16.0, }), dict({ @@ -313,6 +343,7 @@ 'precipitation_probability': 5, 'temperature': 1.0, 'wind_bearing': 45.0, + 'wind_gust_speed': 24.0, 'wind_speed': 17.0, }), dict({ @@ -321,6 +352,7 @@ 'precipitation_probability': None, 'temperature': 1.0, 'wind_bearing': 45.0, + 'wind_gust_speed': 25.0, 'wind_speed': 17.0, }), dict({ @@ -329,6 +361,7 @@ 'precipitation_probability': None, 'temperature': 1.0, 'wind_bearing': 45.0, + 'wind_gust_speed': 25.0, 'wind_speed': 16.0, }), dict({ @@ -337,6 +370,7 @@ 'precipitation_probability': None, 'temperature': 1.0, 'wind_bearing': 45.0, + 'wind_gust_speed': 24.0, 'wind_speed': 17.0, }), dict({ @@ -345,6 +379,7 @@ 'precipitation_probability': None, 'temperature': 0.0, 'wind_bearing': 45.0, + 'wind_gust_speed': 27.0, 'wind_speed': 19.0, }), dict({ @@ -353,6 +388,7 @@ 'precipitation_probability': None, 'temperature': 0.0, 'wind_bearing': 45.0, + 'wind_gust_speed': 30.0, 'wind_speed': 21.0, }), dict({ @@ -361,6 +397,7 @@ 'precipitation_probability': None, 'temperature': -1.0, 'wind_bearing': 45.0, + 'wind_gust_speed': 30.0, 'wind_speed': 19.0, }), dict({ @@ -369,6 +406,7 @@ 'precipitation_probability': None, 'temperature': -1.0, 'wind_bearing': 45.0, + 'wind_gust_speed': 27.0, 'wind_speed': 16.0, }), dict({ @@ -377,6 +415,7 @@ 'precipitation_probability': None, 'temperature': -2.0, 'wind_bearing': 45.0, + 'wind_gust_speed': 22.0, 'wind_speed': 12.0, }), dict({ @@ -385,6 +424,7 @@ 'precipitation_probability': None, 'temperature': -2.0, 'wind_bearing': 45.0, + 'wind_gust_speed': 17.0, 'wind_speed': 10.0, }), dict({ @@ -393,6 +433,7 @@ 'precipitation_probability': None, 'temperature': -3.0, 'wind_bearing': 45.0, + 'wind_gust_speed': 15.0, 'wind_speed': 11.0, }), dict({ @@ -401,6 +442,7 @@ 'precipitation_probability': None, 'temperature': -4.0, 'wind_bearing': 45.0, + 'wind_gust_speed': 15.0, 'wind_speed': 10.0, }), dict({ @@ -409,6 +451,7 @@ 'precipitation_probability': None, 'temperature': -4.0, 'wind_bearing': 0.0, + 'wind_gust_speed': 15.0, 'wind_speed': 10.0, }), ]), @@ -531,6 +574,7 @@ 'precipitation_probability': 100, 'temperature': 0.0, 'wind_bearing': 90.0, + 'wind_gust_speed': 24.0, 'wind_speed': 15.0, }), dict({ @@ -540,6 +584,7 @@ 'precipitation_probability': 100, 'temperature': 0.0, 'wind_bearing': 135.0, + 'wind_gust_speed': 22.0, 'wind_speed': 15.0, }), dict({ @@ -549,6 +594,7 @@ 'precipitation_probability': 100, 'temperature': 0.0, 'wind_bearing': 135.0, + 'wind_gust_speed': 24.0, 'wind_speed': 14.0, }), dict({ @@ -558,6 +604,7 @@ 'precipitation_probability': 100, 'temperature': 1.0, 'wind_bearing': 135.0, + 'wind_gust_speed': 20.0, 'wind_speed': 10.0, }), dict({ @@ -567,6 +614,7 @@ 'precipitation_probability': 100, 'temperature': 1.0, 'wind_bearing': 135.0, + 'wind_gust_speed': 14.0, 'wind_speed': 8.0, }), dict({ @@ -576,6 +624,7 @@ 'precipitation_probability': 100, 'temperature': 1.0, 'wind_bearing': 135.0, + 'wind_gust_speed': 13.0, 'wind_speed': 9.0, }), dict({ @@ -585,6 +634,7 @@ 'precipitation_probability': 100, 'temperature': 1.0, 'wind_bearing': 90.0, + 'wind_gust_speed': 13.0, 'wind_speed': 7.0, }), dict({ @@ -594,6 +644,7 @@ 'precipitation_probability': 100, 'temperature': 1.0, 'wind_bearing': 135.0, + 'wind_gust_speed': 12.0, 'wind_speed': 8.0, }), dict({ @@ -603,6 +654,7 @@ 'precipitation_probability': 100, 'temperature': 1.0, 'wind_bearing': 135.0, + 'wind_gust_speed': 12.0, 'wind_speed': 6.0, }), dict({ @@ -611,6 +663,7 @@ 'precipitation_probability': 100, 'temperature': 1.0, 'wind_bearing': 90.0, + 'wind_gust_speed': 8.0, 'wind_speed': 6.0, }), dict({ @@ -619,6 +672,7 @@ 'precipitation_probability': 100, 'temperature': 1.0, 'wind_bearing': 45.0, + 'wind_gust_speed': 9.0, 'wind_speed': 6.0, }), dict({ @@ -627,6 +681,7 @@ 'precipitation_probability': 100, 'temperature': 1.0, 'wind_bearing': 90.0, + 'wind_gust_speed': 11.0, 'wind_speed': 8.0, }), dict({ @@ -635,6 +690,7 @@ 'precipitation_probability': None, 'temperature': 1.0, 'wind_bearing': 45.0, + 'wind_gust_speed': 12.0, 'wind_speed': 6.0, }), dict({ @@ -643,6 +699,7 @@ 'precipitation_probability': 10, 'temperature': 0.0, 'wind_bearing': 45.0, + 'wind_gust_speed': 10.0, 'wind_speed': 5.0, }), dict({ @@ -651,6 +708,7 @@ 'precipitation_probability': 10, 'temperature': 0.0, 'wind_bearing': 0.0, + 'wind_gust_speed': 11.0, 'wind_speed': 6.0, }), dict({ @@ -659,6 +717,7 @@ 'precipitation_probability': 10, 'temperature': 0.0, 'wind_bearing': 0.0, + 'wind_gust_speed': 9.0, 'wind_speed': 6.0, }), dict({ @@ -667,6 +726,7 @@ 'precipitation_probability': 10, 'temperature': -1.0, 'wind_bearing': 45.0, + 'wind_gust_speed': 12.0, 'wind_speed': 8.0, }), dict({ @@ -675,6 +735,7 @@ 'precipitation_probability': 10, 'temperature': -1.0, 'wind_bearing': 0.0, + 'wind_gust_speed': 11.0, 'wind_speed': 5.0, }), dict({ @@ -683,6 +744,7 @@ 'precipitation_probability': 10, 'temperature': -1.0, 'wind_bearing': 0.0, + 'wind_gust_speed': 13.0, 'wind_speed': 9.0, }), dict({ @@ -691,6 +753,7 @@ 'precipitation_probability': 15, 'temperature': -2.0, 'wind_bearing': 45.0, + 'wind_gust_speed': 18.0, 'wind_speed': 13.0, }), dict({ @@ -699,6 +762,7 @@ 'precipitation_probability': 15, 'temperature': -1.0, 'wind_bearing': 45.0, + 'wind_gust_speed': 25.0, 'wind_speed': 17.0, }), dict({ @@ -707,6 +771,7 @@ 'precipitation_probability': 15, 'temperature': -1.0, 'wind_bearing': 45.0, + 'wind_gust_speed': 31.0, 'wind_speed': 21.0, }), dict({ @@ -715,6 +780,7 @@ 'precipitation_probability': 15, 'temperature': 0.0, 'wind_bearing': 45.0, + 'wind_gust_speed': 32.0, 'wind_speed': 21.0, }), dict({ @@ -723,6 +789,7 @@ 'precipitation_probability': 15, 'temperature': 2.0, 'wind_bearing': 45.0, + 'wind_gust_speed': 30.0, 'wind_speed': 21.0, }), dict({ @@ -731,6 +798,7 @@ 'precipitation_probability': 15, 'temperature': 3.0, 'wind_bearing': 45.0, + 'wind_gust_speed': 32.0, 'wind_speed': 22.0, }), dict({ @@ -739,6 +807,7 @@ 'precipitation_probability': 5, 'temperature': 3.0, 'wind_bearing': 45.0, + 'wind_gust_speed': 32.0, 'wind_speed': 20.0, }), dict({ @@ -747,6 +816,7 @@ 'precipitation_probability': 5, 'temperature': 3.0, 'wind_bearing': 45.0, + 'wind_gust_speed': 30.0, 'wind_speed': 19.0, }), dict({ @@ -755,6 +825,7 @@ 'precipitation_probability': 5, 'temperature': 4.0, 'wind_bearing': 45.0, + 'wind_gust_speed': 28.0, 'wind_speed': 17.0, }), dict({ @@ -763,6 +834,7 @@ 'precipitation_probability': 5, 'temperature': 3.0, 'wind_bearing': 45.0, + 'wind_gust_speed': 25.0, 'wind_speed': 16.0, }), dict({ @@ -771,6 +843,7 @@ 'precipitation_probability': 5, 'temperature': 2.0, 'wind_bearing': 45.0, + 'wind_gust_speed': 24.0, 'wind_speed': 16.0, }), dict({ @@ -779,6 +852,7 @@ 'precipitation_probability': 5, 'temperature': 1.0, 'wind_bearing': 45.0, + 'wind_gust_speed': 24.0, 'wind_speed': 17.0, }), dict({ @@ -787,6 +861,7 @@ 'precipitation_probability': None, 'temperature': 1.0, 'wind_bearing': 45.0, + 'wind_gust_speed': 25.0, 'wind_speed': 17.0, }), dict({ @@ -795,6 +870,7 @@ 'precipitation_probability': None, 'temperature': 1.0, 'wind_bearing': 45.0, + 'wind_gust_speed': 25.0, 'wind_speed': 16.0, }), dict({ @@ -803,6 +879,7 @@ 'precipitation_probability': None, 'temperature': 1.0, 'wind_bearing': 45.0, + 'wind_gust_speed': 24.0, 'wind_speed': 17.0, }), dict({ @@ -811,6 +888,7 @@ 'precipitation_probability': None, 'temperature': 0.0, 'wind_bearing': 45.0, + 'wind_gust_speed': 27.0, 'wind_speed': 19.0, }), dict({ @@ -819,6 +897,7 @@ 'precipitation_probability': None, 'temperature': 0.0, 'wind_bearing': 45.0, + 'wind_gust_speed': 30.0, 'wind_speed': 21.0, }), dict({ @@ -827,6 +906,7 @@ 'precipitation_probability': None, 'temperature': -1.0, 'wind_bearing': 45.0, + 'wind_gust_speed': 30.0, 'wind_speed': 19.0, }), dict({ @@ -835,6 +915,7 @@ 'precipitation_probability': None, 'temperature': -1.0, 'wind_bearing': 45.0, + 'wind_gust_speed': 27.0, 'wind_speed': 16.0, }), dict({ @@ -843,6 +924,7 @@ 'precipitation_probability': None, 'temperature': -2.0, 'wind_bearing': 45.0, + 'wind_gust_speed': 22.0, 'wind_speed': 12.0, }), dict({ @@ -851,6 +933,7 @@ 'precipitation_probability': None, 'temperature': -2.0, 'wind_bearing': 45.0, + 'wind_gust_speed': 17.0, 'wind_speed': 10.0, }), dict({ @@ -859,6 +942,7 @@ 'precipitation_probability': None, 'temperature': -3.0, 'wind_bearing': 45.0, + 'wind_gust_speed': 15.0, 'wind_speed': 11.0, }), dict({ @@ -867,6 +951,7 @@ 'precipitation_probability': None, 'temperature': -4.0, 'wind_bearing': 45.0, + 'wind_gust_speed': 15.0, 'wind_speed': 10.0, }), dict({ @@ -875,6 +960,7 @@ 'precipitation_probability': None, 'temperature': -4.0, 'wind_bearing': 0.0, + 'wind_gust_speed': 15.0, 'wind_speed': 10.0, }), ]) @@ -888,6 +974,7 @@ 'precipitation_probability': 100, 'temperature': 0.0, 'wind_bearing': 90.0, + 'wind_gust_speed': 24.0, 'wind_speed': 15.0, }), dict({ @@ -897,6 +984,7 @@ 'precipitation_probability': 100, 'temperature': 0.0, 'wind_bearing': 135.0, + 'wind_gust_speed': 22.0, 'wind_speed': 15.0, }), dict({ @@ -906,6 +994,7 @@ 'precipitation_probability': 100, 'temperature': 0.0, 'wind_bearing': 135.0, + 'wind_gust_speed': 24.0, 'wind_speed': 14.0, }), dict({ @@ -915,6 +1004,7 @@ 'precipitation_probability': 100, 'temperature': 1.0, 'wind_bearing': 135.0, + 'wind_gust_speed': 20.0, 'wind_speed': 10.0, }), dict({ @@ -924,6 +1014,7 @@ 'precipitation_probability': 100, 'temperature': 1.0, 'wind_bearing': 135.0, + 'wind_gust_speed': 14.0, 'wind_speed': 8.0, }), dict({ @@ -933,6 +1024,7 @@ 'precipitation_probability': 100, 'temperature': 1.0, 'wind_bearing': 135.0, + 'wind_gust_speed': 13.0, 'wind_speed': 9.0, }), dict({ @@ -942,6 +1034,7 @@ 'precipitation_probability': 100, 'temperature': 1.0, 'wind_bearing': 90.0, + 'wind_gust_speed': 13.0, 'wind_speed': 7.0, }), dict({ @@ -951,6 +1044,7 @@ 'precipitation_probability': 100, 'temperature': 1.0, 'wind_bearing': 135.0, + 'wind_gust_speed': 12.0, 'wind_speed': 8.0, }), dict({ @@ -960,6 +1054,7 @@ 'precipitation_probability': 100, 'temperature': 1.0, 'wind_bearing': 135.0, + 'wind_gust_speed': 12.0, 'wind_speed': 6.0, }), dict({ @@ -968,6 +1063,7 @@ 'precipitation_probability': 100, 'temperature': 1.0, 'wind_bearing': 90.0, + 'wind_gust_speed': 8.0, 'wind_speed': 6.0, }), dict({ @@ -976,6 +1072,7 @@ 'precipitation_probability': 100, 'temperature': 1.0, 'wind_bearing': 45.0, + 'wind_gust_speed': 9.0, 'wind_speed': 6.0, }), dict({ @@ -984,6 +1081,7 @@ 'precipitation_probability': 100, 'temperature': 1.0, 'wind_bearing': 90.0, + 'wind_gust_speed': 11.0, 'wind_speed': 8.0, }), dict({ @@ -992,6 +1090,7 @@ 'precipitation_probability': None, 'temperature': 1.0, 'wind_bearing': 45.0, + 'wind_gust_speed': 12.0, 'wind_speed': 6.0, }), dict({ @@ -1000,6 +1099,7 @@ 'precipitation_probability': 10, 'temperature': 0.0, 'wind_bearing': 45.0, + 'wind_gust_speed': 10.0, 'wind_speed': 5.0, }), dict({ @@ -1008,6 +1108,7 @@ 'precipitation_probability': 10, 'temperature': 0.0, 'wind_bearing': 0.0, + 'wind_gust_speed': 11.0, 'wind_speed': 6.0, }), dict({ @@ -1016,6 +1117,7 @@ 'precipitation_probability': 10, 'temperature': 0.0, 'wind_bearing': 0.0, + 'wind_gust_speed': 9.0, 'wind_speed': 6.0, }), dict({ @@ -1024,6 +1126,7 @@ 'precipitation_probability': 10, 'temperature': -1.0, 'wind_bearing': 45.0, + 'wind_gust_speed': 12.0, 'wind_speed': 8.0, }), dict({ @@ -1032,6 +1135,7 @@ 'precipitation_probability': 10, 'temperature': -1.0, 'wind_bearing': 0.0, + 'wind_gust_speed': 11.0, 'wind_speed': 5.0, }), dict({ @@ -1040,6 +1144,7 @@ 'precipitation_probability': 10, 'temperature': -1.0, 'wind_bearing': 0.0, + 'wind_gust_speed': 13.0, 'wind_speed': 9.0, }), dict({ @@ -1048,6 +1153,7 @@ 'precipitation_probability': 15, 'temperature': -2.0, 'wind_bearing': 45.0, + 'wind_gust_speed': 18.0, 'wind_speed': 13.0, }), dict({ @@ -1056,6 +1162,7 @@ 'precipitation_probability': 15, 'temperature': -1.0, 'wind_bearing': 45.0, + 'wind_gust_speed': 25.0, 'wind_speed': 17.0, }), dict({ @@ -1064,6 +1171,7 @@ 'precipitation_probability': 15, 'temperature': -1.0, 'wind_bearing': 45.0, + 'wind_gust_speed': 31.0, 'wind_speed': 21.0, }), dict({ @@ -1072,6 +1180,7 @@ 'precipitation_probability': 15, 'temperature': 0.0, 'wind_bearing': 45.0, + 'wind_gust_speed': 32.0, 'wind_speed': 21.0, }), dict({ @@ -1080,6 +1189,7 @@ 'precipitation_probability': 15, 'temperature': 2.0, 'wind_bearing': 45.0, + 'wind_gust_speed': 30.0, 'wind_speed': 21.0, }), dict({ @@ -1088,6 +1198,7 @@ 'precipitation_probability': 15, 'temperature': 3.0, 'wind_bearing': 45.0, + 'wind_gust_speed': 32.0, 'wind_speed': 22.0, }), dict({ @@ -1096,6 +1207,7 @@ 'precipitation_probability': 5, 'temperature': 3.0, 'wind_bearing': 45.0, + 'wind_gust_speed': 32.0, 'wind_speed': 20.0, }), dict({ @@ -1104,6 +1216,7 @@ 'precipitation_probability': 5, 'temperature': 3.0, 'wind_bearing': 45.0, + 'wind_gust_speed': 30.0, 'wind_speed': 19.0, }), dict({ @@ -1112,6 +1225,7 @@ 'precipitation_probability': 5, 'temperature': 4.0, 'wind_bearing': 45.0, + 'wind_gust_speed': 28.0, 'wind_speed': 17.0, }), dict({ @@ -1120,6 +1234,7 @@ 'precipitation_probability': 5, 'temperature': 3.0, 'wind_bearing': 45.0, + 'wind_gust_speed': 25.0, 'wind_speed': 16.0, }), dict({ @@ -1128,6 +1243,7 @@ 'precipitation_probability': 5, 'temperature': 2.0, 'wind_bearing': 45.0, + 'wind_gust_speed': 24.0, 'wind_speed': 16.0, }), dict({ @@ -1136,6 +1252,7 @@ 'precipitation_probability': 5, 'temperature': 1.0, 'wind_bearing': 45.0, + 'wind_gust_speed': 24.0, 'wind_speed': 17.0, }), dict({ @@ -1144,6 +1261,7 @@ 'precipitation_probability': None, 'temperature': 1.0, 'wind_bearing': 45.0, + 'wind_gust_speed': 25.0, 'wind_speed': 17.0, }), dict({ @@ -1152,6 +1270,7 @@ 'precipitation_probability': None, 'temperature': 1.0, 'wind_bearing': 45.0, + 'wind_gust_speed': 25.0, 'wind_speed': 16.0, }), dict({ @@ -1160,6 +1279,7 @@ 'precipitation_probability': None, 'temperature': 1.0, 'wind_bearing': 45.0, + 'wind_gust_speed': 24.0, 'wind_speed': 17.0, }), dict({ @@ -1168,6 +1288,7 @@ 'precipitation_probability': None, 'temperature': 0.0, 'wind_bearing': 45.0, + 'wind_gust_speed': 27.0, 'wind_speed': 19.0, }), dict({ @@ -1176,6 +1297,7 @@ 'precipitation_probability': None, 'temperature': 0.0, 'wind_bearing': 45.0, + 'wind_gust_speed': 30.0, 'wind_speed': 21.0, }), dict({ @@ -1184,6 +1306,7 @@ 'precipitation_probability': None, 'temperature': -1.0, 'wind_bearing': 45.0, + 'wind_gust_speed': 30.0, 'wind_speed': 19.0, }), dict({ @@ -1192,6 +1315,7 @@ 'precipitation_probability': None, 'temperature': -1.0, 'wind_bearing': 45.0, + 'wind_gust_speed': 27.0, 'wind_speed': 16.0, }), dict({ @@ -1200,6 +1324,7 @@ 'precipitation_probability': None, 'temperature': -2.0, 'wind_bearing': 45.0, + 'wind_gust_speed': 22.0, 'wind_speed': 12.0, }), dict({ @@ -1208,6 +1333,7 @@ 'precipitation_probability': None, 'temperature': -2.0, 'wind_bearing': 45.0, + 'wind_gust_speed': 17.0, 'wind_speed': 10.0, }), dict({ @@ -1216,6 +1342,7 @@ 'precipitation_probability': None, 'temperature': -3.0, 'wind_bearing': 45.0, + 'wind_gust_speed': 15.0, 'wind_speed': 11.0, }), dict({ @@ -1224,6 +1351,7 @@ 'precipitation_probability': None, 'temperature': -4.0, 'wind_bearing': 45.0, + 'wind_gust_speed': 15.0, 'wind_speed': 10.0, }), dict({ @@ -1232,6 +1360,7 @@ 'precipitation_probability': None, 'temperature': -4.0, 'wind_bearing': 0.0, + 'wind_gust_speed': 15.0, 'wind_speed': 10.0, }), ])