From 32c9f197b1feb3865d384038f372c11e4f53010d Mon Sep 17 00:00:00 2001 From: Michael Teeuw Date: Wed, 11 May 2016 09:25:16 +0200 Subject: [PATCH] Fix wind direction. #303 --- modules/default/currentweather/README.md | 2 +- .../default/currentweather/currentweather.js | 34 +++++++++---------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/modules/default/currentweather/README.md b/modules/default/currentweather/README.md index 3be92edb..7e7d9fb4 100644 --- a/modules/default/currentweather/README.md +++ b/modules/default/currentweather/README.md @@ -94,7 +94,7 @@ The following properties can be configured: showWindDirection Show the wind direction next to the wind speed.

Possible values: true or false -
Default value: false +
Default value: true diff --git a/modules/default/currentweather/currentweather.js b/modules/default/currentweather/currentweather.js index aaad58e1..83f0868f 100644 --- a/modules/default/currentweather/currentweather.js +++ b/modules/default/currentweather/currentweather.js @@ -19,7 +19,7 @@ Module.register("currentweather",{ timeFormat: config.timeFormat, showPeriod: true, showPeriodUpper: false, - showWindDirection: false, + showWindDirection: true, useBeaufort: true, lang: config.language, @@ -295,37 +295,37 @@ Module.register("currentweather",{ */ deg2Cardinal: function(deg) { - if (deg>11.25 && deg<33.75){ + if (deg>11.25 && deg<=33.75){ return "NNE"; - }else if (deg>33.75 && deg<56.25){ + } else if (deg > 33.75 && deg <= 56.25) { return "ENE"; - }else if (deg>56.25 && deg<78.75){ + } else if (deg > 56.25 && deg <= 78.75) { return "E"; - }else if (deg>78.75 && deg<101.25){ + } else if (deg > 78.75 && deg <= 101.25) { return "ESE"; - }else if (deg>101.25 && deg<123.75){ + } else if (deg > 101.25 && deg <= 123.75) { return "ESE"; - }else if (deg>123.75 && deg<146.25){ + } else if (deg > 123.75 && deg <= 146.25) { return "SE"; - }else if (deg>146.25 && deg<168.75){ + } else if (deg > 146.25 && deg <= 168.75) { return "SSE"; - }else if (deg>168.75 && deg<191.25){ + } else if (deg > 168.75 && deg <= 191.25) { return "S"; - }else if (deg>191.25 && deg<213.75){ + } else if (deg > 191.25 && deg <= 213.75) { return "SSW"; - }else if (deg>213.75 && deg<236.25){ + } else if (deg > 213.75 && deg <= 236.25) { return "SW"; - }else if (deg>236.25 && deg<258.75){ + } else if (deg > 236.25 && deg <= 258.75) { return "WSW"; - }else if (deg>258.75 && deg<281.25){ + } else if (deg > 258.75 && deg <= 281.25) { return "W"; - }else if (deg>281.25 && deg<303.75){ + } else if (deg > 281.25 && deg <= 303.75) { return "WNW"; - }else if (deg>303.75 && deg<326.25){ + } else if (deg > 303.75 && deg <= 326.25) { return "NW"; - }else if (deg>326.25 && deg<348.75){ + } else if (deg > 326.25 && deg <= 348.75) { return "NNW"; - }else{ + } else { return "N"; } },