From d99b109a399c08b2a952a6dc64b31959e89b02d0 Mon Sep 17 00:00:00 2001 From: TheCellMC Date: Thu, 12 Apr 2018 21:34:38 +0200 Subject: [PATCH 1/4] Update yweather.py --- homeassistant/components/weather/yweather.py | 25 ++++++++++++++------ 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/homeassistant/components/weather/yweather.py b/homeassistant/components/weather/yweather.py index 5987cf7621f859..99dc73167df600 100644 --- a/homeassistant/components/weather/yweather.py +++ b/homeassistant/components/weather/yweather.py @@ -33,20 +33,31 @@ CONDITION_CLASSES = { 'clear-night': [31], - 'cloudy': [26, 27, 28, 29, 30], + 'cloudy': [26], + 'exceptional': [0, 1, 2], + 'fair': [34], + 'fair-night': [33], 'fog': [19, 20, 21, 22, 23], 'hail': [17, 18, 35], - 'lightning': [37], - 'lightning-rainy': [3, 4, 38, 39, 47], + 'light-rain': [8], + 'light-snow': [9, 14], + 'lightning': [3, 4, 37, 38, 39], + 'lightning-rainy': [45, 47], + 'mostly-cloudy' [28], + 'mostly-cloudy-night' [29], + 'partly-cloudy' [29], + 'partly-cloudy-night' [30], 'partlycloudy': [44], - 'pouring': [40, 45], - 'rainy': [9, 11, 12], - 'snowy': [8, 13, 14, 15, 16, 41, 42, 43], + 'pouring': [45], + 'rainy': [10], + 'scattered-showers': [40], + 'scattered-snow-showers': [42], + 'showers: [11, 12], + 'snowy': [16, 13, 15], 'snowy-rainy': [5, 6, 7, 10, 46], 'sunny': [32, 33, 34, 25, 36], 'windy': [24], 'windy-variant': [], - 'exceptional': [0, 1, 2], } From 30e080a4229784e5c2108b908758576fd47f0b87 Mon Sep 17 00:00:00 2001 From: TheCellMC Date: Fri, 13 Apr 2018 16:45:30 +0200 Subject: [PATCH 2/4] Update yweather.py --- homeassistant/components/weather/yweather.py | 36 +++++++++----------- 1 file changed, 16 insertions(+), 20 deletions(-) diff --git a/homeassistant/components/weather/yweather.py b/homeassistant/components/weather/yweather.py index 99dc73167df600..65b41961d4ec01 100644 --- a/homeassistant/components/weather/yweather.py +++ b/homeassistant/components/weather/yweather.py @@ -32,32 +32,28 @@ SCAN_INTERVAL = timedelta(minutes=10) CONDITION_CLASSES = { - 'clear-night': [31], - 'cloudy': [26], - 'exceptional': [0, 1, 2], + 'clear-night': [31, 33], + 'sunny': [32, 34, 25, 36], + 'windy': [24], 'fair': [34], 'fair-night': [33], + 'cloudy': [26], + 'mostly-cloudy' [28], + 'mostly-cloudy-night' [27], + 'partly-cloudy' [30, 44], + 'partly-cloudy-night' [29], 'fog': [19, 20, 21, 22, 23], 'hail': [17, 18, 35], - 'light-rain': [8], - 'light-snow': [9, 14], + 'light-rain': [8, 9], + 'light-snow': [14], + 'heavy-rain': [11, 12, 45, 40], + 'heavy-snow': [41, 42, 43, 46], + 'snowy': [13, 15, 16], + 'rainy': [10], + 'snowy-rainy': [5, 6, 7, 10], 'lightning': [3, 4, 37, 38, 39], 'lightning-rainy': [45, 47], - 'mostly-cloudy' [28], - 'mostly-cloudy-night' [29], - 'partly-cloudy' [29], - 'partly-cloudy-night' [30], - 'partlycloudy': [44], - 'pouring': [45], - 'rainy': [10], - 'scattered-showers': [40], - 'scattered-snow-showers': [42], - 'showers: [11, 12], - 'snowy': [16, 13, 15], - 'snowy-rainy': [5, 6, 7, 10, 46], - 'sunny': [32, 33, 34, 25, 36], - 'windy': [24], - 'windy-variant': [], + 'exceptional': [0, 1, 2], } From 7cee28006fb4d6699613b0cefabe21a0d6cd1061 Mon Sep 17 00:00:00 2001 From: TheCellMC Date: Fri, 13 Apr 2018 17:04:59 +0200 Subject: [PATCH 3/4] Update yweather.py --- homeassistant/components/weather/yweather.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/homeassistant/components/weather/yweather.py b/homeassistant/components/weather/yweather.py index 65b41961d4ec01..3d64f2de8e9be4 100644 --- a/homeassistant/components/weather/yweather.py +++ b/homeassistant/components/weather/yweather.py @@ -32,7 +32,7 @@ SCAN_INTERVAL = timedelta(minutes=10) CONDITION_CLASSES = { - 'clear-night': [31, 33], + 'clear-night': [31, 33], 'sunny': [32, 34, 25, 36], 'windy': [24], 'fair': [34], @@ -41,7 +41,7 @@ 'mostly-cloudy' [28], 'mostly-cloudy-night' [27], 'partly-cloudy' [30, 44], - 'partly-cloudy-night' [29], + 'partly-cloudy-night' [29], 'fog': [19, 20, 21, 22, 23], 'hail': [17, 18, 35], 'light-rain': [8, 9], From afa3a480dd812e0510c1430b5ce18e7217860fa2 Mon Sep 17 00:00:00 2001 From: TheCellMC Date: Fri, 13 Apr 2018 17:16:43 +0200 Subject: [PATCH 4/4] Update yweather.py --- homeassistant/components/weather/yweather.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/homeassistant/components/weather/yweather.py b/homeassistant/components/weather/yweather.py index 3d64f2de8e9be4..8e638895660dcc 100644 --- a/homeassistant/components/weather/yweather.py +++ b/homeassistant/components/weather/yweather.py @@ -38,10 +38,10 @@ 'fair': [34], 'fair-night': [33], 'cloudy': [26], - 'mostly-cloudy' [28], - 'mostly-cloudy-night' [27], - 'partly-cloudy' [30, 44], - 'partly-cloudy-night' [29], + 'mostly-cloudy': [28], + 'mostly-cloudy-night': [27], + 'partly-cloudy': [30, 44], + 'partly-cloudy-night': [29], 'fog': [19, 20, 21, 22, 23], 'hail': [17, 18, 35], 'light-rain': [8, 9],