mirror of
https://github.com/MichMich/MagicMirror.git
synced 2025-06-27 17:01:08 -04:00
## [2.29.0] - 2024-10-01 Thanks to: @bugsounet, @dkallen78, @jargordon, @khassel, @KristjanESPERANTO, @MarcLandis, @rejas, @ryan-d-williams, @sdetweil, @skpanagiotis. > ⚠️ This release needs nodejs version `v20` or `v22`, minimum version is `v20.9.0` ### Added - [compliments] Added support for cron type date/time format entries mm hh DD MM dow (minutes/hours/days/months and day of week) see https://crontab.cronhub.io for construction (#3481) - [core] Check config at every start of MagicMirror² (#3450) - [core] Add spelling check (cspell): `npm run test:spelling` and handle spelling issues (#3544) - [core] removed `config.paths.vendor` (could not work because `vendor` is hardcoded in `index.html`), renamed `config.paths.modules` to `config.foreignModulesDir`, added variable `MM_CUSTOMCSS_FILE` which - if set - overrides `config.customCss`, added variable `MM_MODULES_DIR` which - if set - overrides `config.foreignModulesDir`, added test for `MM_MODULES_DIR` (#3530) - [core] elements are now removed from `index.html` when loading script or stylesheet files fails - [core] Added `MODULE_DOM_UPDATED` notification each time the DOM is re-rendered via `updateDom` (#3534) - [tests] added minimal needed node version to tests (currently v20.9.0) to avoid releases with wrong node version info - [tests] Added `node-libgpiod` library to electron-rebuild tests (#3563) ### Removed - [core] removed installer only files (#3492) - [core] removed raspberry object from systeminformation (#3505) - [linter] removed `eslint-plugin-import`, because it doesn't support ESLint v9. We will reenter it later when it does. - [tests] removed `onoff` library from electron-rebuild tests (#3563) ### Updated - [weather] Updated `apiVersion` default from 2.5 to 3.0 (#3424) - [core] Updated dependencies including stylistic-eslint - [core] nail down `node-ical` version to `0.18.0` with exception `allow-ghsas: GHSA-8hc4-vh64-cxmj` in `dep-review.yaml` (which should removed after next `node-ical` update) - [core] Updated SocketIO catch all to new API - [core] Allow custom modules positions by scanning index.html for the defined regions, instead of hard coded (PR #3518 fixes issue #3504) - [core] Detail optimizations in `config_check.js` - [core] Updated minimal needed node version in `package.json` (currently v20.9.0) (#3559) and except for v21 (no security updates) (#3561) - [linter] Switch to ESLint v9 and flat config and replace `eslint-plugin-unicorn` by `@eslint/js` - [core] fix discovering module positions twice after #3450 ### Fixed - Fixed `checks` badge in README.md - [weather] Fixed issue with the UK Met Office provider following a change in their API paths and header info. - [core] add check for node_helper loading for multiple instances of same module (#3502) - [weather] Fixed issue for respecting unit config on broadcasted notifications - [tests] Fixes calendar test by moving it from e2e to electron with fixed date (#3532) - [calendar] fixed sliceMultiDayEvents getting wrong count and displaying incorrect entries, Europe/Berlin (#3542) - [tests] ignore `js/positions.js` when linting (this file is created at runtime) - [calendar] fixed sliceMultiDayEvents showing previous day without config enabled --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Michael Teeuw <michael@xonaymedia.nl> Co-authored-by: Kristjan ESPERANTO <35647502+KristjanESPERANTO@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Ross Younger <crazyscot@gmail.com> Co-authored-by: Veeck <github@veeck.de> Co-authored-by: Bugsounet - Cédric <github@bugsounet.fr> Co-authored-by: jkriegshauser <joshuakr@nvidia.com> Co-authored-by: illimarkangur <116028111+illimarkangur@users.noreply.github.com> Co-authored-by: sam detweiler <sdetweil@gmail.com> Co-authored-by: vppencilsharpener <tim.pray@gmail.com> Co-authored-by: veeck <michael.veeck@nebenan.de> Co-authored-by: Paranoid93 <6515818+Paranoid93@users.noreply.github.com> Co-authored-by: Brian O'Connor <btoconnor@users.noreply.github.com> Co-authored-by: WallysWellies <59727507+WallysWellies@users.noreply.github.com> Co-authored-by: Jason Stieber <jrstieber@gmail.com> Co-authored-by: jargordon <50050429+jargordon@users.noreply.github.com> Co-authored-by: Daniel <32464403+dkallen78@users.noreply.github.com> Co-authored-by: Ryan Williams <65094007+ryan-d-williams@users.noreply.github.com> Co-authored-by: Panagiotis Skias <panagiotis.skias@gmail.com> Co-authored-by: Marc Landis <dirk.rettschlag@gmail.com>
211 lines
6.3 KiB
JavaScript
211 lines
6.3 KiB
JavaScript
/* global WeatherProvider, WeatherObject, WeatherUtils */
|
|
|
|
/*
|
|
* This class is a provider for UK Met Office Datapoint,
|
|
* see https://www.metoffice.gov.uk/
|
|
*/
|
|
WeatherProvider.register("ukmetoffice", {
|
|
|
|
/*
|
|
* Set the name of the provider.
|
|
* This isn't strictly necessary, since it will fallback to the provider identifier
|
|
* But for debugging (and future alerts) it would be nice to have the real name.
|
|
*/
|
|
providerName: "UK Met Office",
|
|
|
|
// Set the default config properties that is specific to this provider
|
|
defaults: {
|
|
apiBase: "http://datapoint.metoffice.gov.uk/public/data/val/wxfcs/all/json/",
|
|
locationID: false,
|
|
apiKey: ""
|
|
},
|
|
|
|
// Overwrite the fetchCurrentWeather method.
|
|
fetchCurrentWeather () {
|
|
this.fetchData(this.getUrl("3hourly"))
|
|
.then((data) => {
|
|
if (!data || !data.SiteRep || !data.SiteRep.DV || !data.SiteRep.DV.Location || !data.SiteRep.DV.Location.Period || data.SiteRep.DV.Location.Period.length === 0) {
|
|
|
|
/*
|
|
* Did not receive usable new data.
|
|
* Maybe this needs a better check?
|
|
*/
|
|
return;
|
|
}
|
|
|
|
this.setFetchedLocation(`${data.SiteRep.DV.Location.name}, ${data.SiteRep.DV.Location.country}`);
|
|
|
|
const currentWeather = this.generateWeatherObjectFromCurrentWeather(data);
|
|
this.setCurrentWeather(currentWeather);
|
|
})
|
|
.catch(function (request) {
|
|
Log.error("Could not load data ... ", request);
|
|
})
|
|
.finally(() => this.updateAvailable());
|
|
},
|
|
|
|
// Overwrite the fetchCurrentWeather method.
|
|
fetchWeatherForecast () {
|
|
this.fetchData(this.getUrl("daily"))
|
|
.then((data) => {
|
|
if (!data || !data.SiteRep || !data.SiteRep.DV || !data.SiteRep.DV.Location || !data.SiteRep.DV.Location.Period || data.SiteRep.DV.Location.Period.length === 0) {
|
|
|
|
/*
|
|
* Did not receive usable new data.
|
|
* Maybe this needs a better check?
|
|
*/
|
|
return;
|
|
}
|
|
|
|
this.setFetchedLocation(`${data.SiteRep.DV.Location.name}, ${data.SiteRep.DV.Location.country}`);
|
|
|
|
const forecast = this.generateWeatherObjectsFromForecast(data);
|
|
this.setWeatherForecast(forecast);
|
|
})
|
|
.catch(function (request) {
|
|
Log.error("Could not load data ... ", request);
|
|
})
|
|
.finally(() => this.updateAvailable());
|
|
},
|
|
|
|
/** UK Met Office Specific Methods - These are not part of the default provider methods */
|
|
/*
|
|
* Gets the complete url for the request
|
|
*/
|
|
getUrl (forecastType) {
|
|
return this.config.apiBase + this.config.locationID + this.getParams(forecastType);
|
|
},
|
|
|
|
/*
|
|
* Generate a WeatherObject based on currentWeatherInformation
|
|
*/
|
|
generateWeatherObjectFromCurrentWeather (currentWeatherData) {
|
|
const currentWeather = new WeatherObject();
|
|
const location = currentWeatherData.SiteRep.DV.Location;
|
|
|
|
// data times are always UTC
|
|
let nowUtc = moment.utc();
|
|
let midnightUtc = nowUtc.clone().startOf("day");
|
|
let timeInMins = nowUtc.diff(midnightUtc, "minutes");
|
|
|
|
// loop round each of the (5) periods, look for today (the first period may be yesterday)
|
|
for (const period of location.Period) {
|
|
const periodDate = moment.utc(period.value.substr(0, 10), "YYYY-MM-DD");
|
|
|
|
// ignore if period is before today
|
|
if (periodDate.isSameOrAfter(moment.utc().startOf("day"))) {
|
|
// check this is the period we want, after today the diff will be -ve
|
|
if (moment().diff(periodDate, "minutes") > 0) {
|
|
|
|
/*
|
|
* loop round the reports looking for the one we are in
|
|
* $ value specifies the time in minutes-of-the-day: 0, 180, 360,...1260
|
|
*/
|
|
for (const rep of period.Rep) {
|
|
const p = rep.$;
|
|
if (timeInMins >= p && timeInMins - 180 < p) {
|
|
// finally got the one we want, so populate weather object
|
|
currentWeather.humidity = rep.H;
|
|
currentWeather.temperature = rep.T;
|
|
currentWeather.feelsLikeTemp = rep.F;
|
|
currentWeather.precipitationProbability = parseInt(rep.Pp);
|
|
currentWeather.windSpeed = WeatherUtils.convertWindToMetric(rep.S);
|
|
currentWeather.windFromDirection = WeatherUtils.convertWindDirection(rep.D);
|
|
currentWeather.weatherType = this.convertWeatherType(rep.W);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
// determine the sunrise/sunset times - not supplied in UK Met Office data
|
|
currentWeather.updateSunTime(location.lat, location.lon);
|
|
|
|
return currentWeather;
|
|
},
|
|
|
|
/*
|
|
* Generate WeatherObjects based on forecast information
|
|
*/
|
|
generateWeatherObjectsFromForecast (forecasts) {
|
|
const days = [];
|
|
|
|
/*
|
|
* loop round the (5) periods getting the data
|
|
* for each period array, Day is [0], Night is [1]
|
|
*/
|
|
for (const period of forecasts.SiteRep.DV.Location.Period) {
|
|
const weather = new WeatherObject();
|
|
|
|
// data times are always UTC
|
|
const dateStr = period.value;
|
|
let periodDate = moment.utc(dateStr.substr(0, 10), "YYYY-MM-DD");
|
|
|
|
// ignore if period is before today
|
|
if (periodDate.isSameOrAfter(moment.utc().startOf("day"))) {
|
|
// populate the weather object
|
|
weather.date = moment.utc(dateStr.substr(0, 10), "YYYY-MM-DD");
|
|
weather.minTemperature = period.Rep[1].Nm;
|
|
weather.maxTemperature = period.Rep[0].Dm;
|
|
weather.weatherType = this.convertWeatherType(period.Rep[0].W);
|
|
weather.precipitationProbability = parseInt(period.Rep[0].PPd);
|
|
|
|
days.push(weather);
|
|
}
|
|
}
|
|
|
|
return days;
|
|
},
|
|
|
|
/*
|
|
* Convert the Met Office icons to a more usable name.
|
|
*/
|
|
convertWeatherType (weatherType) {
|
|
const weatherTypes = {
|
|
0: "night-clear",
|
|
1: "day-sunny",
|
|
2: "night-alt-cloudy",
|
|
3: "day-cloudy",
|
|
5: "fog",
|
|
6: "fog",
|
|
7: "cloudy",
|
|
8: "cloud",
|
|
9: "night-sprinkle",
|
|
10: "day-sprinkle",
|
|
11: "raindrops",
|
|
12: "sprinkle",
|
|
13: "night-alt-showers",
|
|
14: "day-showers",
|
|
15: "rain",
|
|
16: "night-alt-sleet",
|
|
17: "day-sleet",
|
|
18: "sleet",
|
|
19: "night-alt-hail",
|
|
20: "day-hail",
|
|
21: "hail",
|
|
22: "night-alt-snow",
|
|
23: "day-snow",
|
|
24: "snow",
|
|
25: "night-alt-snow",
|
|
26: "day-snow",
|
|
27: "snow",
|
|
28: "night-alt-thunderstorm",
|
|
29: "day-thunderstorm",
|
|
30: "thunderstorm"
|
|
};
|
|
|
|
return weatherTypes.hasOwnProperty(weatherType) ? weatherTypes[weatherType] : null;
|
|
},
|
|
|
|
/**
|
|
* Generates an url with api parameters based on the config.
|
|
* @param {string} forecastType daily or 3hourly forecast
|
|
* @returns {string} url
|
|
*/
|
|
getParams (forecastType) {
|
|
let params = "?";
|
|
params += `res=${forecastType}`;
|
|
params += `&key=${this.config.apiKey}`;
|
|
return params;
|
|
}
|
|
});
|