Issue #2221 - Weather forecast always shows night icons in day time

CHANGELOG.md

@@ -28,6 +28,7 @@ _This release is scheduled to be released on 2021-04-01._
 
 - Added default log levels to stop calendar log spamming.
 - Fix socket.io cors errors, see [breaking change since socket.io v3](https://socket.io/docs/v3/handling-cors/)
+- Fix Issue with weather forecast icons due to fixed day start and end time (#2221)
 
 ## [2.14.0] - 2021-01-01
 

modules/default/weatherforecast/weatherforecast.js

@@ -351,6 +351,13 @@ Module.register("weatherforecast", {
 		this.forecast = [];
 		var lastDay = null;
 		var forecastData = {};
+		var dayStarts = 8;
+		var dayEnds = 17;
+
+		if (data.city && data.city.sunrise && data.city.sunset) {
+			dayStarts = moment.unix(data.city.sunrise).toDate().getHours();
+			dayEnds = moment.unix(data.city.sunset).toDate().getHours();
+		}
 
 		// Handle different structs between forecast16 and onecall endpoints
 		var forecastList = null;
@@ -400,7 +407,7 @@ Module.register("weatherforecast", {
 
 				// Since we don't want an icon from the start of the day (in the middle of the night)
 				// we update the icon as long as it's somewhere during the day.
-				if (hour >= 8 && hour <= 17) {
+				if (hour > dayStarts && hour < dayEnds) {
 					forecastData.icon = this.config.iconTable[forecast.weather[0].icon];
 				}
 			}

tests/unit/functions/weatherforecast_spec.js

@@ -1,5 +1,6 @@
 /* eslint no-multi-spaces: 0 */
 const expect = require("chai").expect;
+var data = require("../functions/weatherforecast_data.json");
 
 describe("Functions module weatherforecast", function () {
 	before(function () {
@@ -63,4 +64,38 @@ describe("Functions module weatherforecast", function () {
 			});
 		});
 	});
+
+	describe("forecastIcons", function () {
+		Log = {
+			error: function () {}
+		};
+		describe("forecastIcons sunset specified", function () {
+			before(function () {
+				Module.definitions.weatherforecast.Log = {};
+				Module.definitions.weatherforecast.forecast = [];
+				Module.definitions.weatherforecast.show = Module.definitions.weatherforecast.updateDom = function () {};
+				Module.definitions.weatherforecast.config = Module.definitions.weatherforecast.defaults;
+			});
+
+			it(`returns correct icons with sunset time`, function () {
+				Module.definitions.weatherforecast.processWeather(data.withSunset);
+				let forecastData = Module.definitions.weatherforecast.forecast;
+				expect(forecastData.length).to.equal(4);
+				expect(forecastData[2].icon).to.equal("wi-rain");
+			});
+		});
+
+		describe("forecastIcons sunset not specified", function () {
+			before(function () {
+				Module.definitions.weatherforecast.forecast = [];
+			});
+
+			it(`returns correct icons with out sunset time`, function () {
+				Module.definitions.weatherforecast.processWeather(data.withoutSunset);
+				let forecastData = Module.definitions.weatherforecast.forecast;
+				expect(forecastData.length).to.equal(4);
+				expect(forecastData[2].icon).to.equal("wi-rain");
+			});
+		});
+	});
 });