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

Merge pull request #872 from Arkkimaagi/patch-2

Browse Source 
Support showing wind direction with an arrow
This commit is contained in:
Michael Teeuw 2017-05-01 14:29:23 +02:00 committed by GitHub
commit 08d841f6c5
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -17,11 +17,11 @@ This project adheres to [Semantic Versioning](http://semver.org/).
- Add test of match current week number on clock module with showWeek configuration. - Add test of match current week number on clock module with showWeek configuration.
- Add test default modules present modules/default/defaultmodules.js. - Add test default modules present modules/default/defaultmodules.js.
- Add unit test calendar_modules function capFirst. - Add unit test calendar_modules function capFirst.
- Add support for showing wind direction as an arrow instead of abbreviation in currentWeather module.
- Add support for writing translation fucntions to support flexible word order - Add support for writing translation fucntions to support flexible word order
- Add test for check if exits the directories present in defaults modules. - Add test for check if exits the directories present in defaults modules.
- Add ability for `currentweather` module to display indoor temperature via INDOOR_TEMPERATURE notification - Add ability for `currentweather` module to display indoor temperature via INDOOR_TEMPERATURE notification
### Updated ### Updated
- Added missing keys to Polish translation. - Added missing keys to Polish translation.
- Added missing key to German translation. - Added missing key to German translation.

1
modules/default/currentweather/README.md
View File

@ -40,6 +40,7 @@ The following properties can be configured:
| `showPeriod` | Show the period (am/pm) with 12 hour format <br><br> **Possible values:** `true` or `false` <br> **Default value:** `true` | `showPeriod` | Show the period (am/pm) with 12 hour format <br><br> **Possible values:** `true` or `false` <br> **Default value:** `true`
| `showPeriodUpper` | Show the period (AM/PM) with 12 hour format as uppercase <br><br> **Possible values:** `true` or `false` <br> **Default value:** `false` | `showPeriodUpper` | Show the period (AM/PM) with 12 hour format as uppercase <br><br> **Possible values:** `true` or `false` <br> **Default value:** `false`
| `showWindDirection` | Show the wind direction next to the wind speed. <br><br> **Possible values:** `true` or `false` <br> **Default value:** `true` | `showWindDirection` | Show the wind direction next to the wind speed. <br><br> **Possible values:** `true` or `false` <br> **Default value:** `true`
| `showWindDirectionAsArrow` | Show the wind direction as an arrow instead of abbreviation <br><br> **Possible values:** `true` or `false` <br> **Default value:** `false`
| `showHumidity` | Show the current humidity <br><br> **Possible values:** `true` or `false` <br> **Default value:** `false` | `showHumidity` | Show the current humidity <br><br> **Possible values:** `true` or `false` <br> **Default value:** `false`
| `showIndoorTemperature` | If you have another module that emits the INDOOR_TEMPERATURE notification, the indoor temperature will be displayed <br> **Default value:** `false` | `showIndoorTemperature` | If you have another module that emits the INDOOR_TEMPERATURE notification, the indoor temperature will be displayed <br> **Default value:** `false`
| `onlyTemp` | Show only current Temperature and weather icon. <br><br> **Possible values:** `true` or `false` <br> **Default value:** `false` | `onlyTemp` | Show only current Temperature and weather icon. <br><br> **Possible values:** `true` or `false` <br> **Default value:** `false`

11
modules/default/currentweather/currentweather.js
View File

@ -21,6 +21,7 @@ Module.register("currentweather",{
showPeriod: true, showPeriod: true,
showPeriodUpper: false, showPeriodUpper: false,
showWindDirection: true, showWindDirection: true,
showWindDirectionAsArrow: false,
useBeaufort: true, useBeaufort: true,
lang: config.language, lang: config.language,
showHumidity: false, showHumidity: false,
@ -95,6 +96,7 @@ Module.register("currentweather",{
this.windSpeed = null; this.windSpeed = null;
this.windDirection = null; this.windDirection = null;
this.windDeg = null;
this.sunriseSunsetTime = null; this.sunriseSunsetTime = null;
this.sunriseSunsetIcon = null; this.sunriseSunsetIcon = null;
this.temperature = null; this.temperature = null;
@ -124,7 +126,13 @@ Module.register("currentweather",{
if (this.config.showWindDirection) { if (this.config.showWindDirection) {
var windDirection = document.createElement("sup"); var windDirection = document.createElement("sup");
windDirection.innerHTML = " " + this.translate(this.windDirection); if (this.config.showWindDirectionAsArrow) {
if(this.windDeg !== null) {
windDirection.innerHTML = " &nbsp;<i class=\"fa fa-long-arrow-down\" style=\"transform:rotate("+this.windDeg+"deg);\"></i>&nbsp;";
}
} else {
windDirection.innerHTML = " " + this.translate(this.windDirection);
}
small.appendChild(windDirection); small.appendChild(windDirection);
} }
var spacer = document.createElement("span"); var spacer = document.createElement("span");
@ -346,6 +354,7 @@ Module.register("currentweather",{
this.windDirection = this.deg2Cardinal(data.wind.deg); this.windDirection = this.deg2Cardinal(data.wind.deg);
this.windDeg = data.wind.deg;
this.weatherType = this.config.iconTable[data.weather[0].icon]; this.weatherType = this.config.iconTable[data.weather[0].icon];
var now = new Date(); var now = new Date();