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 #1176 from relm923/forecast_max_days

Browse Source 
Forecast - Max Days
This commit is contained in:
Michael Teeuw 2018-03-25 14:53:30 +02:00 committed by GitHub
commit d0ecde3277
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -17,6 +17,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
- Add advanced filtering to the excludedEvents configuration of the default calendar module - Add advanced filtering to the excludedEvents configuration of the default calendar module
- New currentweather module config option: `showFeelsLike`: Shows how it actually feels like. (wind chill or heat index) - New currentweather module config option: `showFeelsLike`: Shows how it actually feels like. (wind chill or heat index)
- New currentweather module config option: `useKMPHwind`: adds an option to see wind speed in Kmph instead of just m/s or Beaufort. - New currentweather module config option: `useKMPHwind`: adds an option to see wind speed in Kmph instead of just m/s or Beaufort.
- Add dc:date to parsing in newsfeed module, which allows parsing of more rss feeds.
### Changed ### Changed
- Add link to GitHub repository which contains the respective Dockerfile. - Add link to GitHub repository which contains the respective Dockerfile.
@ -26,7 +27,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
### Fixed ### Fixed
- News article in fullscreen (iframe) is now shown in front of modules. - News article in fullscreen (iframe) is now shown in front of modules.
- Add dc:date to parsing in newsfeed module, which allows parsing of more rss feeds. - Forecast respects maxNumberOfDays regardless of endpoint.
*This release is scheduled to be released on 2018-04-01.* *This release is scheduled to be released on 2018-04-01.*

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

@ -259,7 +259,6 @@ Module.register("weatherforecast",{
if (self.config.forecastEndpoint == "forecast/daily") { if (self.config.forecastEndpoint == "forecast/daily") {
self.config.forecastEndpoint = "forecast"; self.config.forecastEndpoint = "forecast";
self.config.maxNumberOfDays = self.config.maxNumberOfDays * 8;
Log.warn(self.name + ": Your AppID does not support long term forecasts. Switching to fallback endpoint."); Log.warn(self.name + ": Your AppID does not support long term forecasts. Switching to fallback endpoint.");
} }
@ -298,12 +297,6 @@ Module.register("weatherforecast",{
params += "&units=" + this.config.units; params += "&units=" + this.config.units;
params += "&lang=" + this.config.lang; params += "&lang=" + this.config.lang;
/*
* Submit a specific number of days to forecast, between 1 to 16 days.
* The OpenWeatherMap API properly handles values outside of the 1 - 16 range and returns 7 days by default.
* This is simply being pedantic and doing it ourselves.
*/
params += "&cnt=" + (((this.config.maxNumberOfDays < 1) || (this.config.maxNumberOfDays > 16)) ? 7 * 8 : this.config.maxNumberOfDays);
params += "&APPID=" + this.config.appid; params += "&APPID=" + this.config.appid;
return params; return params;
@ -354,6 +347,11 @@ Module.register("weatherforecast",{
this.forecast.push(forecastData); this.forecast.push(forecastData);
lastDay = day; lastDay = day;
// Stop processing when maxNumberOfDays is reached
if (this.forecast.length === this.config.maxNumberOfDays) {
break;
}
} else { } else {
//Log.log("Compare max: ", forecast.temp.max, parseFloat(forecastData.maxTemp)); //Log.log("Compare max: ", forecast.temp.max, parseFloat(forecastData.maxTemp));
forecastData.maxTemp = forecast.temp.max > parseFloat(forecastData.maxTemp) ? this.roundValue(forecast.temp.max) : forecastData.maxTemp; forecastData.maxTemp = forecast.temp.max > parseFloat(forecastData.maxTemp) ? this.roundValue(forecast.temp.max) : forecastData.maxTemp;