kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-06-29 12:39:45 +00:00
Code Issues Projects Releases Wiki Activity

added comments

Browse Source
This commit is contained in:
fwitte 2019-01-04 12:13:39 +01:00
parent 2156aac046
commit b55685d610
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -87,16 +87,21 @@ WeatherProvider.register("openweathermap", {
* Generate WeatherObjects based on forecast information * Generate WeatherObjects based on forecast information
*/ */
generateWeatherObjectsFromForecast(forecasts) { generateWeatherObjectsFromForecast(forecasts) {
// initial variable declaration
const days = []; const days = [];
// variables for temperature range and rain
var minTemp = []; var minTemp = [];
var maxTemp = []; var maxTemp = [];
var rain = 0; var rain = 0;
// variable for date
let date = ""; let date = "";
var weather = new WeatherObject(this.config.units); var weather = new WeatherObject(this.config.units);
for (const forecast of forecasts) { for (const forecast of forecasts) {
if (date === moment(forecast.dt, "X").format("YYYY-MM-DD")) { if (date === moment(forecast.dt, "X").format("YYYY-MM-DD")) {
// the same day as before
// add values from forecast to corresponding variables
minTemp.push(forecast.main.temp_min); minTemp.push(forecast.main.temp_min);
maxTemp.push(forecast.main.temp_max); maxTemp.push(forecast.main.temp_max);
if (this.config.units === "imperial" && !isNaN(forecast.rain["3h"])) { if (this.config.units === "imperial" && !isNaN(forecast.rain["3h"])) {
@ -105,20 +110,30 @@ WeatherProvider.register("openweathermap", {
rain += forecast.rain["3h"]; rain += forecast.rain["3h"];
} }
} else { } else {
// a new day
// calculate minimum/maximum temperature, specify rain amount
weather.minTemperature = Math.min.apply(null, minTemp); weather.minTemperature = Math.min.apply(null, minTemp);
weather.maxTemperature = Math.max.apply(null, maxTemp); weather.maxTemperature = Math.max.apply(null, maxTemp);
weather.rain = rain; weather.rain = rain;
// push weather information to days array
days.push(weather); days.push(weather);
// create new weather-object
weather = new WeatherObject(this.config.units); weather = new WeatherObject(this.config.units);
minTemp = []; minTemp = [];
maxTemp = []; maxTemp = [];
rain *= 0; rain *= 0;
// set new date
date = moment(forecast.dt, "X").format("YYYY-MM-DD"); date = moment(forecast.dt, "X").format("YYYY-MM-DD");
// specify date
weather.date = moment(forecast.dt, "X"); weather.date = moment(forecast.dt, "X");
// select weather type by first forecast value of a day, is this reasonable?
weather.weatherType = this.convertWeatherType(forecast.weather[0].icon); weather.weatherType = this.convertWeatherType(forecast.weather[0].icon);
// add values from first forecast of this day to corresponding variables
minTemp.push(forecast.main.temp_min); minTemp.push(forecast.main.temp_min);
maxTemp.push(forecast.main.temp_max); maxTemp.push(forecast.main.temp_max);
if (this.config.units === "imperial" && !isNaN(forecast.rain["3h"])) { if (this.config.units === "imperial" && !isNaN(forecast.rain["3h"])) {