kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-06-27 19:53:36 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2477 from PostLogical/openweathermaplatlon

Browse Source 
Allowing openweathermap config lat and lon to function without onecall, overrides locationID and location since more specific.
This commit is contained in:
Michael Teeuw 2021-03-13 19:20:59 +01:00 committed by GitHub
commit 6583f05858
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -55,6 +55,7 @@ _This release is scheduled to be released on 2021-04-01._
- Fix socket.io backward compatibility with socket v2 clients - Fix socket.io backward compatibility with socket v2 clients
- 3rd party module language loading if language is English - 3rd party module language loading if language is English
- Fix e2e tests after spectron update - Fix e2e tests after spectron update
- Fix weather module openweathermap not loading if lat and lon set without onecall.
## [2.14.0] - 2021-01-01 ## [2.14.0] - 2021-01-01

2
modules/default/weather/providers/openweathermap.js
View File

@ -465,6 +465,8 @@ WeatherProvider.register("openweathermap", {
} else { } else {
params += "&exclude=minutely"; params += "&exclude=minutely";
} }
} else if (this.config.lat && this.config.lon) {
params += "lat=" + this.config.lat + "&lon=" + this.config.lon;
} else if (this.config.locationID) { } else if (this.config.locationID) {
params += "id=" + this.config.locationID; params += "id=" + this.config.locationID;
} else if (this.config.location) { } else if (this.config.location) {