refactor(weather): extract cardinalToDegrees() to provider-utils.js

Author: KristjanESPERANTO

defaultmodules/weather/provider-utils.js

@@ -124,6 +124,33 @@ function convertKmhToMs (kmh) {
 	return kmh / 3.6;
 }
 
+/**
+ * Convert cardinal wind direction string to degrees
+ * @param {string} direction - Cardinal direction (e.g., "N", "NNE", "SW")
+ * @returns {number|null} Direction in degrees (0-360) or null if unknown
+ */
+function cardinalToDegrees (direction) {
+	const directions = {
+		N: 0,
+		NNE: 22.5,
+		NE: 45,
+		ENE: 67.5,
+		E: 90,
+		ESE: 112.5,
+		SE: 135,
+		SSE: 157.5,
+		S: 180,
+		SSW: 202.5,
+		SW: 225,
+		WSW: 247.5,
+		W: 270,
+		WNW: 292.5,
+		NW: 315,
+		NNW: 337.5
+	};
+	return directions[direction] ?? null;
+}
+
 /**
  * Validate and limit coordinate precision
  * @param {object} config - Configuration object with lat/lon properties
@@ -149,5 +176,6 @@ module.exports = {
 	formatTimezoneOffset,
 	getDateString,
 	convertKmhToMs,
+	cardinalToDegrees,
 	validateCoordinates
 };

defaultmodules/weather/providers/weatherapi.js

@@ -1,5 +1,5 @@
 const Log = require("logger");
-const { convertKmhToMs } = require("../provider-utils");
+const { convertKmhToMs, cardinalToDegrees } = require("../provider-utils");
 const HTTPFetcher = require("#http_fetcher");
 
 const WEATHER_API_BASE = "https://api.weatherapi.com/v1";
@@ -238,27 +238,6 @@ class WeatherAPIProvider {
 		return date;
 	}
 
-	#cardinalWindDirection (direction) {
-		switch (direction) {
-			case "NNE": return 22.5;
-			case "NE": return 45;
-			case "ENE": return 67.5;
-			case "E": return 90;
-			case "ESE": return 112.5;
-			case "SE": return 135;
-			case "SSE": return 157.5;
-			case "S": return 180;
-			case "SSW": return 202.5;
-			case "SW": return 225;
-			case "WSW": return 247.5;
-			case "W": return 270;
-			case "WNW": return 292.5;
-			case "NW": return 315;
-			case "NNW": return 337.5;
-			default: return 0;
-		}
-	}
-
 	#toNumber (value) {
 		const number = parseFloat(value);
 		return Number.isFinite(number) ? number : null;
@@ -348,7 +327,7 @@ class WeatherAPIProvider {
 				const windDegree = this.#toNumber(noonHour.wind_degree);
 				weather.windFromDirection = windDegree !== null
 					? windDegree
-					: this.#cardinalWindDirection(noonHour?.wind_dir);
+					: cardinalToDegrees(noonHour?.wind_dir);
 			}
 
 			const sunrise = this.#parseSunDatetime(forecastDay, "sunrise");
@@ -418,7 +397,7 @@ class WeatherAPIProvider {
 				const windDegree = this.#toNumber(hourData.wind_degree);
 				weather.windFromDirection = windDegree !== null
 					? windDegree
-					: this.#cardinalWindDirection(hourData.wind_dir);
+					: cardinalToDegrees(hourData.wind_dir);
 
 				weather.weatherType = this.#convertWeatherType(hourData.condition?.code, hourData.is_day === 1);
 

defaultmodules/weather/providers/weathergov.js

@@ -1,5 +1,5 @@
 const Log = require("logger");
-const { getSunTimes, isDayTime, getDateString, convertKmhToMs } = require("../provider-utils");
+const { getSunTimes, isDayTime, getDateString, convertKmhToMs, cardinalToDegrees } = require("../provider-utils");
 const HTTPFetcher = require("#http_fetcher");
 
 /**
@@ -367,7 +367,7 @@ class WeatherGovProvider {
 				windSpeed = windSpeedStr.split(" ")[0];
 			}
 			weather.windSpeed = convertKmhToMs(parseFloat(windSpeed));
-			weather.windFromDirection = this.#convertWindDirection(forecast.windDirection);
+			weather.windFromDirection = cardinalToDegrees(forecast.windDirection);
 			weather.temperature = forecast.temperature;
 			weather.precipitationProbability = forecast.probabilityOfPrecipitation?.value ?? 0;
 			weather.weatherType = this.#convertWeatherType(forecast.shortForecast, forecast.isDaytime);
@@ -378,28 +378,6 @@ class WeatherGovProvider {
 		return hours;
 	}
 
-	#convertWindDirection (direction) {
-		const directions = {
-			N: 0,
-			NNE: 22.5,
-			NE: 45,
-			ENE: 67.5,
-			E: 90,
-			ESE: 112.5,
-			SE: 135,
-			SSE: 157.5,
-			S: 180,
-			SSW: 202.5,
-			SW: 225,
-			WSW: 247.5,
-			W: 270,
-			WNW: 292.5,
-			NW: 315,
-			NNW: 337.5
-		};
-		return directions[direction] ?? null;
-	}
-
 	#convertWeatherType (weatherType, isDaytime) {
 		// https://w1.weather.gov/xml/current_obs/weather.php