mirror of
				https://github.com/MichMich/MagicMirror.git
				synced 2025-10-31 10:48:10 +00:00 
			
		
		
		
	Change default for weatherEndpoint according to API 3.0 (#3583)
since API 3.0 is default, weatherEndpoint should be set to "/onecall" Fixes #3574 ATTENTION: since lat / lon defaults to 0 / 0, the weather plugins works after this patch, but shows the weather from https://de.wikipedia.org/wiki/Null_Island if lat / lon is not manually set. --------- Co-authored-by: Karsten Hassel <hassel@gmx.de> Co-authored-by: Pedro Lamas <pedrolamas@gmail.com>
This commit is contained in:
		| @@ -17,10 +17,13 @@ WeatherProvider.register("openweathermap", { | ||||
| 	defaults: { | ||||
| 		apiVersion: "3.0", | ||||
| 		apiBase: "https://api.openweathermap.org/data/", | ||||
| 		weatherEndpoint: "", // can be "onecall", "forecast" or "weather" (for current) | ||||
| 		// weatherEndpoint is "/onecall" since API 3.0 | ||||
| 		// "/onecall", "/forecast" or "/weather" only for pro customers | ||||
| 		weatherEndpoint: "/onecall", | ||||
| 		locationID: false, | ||||
| 		location: false, | ||||
| 		lat: 0, // the onecall endpoint needs lat / lon values, it doesn't support the locationId | ||||
| 		// the /onecall endpoint needs lat / lon values, it doesn't support the locationId | ||||
| 		lat: 0, | ||||
| 		lon: 0, | ||||
| 		apiKey: "" | ||||
| 	}, | ||||
| @@ -90,30 +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": | ||||
| 					this.config.weatherEndpoint = "/onecall"; | ||||
| 					break; | ||||
| 				case "daily": | ||||
| 				case "forecast": | ||||
| 					this.config.weatherEndpoint = "/forecast"; | ||||
| 					break; | ||||
| 				case "current": | ||||
| 					this.config.weatherEndpoint = "/weather"; | ||||
| 					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 | ||||
|   | ||||
		Reference in New Issue
	
	Block a user