mirror of
https://github.com/MichMich/MagicMirror.git
synced 2025-07-01 21:43:26 +00:00
## [2.22.0] - 2023-01-01 Thanks to: @angeldeejay, @buxxi, @dariom, @dWoolridge, @KristjanESPERANTO, @MagMar94, @naveensrinivasan, @retroflex, @SkySails and @Tom. Special thanks to @khassel, @rejas and @sdetweil for taking over most (if not all) of the work on this release as project collaborators. This version would not be there without their effort. Thank you! ### Added - Added test for remoteFile option in compliments module - Added hourlyWeather functionality to Weather.gov weather provider - Removed weatherEndpoint definition from weathergov.js (not used) - Added css class names "today" and "tomorrow" for default calendar - Added Collaboration.md - Added new github action for dependency review (#2862) - Added a WeatherProvider for Open-Meteo - Added Yr as a weather provider - Added config options "ignoreXOriginHeader" and "ignoreContentSecurityPolicy" ### Removed - Removed usage of internal fetch function of node until it is more stable ### Updated - Cleaned up test directory (#2937) and jest config (#2959) - Wait for all modules to start before declaring the system ready (#2487) - Updated e2e tests (moved `done()` in helper functions) and use es6 syntax in all tests - Updated da translation - Rework weather module - Make sure smhi provider api only gets a maximum of 6 digits coordinates (#2955) - Use fetch instead of XMLHttpRequest in weatherprovider (#2935) - Reworked how weatherproviders handle units (#2849) - Use unix() method for parsing times, fix suntimes on the way (#2950) - Refactor conversion functions into utils class (#2958) - The `cors`-method in `server.js` now supports sending and recieving HTTP headers - Replace `…` by `…` - Cleanup compliments module - Updated dependencies including electron to v22 (#2903) ### Fixed - Correctly show apparent temperature in SMHI weather provider - Ensure updatenotification module isn't shown when local is _ahead_ of remote - Handle node_helper errors during startup (#2944) - Possibility to change FontAwesome class in calendar, so icons like `fab fa-facebook-square` works. - Fix cors problems with newsfeed articles (as far as possible), allow disabling cors per feed with option `useCorsProxy: false` (#2840) - Tests not waiting for the application to start and stop before starting the next test - Fix electron tests failing sometimes in github workflow - Fixed gap in clock module when displayed on the left side with displayType=digital - Fixed playwright issue by upgrading to v1.29.1 (#2969) Signed-off-by: naveen <172697+naveensrinivasan@users.noreply.github.com> Co-authored-by: Karsten Hassel <hassel@gmx.de> Co-authored-by: Malte Hallström <46646495+SkySails@users.noreply.github.com> Co-authored-by: Veeck <github@veeck.de> Co-authored-by: veeck <michael@veeck.de> Co-authored-by: dWoolridge <dwoolridge@charter.net> Co-authored-by: Johan <jojjepersson@yahoo.se> Co-authored-by: Dario Mratovich <dario_mratovich@hotmail.com> Co-authored-by: Dario Mratovich <dario.mratovich@outlook.com> Co-authored-by: Magnus <34011212+MagMar94@users.noreply.github.com> Co-authored-by: Naveen <172697+naveensrinivasan@users.noreply.github.com> Co-authored-by: buxxi <buxxi@omfilm.net> Co-authored-by: Thomas Hirschberger <47733292+Tom-Hirschberger@users.noreply.github.com> Co-authored-by: Kristjan ESPERANTO <35647502+KristjanESPERANTO@users.noreply.github.com> Co-authored-by: Andrés Vanegas Jiménez <142350+angeldeejay@users.noreply.github.com>
209 lines
5.7 KiB
JavaScript
209 lines
5.7 KiB
JavaScript
/* global WeatherProvider, WeatherObject */
|
|
|
|
/* MagicMirror²
|
|
* Module: Weather
|
|
* Provider: Weatherbit
|
|
*
|
|
* By Andrew Pometti
|
|
* MIT Licensed
|
|
*
|
|
* This class is a provider for Weatherbit, based on Nicholas Hubbard's class
|
|
* for Dark Sky & Vince Peri's class for Weather.gov.
|
|
*/
|
|
WeatherProvider.register("weatherbit", {
|
|
// Set the name of the provider.
|
|
// Not strictly required, but helps for debugging.
|
|
providerName: "Weatherbit",
|
|
|
|
// Set the default config properties that is specific to this provider
|
|
defaults: {
|
|
apiBase: "https://api.weatherbit.io/v2.0",
|
|
apiKey: "",
|
|
lat: 0,
|
|
lon: 0
|
|
},
|
|
|
|
fetchedLocation: function () {
|
|
return this.fetchedLocationName || "";
|
|
},
|
|
|
|
fetchCurrentWeather() {
|
|
this.fetchData(this.getUrl())
|
|
.then((data) => {
|
|
if (!data || !data.data[0] || typeof data.data[0].temp === "undefined") {
|
|
// No usable data?
|
|
return;
|
|
}
|
|
|
|
const currentWeather = this.generateWeatherDayFromCurrentWeather(data);
|
|
this.setCurrentWeather(currentWeather);
|
|
})
|
|
.catch(function (request) {
|
|
Log.error("Could not load data ... ", request);
|
|
})
|
|
.finally(() => this.updateAvailable());
|
|
},
|
|
|
|
fetchWeatherForecast() {
|
|
this.fetchData(this.getUrl())
|
|
.then((data) => {
|
|
if (!data || !data.data) {
|
|
// No usable data?
|
|
return;
|
|
}
|
|
|
|
const forecast = this.generateWeatherObjectsFromForecast(data.data);
|
|
this.setWeatherForecast(forecast);
|
|
|
|
this.fetchedLocationName = data.city_name + ", " + data.state_code;
|
|
})
|
|
.catch(function (request) {
|
|
Log.error("Could not load data ... ", request);
|
|
})
|
|
.finally(() => this.updateAvailable());
|
|
},
|
|
|
|
/**
|
|
* Overrides method for setting config to check if endpoint is correct for hourly
|
|
*
|
|
* @param {object} config The configuration object
|
|
*/
|
|
setConfig(config) {
|
|
this.config = config;
|
|
if (!this.config.weatherEndpoint) {
|
|
switch (this.config.type) {
|
|
case "hourly":
|
|
this.config.weatherEndpoint = "/forecast/hourly";
|
|
break;
|
|
case "daily":
|
|
case "forecast":
|
|
this.config.weatherEndpoint = "/forecast/daily";
|
|
break;
|
|
case "current":
|
|
this.config.weatherEndpoint = "/current";
|
|
break;
|
|
default:
|
|
Log.error("weatherEndpoint not configured and could not resolve it based on type");
|
|
}
|
|
}
|
|
},
|
|
|
|
// Create a URL from the config and base URL.
|
|
getUrl() {
|
|
return `${this.config.apiBase}${this.config.weatherEndpoint}?lat=${this.config.lat}&lon=${this.config.lon}&units=M&key=${this.config.apiKey}`;
|
|
},
|
|
|
|
// Implement WeatherDay generator.
|
|
generateWeatherDayFromCurrentWeather(currentWeatherData) {
|
|
//Calculate TZ Offset and invert to convert Sunrise/Sunset times to Local
|
|
const d = new Date();
|
|
let tzOffset = d.getTimezoneOffset();
|
|
tzOffset = tzOffset * -1;
|
|
|
|
const currentWeather = new WeatherObject();
|
|
|
|
currentWeather.date = moment.unix(currentWeatherData.data[0].ts);
|
|
currentWeather.humidity = parseFloat(currentWeatherData.data[0].rh);
|
|
currentWeather.temperature = parseFloat(currentWeatherData.data[0].temp);
|
|
currentWeather.windSpeed = parseFloat(currentWeatherData.data[0].wind_spd);
|
|
currentWeather.windDirection = currentWeatherData.data[0].wind_dir;
|
|
currentWeather.weatherType = this.convertWeatherType(currentWeatherData.data[0].weather.icon);
|
|
currentWeather.sunrise = moment(currentWeatherData.data[0].sunrise, "HH:mm").add(tzOffset, "m");
|
|
currentWeather.sunset = moment(currentWeatherData.data[0].sunset, "HH:mm").add(tzOffset, "m");
|
|
|
|
this.fetchedLocationName = currentWeatherData.data[0].city_name + ", " + currentWeatherData.data[0].state_code;
|
|
|
|
return currentWeather;
|
|
},
|
|
|
|
generateWeatherObjectsFromForecast(forecasts) {
|
|
const days = [];
|
|
|
|
for (const forecast of forecasts) {
|
|
const weather = new WeatherObject();
|
|
|
|
weather.date = moment(forecast.datetime, "YYYY-MM-DD");
|
|
weather.minTemperature = forecast.min_temp;
|
|
weather.maxTemperature = forecast.max_temp;
|
|
weather.precipitation = forecast.precip;
|
|
weather.weatherType = this.convertWeatherType(forecast.weather.icon);
|
|
|
|
days.push(weather);
|
|
}
|
|
|
|
return days;
|
|
},
|
|
|
|
// Map icons from Dark Sky to our icons.
|
|
convertWeatherType(weatherType) {
|
|
const weatherTypes = {
|
|
t01d: "day-thunderstorm",
|
|
t01n: "night-alt-thunderstorm",
|
|
t02d: "day-thunderstorm",
|
|
t02n: "night-alt-thunderstorm",
|
|
t03d: "thunderstorm",
|
|
t03n: "thunderstorm",
|
|
t04d: "day-thunderstorm",
|
|
t04n: "night-alt-thunderstorm",
|
|
t05d: "day-sleet-storm",
|
|
t05n: "night-alt-sleet-storm",
|
|
d01d: "day-sprinkle",
|
|
d01n: "night-alt-sprinkle",
|
|
d02d: "day-sprinkle",
|
|
d02n: "night-alt-sprinkle",
|
|
d03d: "day-shower",
|
|
d03n: "night-alt-shower",
|
|
r01d: "day-shower",
|
|
r01n: "night-alt-shower",
|
|
r02d: "day-rain",
|
|
r02n: "night-alt-rain",
|
|
r03d: "day-rain",
|
|
r03n: "night-alt-rain",
|
|
r04d: "day-sprinkle",
|
|
r04n: "night-alt-sprinkle",
|
|
r05d: "day-shower",
|
|
r05n: "night-alt-shower",
|
|
r06d: "day-shower",
|
|
r06n: "night-alt-shower",
|
|
f01d: "day-sleet",
|
|
f01n: "night-alt-sleet",
|
|
s01d: "day-snow",
|
|
s01n: "night-alt-snow",
|
|
s02d: "day-snow-wind",
|
|
s02n: "night-alt-snow-wind",
|
|
s03d: "snowflake-cold",
|
|
s03n: "snowflake-cold",
|
|
s04d: "day-rain-mix",
|
|
s04n: "night-alt-rain-mix",
|
|
s05d: "day-sleet",
|
|
s05n: "night-alt-sleet",
|
|
s06d: "day-snow",
|
|
s06n: "night-alt-snow",
|
|
a01d: "day-haze",
|
|
a01n: "dust",
|
|
a02d: "smoke",
|
|
a02n: "smoke",
|
|
a03d: "day-haze",
|
|
a03n: "dust",
|
|
a04d: "dust",
|
|
a04n: "dust",
|
|
a05d: "day-fog",
|
|
a05n: "night-fog",
|
|
a06d: "fog",
|
|
a06n: "fog",
|
|
c01d: "day-sunny",
|
|
c01n: "night-clear",
|
|
c02d: "day-sunny-overcast",
|
|
c02n: "night-alt-partly-cloudy",
|
|
c03d: "day-cloudy",
|
|
c03n: "night-alt-cloudy",
|
|
c04d: "cloudy",
|
|
c04n: "cloudy",
|
|
u00d: "rain-mix",
|
|
u00n: "rain-mix"
|
|
};
|
|
|
|
return weatherTypes.hasOwnProperty(weatherType) ? weatherTypes[weatherType] : null;
|
|
}
|
|
});
|