remove setConfig in openweathermap.js, add weatherProvider and weathe…

…rEndpoint to all weather test configs
MagicMirrorOrg · Oct 10, 2024 · 45f04bc · 45f04bc
1 parent 2902a3b
commit 45f04bc
Show file tree

Hide file tree

Showing 12 changed files with 23 additions and 26 deletions.
diff --git a/modules/default/weather/providers/openweathermap.js b/modules/default/weather/providers/openweathermap.js
@@ -93,27 +93,6 @@ WeatherProvider.register("openweathermap", {
 			.finally(() => this.updateAvailable());
 	},
 
-	/**
-	 * Overrides method for setting config to check if endpoint is correct for hourly
-	 * @param {object} config The configuration object
-	 */
-	setConfig (config) {
-		this.config = config;
-		if (!this.config.weatherEndpoint) {
-			switch (this.config.type) {
-				case "hourly":
-				case "daily":
-				case "forecast":
-				case "current":
-				case "":
-					this.config.weatherEndpoint = "/onecall";
-					break;
-				default:
-					Log.error("weatherEndpoint not configured and could not resolve it based on type");
-			}
-		}
-	},
-
 	/** OpenWeatherMap Specific Methods - These are not part of the default provider methods */
 	/*
 	 * Gets the complete url for the request

diff --git a/tests/configs/modules/weather/currentweather_compliments.js b/tests/configs/modules/weather/currentweather_compliments.js
@@ -15,6 +15,8 @@ let config = {
 			position: "bottom_bar",
 			config: {
 				location: "Munich",
+				weatherProvider: "openweathermap",
+				weatherEndpoint: "/weather",
 				mockData: '"#####WEATHERDATA#####"'
 			}
 		}

diff --git a/tests/configs/modules/weather/currentweather_default.js b/tests/configs/modules/weather/currentweather_default.js
@@ -8,6 +8,8 @@ let config = {
 			config: {
 				location: "Munich",
 				showHumidity: "feelslike",
+				weatherProvider: "openweathermap",
+				weatherEndpoint: "/weather",
 				mockData: '"#####WEATHERDATA#####"'
 			}
 		}

diff --git a/tests/configs/modules/weather/currentweather_options.js b/tests/configs/modules/weather/currentweather_options.js
@@ -5,6 +5,8 @@ let config = {
 			position: "bottom_bar",
 			config: {
 				location: "Munich",
+				weatherProvider: "openweathermap",
+				weatherEndpoint: "/weather",
 				mockData: '"#####WEATHERDATA#####"',
 				windUnits: "beaufort",
 				showWindDirectionAsArrow: true,

diff --git a/tests/configs/modules/weather/currentweather_units.js b/tests/configs/modules/weather/currentweather_units.js
@@ -7,6 +7,8 @@ let config = {
 			position: "bottom_bar",
 			config: {
 				location: "Munich",
+				weatherProvider: "openweathermap",
+				weatherEndpoint: "/weather",
 				mockData: '"#####WEATHERDATA#####"',
 				decimalSymbol: ",",
 				showHumidity: "wind"

diff --git a/tests/configs/modules/weather/forecastweather_absolute.js b/tests/configs/modules/weather/forecastweather_absolute.js
@@ -8,8 +8,9 @@ let config = {
 			config: {
 				type: "forecast",
 				location: "Munich",
-				mockData: '"#####WEATHERDATA#####"',
+				weatherProvider: "openweathermap",
 				weatherEndpoint: "/forecast/daily",
+				mockData: '"#####WEATHERDATA#####"',
 				absoluteDates: true
 			}
 		}

diff --git a/tests/configs/modules/weather/forecastweather_default.js b/tests/configs/modules/weather/forecastweather_default.js
@@ -8,8 +8,9 @@ let config = {
 			config: {
 				type: "forecast",
 				location: "Munich",
-				mockData: '"#####WEATHERDATA#####"',
-				weatherEndpoint: "/forecast/daily"
+				weatherProvider: "openweathermap",
+				weatherEndpoint: "/forecast/daily",
+				mockData: '"#####WEATHERDATA#####"'
 			}
 		}
 	]

diff --git a/tests/configs/modules/weather/forecastweather_options.js b/tests/configs/modules/weather/forecastweather_options.js
@@ -8,8 +8,9 @@ let config = {
 			config: {
 				type: "forecast",
 				location: "Munich",
-				mockData: '"#####WEATHERDATA#####"',
+				weatherProvider: "openweathermap",
 				weatherEndpoint: "/forecast/daily",
+				mockData: '"#####WEATHERDATA#####"',
 				showPrecipitationAmount: true,
 				colored: true,
 				tableClass: "myTableClass"

diff --git a/tests/configs/modules/weather/forecastweather_units.js b/tests/configs/modules/weather/forecastweather_units.js
@@ -8,8 +8,9 @@ let config = {
 			config: {
 				type: "forecast",
 				location: "Munich",
-				mockData: '"#####WEATHERDATA#####"',
+				weatherProvider: "openweathermap",
 				weatherEndpoint: "/forecast/daily",
+				mockData: '"#####WEATHERDATA#####"',
 				decimalSymbol: "_",
 				showPrecipitationAmount: true
 			}

diff --git a/tests/configs/modules/weather/hourlyweather_default.js b/tests/configs/modules/weather/hourlyweather_default.js
@@ -8,6 +8,8 @@ let config = {
 			config: {
 				type: "hourly",
 				location: "Berlin",
+				weatherProvider: "openweathermap",
+				weatherEndpoint: "/onecall",
 				mockData: '"#####WEATHERDATA#####"'
 			}
 		}

diff --git a/tests/configs/modules/weather/hourlyweather_options.js b/tests/configs/modules/weather/hourlyweather_options.js
@@ -8,6 +8,8 @@ let config = {
 			config: {
 				type: "hourly",
 				location: "Berlin",
+				weatherProvider: "openweathermap",
+				weatherEndpoint: "/onecall",
 				mockData: '"#####WEATHERDATA#####"',
 				hourlyForecastIncrements: 2
 			}

diff --git a/tests/configs/modules/weather/hourlyweather_showPrecipitation.js b/tests/configs/modules/weather/hourlyweather_showPrecipitation.js
@@ -8,6 +8,8 @@ let config = {
 			config: {
 				type: "hourly",
 				location: "Berlin",
+				weatherProvider: "openweathermap",
+				weatherEndpoint: "/onecall",
 				mockData: '"#####WEATHERDATA#####"',
 				showPrecipitationAmount: true,
 				showPrecipitationProbability: true