mirror of
https://github.com/MichMich/MagicMirror.git
synced 2025-06-27 11:50:00 +00:00
bf279d9a57
Fixes #2953 This is an attempt to fix the issue with precipitation amount and percentage mixup. I have created a separate `precipitationPercentage`-variable where the probability of rain can be stored. The config options now has the old `showPrecipitationAmount` in addition to a new setting: `showPrecipitationProbability` (shows the likelihood of rain). <details> <summary>Examples</summary> ### Yr I tested the Yr weather provider for a Norwegian city Bergen that has a lot of rain. I have removed properties that are irrelevant for this demo from the config-samples below. Config: ```js { module: "weather", config: { weatherProvider: "yr", type: "current", showPrecipitationAmount: true, showPrecipitationProbability: true } }, { module: "weather", config: { weatherProvider: "yr", type: "hourly", showPrecipitationAmount: true, showPrecipitationProbability: true } }, { module: "weather", config: { weatherProvider: "yr", type: "daily", showPrecipitationAmount: true, showPrecipitationProbability: true } } ``` Result:<br/> <img width="444" alt="screenshot" src="https://user-images.githubusercontent.com/34011212/216775423-4e37345c-f915-47e5-8551-7c544ebd24b1.png"> </details> --------- Co-authored-by: Magnus Marthinsen <magmar@online.no> Co-authored-by: Veeck <github@veeck.de>
78 lines
2.4 KiB
JavaScript
78 lines
2.4 KiB
JavaScript
/* global WeatherProvider, WeatherObject, WeatherUtils */
|
|
|
|
/* MagicMirror²
|
|
* Module: Weather
|
|
* Provider: Weatherflow
|
|
*
|
|
* By Tobias Dreyem https://github.com/10bias
|
|
* MIT Licensed
|
|
*
|
|
* This class is a provider for Weatherflow.
|
|
* Note that the Weatherflow API does not provide snowfall.
|
|
*/
|
|
|
|
WeatherProvider.register("weatherflow", {
|
|
// Set the name of the provider.
|
|
// Not strictly required, but helps for debugging
|
|
providerName: "WeatherFlow",
|
|
|
|
// Set the default config properties that is specific to this provider
|
|
defaults: {
|
|
apiBase: "https://swd.weatherflow.com/swd/rest/",
|
|
token: "",
|
|
stationid: ""
|
|
},
|
|
|
|
fetchCurrentWeather() {
|
|
this.fetchData(this.getUrl())
|
|
.then((data) => {
|
|
const currentWeather = new WeatherObject();
|
|
currentWeather.date = moment();
|
|
|
|
currentWeather.humidity = data.current_conditions.relative_humidity;
|
|
currentWeather.temperature = data.current_conditions.air_temperature;
|
|
currentWeather.windSpeed = WeatherUtils.convertWindToMs(data.current_conditions.wind_avg);
|
|
currentWeather.windFromDirection = data.current_conditions.wind_direction;
|
|
currentWeather.weatherType = data.forecast.daily[0].icon;
|
|
currentWeather.sunrise = moment.unix(data.forecast.daily[0].sunrise);
|
|
currentWeather.sunset = moment.unix(data.forecast.daily[0].sunset);
|
|
this.setCurrentWeather(currentWeather);
|
|
})
|
|
.catch(function (request) {
|
|
Log.error("Could not load data ... ", request);
|
|
})
|
|
.finally(() => this.updateAvailable());
|
|
},
|
|
|
|
fetchWeatherForecast() {
|
|
this.fetchData(this.getUrl())
|
|
.then((data) => {
|
|
const days = [];
|
|
|
|
for (const forecast of data.forecast.daily) {
|
|
const weather = new WeatherObject();
|
|
|
|
weather.date = moment.unix(forecast.day_start_local);
|
|
weather.minTemperature = forecast.air_temp_low;
|
|
weather.maxTemperature = forecast.air_temp_high;
|
|
weather.precipitationProbability = forecast.precip_probability;
|
|
weather.weatherType = forecast.icon;
|
|
weather.snow = 0;
|
|
|
|
days.push(weather);
|
|
}
|
|
|
|
this.setWeatherForecast(days);
|
|
})
|
|
.catch(function (request) {
|
|
Log.error("Could not load data ... ", request);
|
|
})
|
|
.finally(() => this.updateAvailable());
|
|
},
|
|
|
|
// Create a URL from the config and base URL.
|
|
getUrl() {
|
|
return `${this.config.apiBase}better_forecast?station_id=${this.config.stationid}&units_temp=c&units_wind=kph&units_pressure=mb&units_precip=mm&units_distance=km&token=${this.config.token}`;
|
|
}
|
|
});
|