kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-08-21 12:55:22 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1024 from roramirez/openweathermap-forescast

Browse Source 
Hack fix issue #1017
This commit is contained in:
Michael Teeuw
2017-09-28 14:44:13 +02:00
committed by GitHub
parent 3237af2d85 58b763e935
commit 5fde095a6f
1 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
modules/default/weatherforecast/weatherforecast.js
View File

@@ -252,7 +252,11 @@ Module.register("weatherforecast",{
} else if (this.status === 401) { } else if (this.status === 401) {
self.updateDom(self.config.animationSpeed); self.updateDom(self.config.animationSpeed);
Log.error(self.name + ": Incorrect APPID."); if (self.config.forecastEndpoint == "forecast/daily") {
self.config.forecastEndpoint = "forecast";
Log.error(self.name + ": Incorrect APPID.");
}
retry = true; retry = true;
} else { } else {
Log.error(self.name + ": Could not load weather."); Log.error(self.name + ": Could not load weather.");
@@ -299,6 +303,20 @@ Module.register("weatherforecast",{
return params; return params;
}, },
/*
* parserDataWeather(data)
*
* Use the parse to keep the same struct between daily and forecast Endpoint
* from Openweather
*
*/
parserDataWeather: function(data) {
if (data.hasOwnProperty("main")) {
data["temp"] = {"min": data.main.temp_min, "max": data.main.temp_max}
}
return data;
},
/* processWeather(data) /* processWeather(data)
* Uses the received data to set the various values. * Uses the received data to set the various values.
* *
@@ -311,6 +329,7 @@ Module.register("weatherforecast",{
for (var i = 0, count = data.list.length; i < count; i++) { for (var i = 0, count = data.list.length; i < count; i++) {
var forecast = data.list[i]; var forecast = data.list[i];
this.parserDataWeather(forecast); // hack issue #1017
this.forecast.push({ this.forecast.push({
day: moment(forecast.dt, "X").format("ddd"), day: moment(forecast.dt, "X").format("ddd"),