kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-07-02 05:53:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2185 from Sub028/master

Browse Source 
Weather config enhancement
This commit is contained in:
Michael Teeuw 2020-12-08 15:51:41 +01:00 committed by GitHub
commit d43679d59e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/default/weather/current.njk
View File

@ -9,7 +9,11 @@
{% if config.useBeaufort %} {% if config.useBeaufort %}
{{ current.beaufortWindSpeed() | round }} {{ current.beaufortWindSpeed() | round }}
{% else %} {% else %}
{{ current.windSpeed | round }} {% if config.useKmh %}
{{ current.kmhWindSpeed() | round }}
{% else %}
{{ current.windSpeed | round }}
{% endif %}
{% endif %} {% endif %}
{% if config.showWindDirection %} {% if config.showWindDirection %}
<sup> <sup>

1
modules/default/weather/weather.js
View File

@ -18,6 +18,7 @@ Module.register("weather", {
location: false, location: false,
locationID: false, locationID: false,
units: config.units, units: config.units,
useKmh: false,
tempUnits: config.units, tempUnits: config.units,
windUnits: config.units, windUnits: config.units,

5
modules/default/weather/weatherobject.js
View File

@ -77,6 +77,11 @@ class WeatherObject {
return 12; return 12;
} }
kmhWindSpeed() {
const windInKmh = this.windUnits === "imperial" ? this.windSpeed * 1.609344 : (this.windSpeed * 60 * 60) / 1000;
return windInKmh;
}
nextSunAction() { nextSunAction() {
return moment().isBetween(this.sunrise, this.sunset) ? "sunset" : "sunrise"; return moment().isBetween(this.sunrise, this.sunset) ? "sunset" : "sunrise";
} }