Move feelsLke calculation into utils and add tests

MagicMirrorOrg · Jan 15, 2023 · b328b19 · b328b19
1 parent 3a20b2e
commit b328b19
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 21 deletions.
diff --git a/modules/default/weather/weatherobject.js b/modules/default/weather/weatherobject.js
@@ -78,26 +78,7 @@ class WeatherObject {
 		if (this.feelsLikeTemp) {
 			return this.feelsLikeTemp;
 		}
-		const windInMph = WeatherUtils.convertWind(this.windSpeed, "imperial");
-		const tempInF = WeatherUtils.convertTemp(this.temperature, "imperial");
-		let feelsLike = tempInF;
-
-		if (windInMph > 3 && tempInF < 50) {
-			feelsLike = Math.round(35.74 + 0.6215 * tempInF - 35.75 * Math.pow(windInMph, 0.16) + 0.4275 * tempInF * Math.pow(windInMph, 0.16));
-		} else if (tempInF > 80 && this.humidity > 40) {
-			feelsLike =
-				-42.379 +
-				2.04901523 * tempInF +
-				10.14333127 * this.humidity -
-				0.22475541 * tempInF * this.humidity -
-				6.83783 * Math.pow(10, -3) * tempInF * tempInF -
-				5.481717 * Math.pow(10, -2) * this.humidity * this.humidity +
-				1.22874 * Math.pow(10, -3) * tempInF * tempInF * this.humidity +
-				8.5282 * Math.pow(10, -4) * tempInF * this.humidity * this.humidity -
-				1.99 * Math.pow(10, -6) * tempInF * tempInF * this.humidity * this.humidity;
-		}
-
-		return ((feelsLike - 32) * 5) / 9;
+		return WeatherUtils.calculateFeelsLike(this.temperature, this.windSpeed, this.humidity);
 	}
 
 	/**

diff --git a/modules/default/weather/weatherutils.js b/modules/default/weather/weatherutils.js
@@ -90,6 +90,29 @@ const WeatherUtils = {
 
 	convertWindToMs(kmh) {
 		return kmh * 0.27777777777778;
+	},
+
+	calculateFeelsLike(temperature, windSpeed, humidity) {
+		const windInMph = this.convertWind(windSpeed, "imperial");
+		const tempInF = this.convertTemp(temperature, "imperial");
+		let feelsLike = tempInF;
+
+		if (windInMph > 3 && tempInF < 50) {
+			feelsLike = Math.round(35.74 + 0.6215 * tempInF - 35.75 * Math.pow(windInMph, 0.16) + 0.4275 * tempInF * Math.pow(windInMph, 0.16));
+		} else if (tempInF > 80 && humidity > 40) {
+			feelsLike =
+				-42.379 +
+				2.04901523 * tempInF +
+				10.14333127 * humidity -
+				0.22475541 * tempInF * humidity -
+				6.83783 * Math.pow(10, -3) * tempInF * tempInF -
+				5.481717 * Math.pow(10, -2) * humidity * humidity +
+				1.22874 * Math.pow(10, -3) * tempInF * tempInF * humidity +
+				8.5282 * Math.pow(10, -4) * tempInF * humidity * humidity -
+				1.99 * Math.pow(10, -6) * tempInF * tempInF * humidity * humidity;
+		}
+
+		return ((feelsLike - 32) * 5) / 9;
 	}
 };
 

diff --git a/tests/unit/functions/weather_object_spec.js b/tests/unit/functions/weather_object_spec.js
@@ -38,12 +38,17 @@ describe("WeatherObject", () => {
 		expect(weatherobject.nextSunAction()).toBe("sunset");
 	});
 
+	it("should return an already defined feelsLike info", () => {
+		weatherobject.feelsLikeTemp = "feelsLikeTempValue";
+		expect(weatherobject.feelsLike()).toBe("feelsLikeTempValue");
+	});
+
 	afterAll(() => {
 		moment.tz.setDefault(originalTimeZone);
 	});
 });
 
-describe("WeatherObject", () => {
+describe("WeatherUtils", () => {
 	it("should convert windspeed correctly from mph to mps", () => {
 		expect(Math.round(WeatherUtils.convertWindToMetric(93.951324266285))).toBe(42);
 	});
@@ -55,4 +60,8 @@ describe("WeatherObject", () => {
 	it("should convert wind direction correctly from cardinal to value", () => {
 		expect(WeatherUtils.convertWindDirection("SSE")).toBe(157);
 	});
+
+	it("should return a calculated feelsLike info", () => {
+		expect(WeatherUtils.calculateFeelsLike(0, 20, 40)).toBe(-9.444444444444445);
+	});
 });