diff --git a/modules/default/currentweather/README.md b/modules/default/currentweather/README.md index 1cafd11a..3df88173 100644 --- a/modules/default/currentweather/README.md +++ b/modules/default/currentweather/README.md @@ -14,7 +14,7 @@ modules: [ config: { // See 'Configuration options' for more information. location: 'Amsterdam,Netherlands', - locationID: '', //Location ID from http://bulk.openweather.org/sample/ + locationID: '', //Location ID from http://bulk.openweather.org/sample/ appid: 'abcde12345abcde12345abcde12345ab' //openweathermap.org API key. } } @@ -35,7 +35,7 @@ The following properties can be configured:
- +location
false
useBeaufort
true
or false
diff --git a/modules/default/currentweather/currentweather.js b/modules/default/currentweather/currentweather.js
index 5875c121..57884ad7 100644
--- a/modules/default/currentweather/currentweather.js
+++ b/modules/default/currentweather/currentweather.js
@@ -171,7 +171,6 @@ Module.register("currentweather",{
large.appendChild(temperature);
wrapper.appendChild(large);
-
return wrapper;
},
@@ -332,39 +331,39 @@ Module.register("currentweather",{
*/
deg2Cardinal: function(deg) {
- if (deg>11.25 && deg<=33.75){
- return "NNE";
- } else if (deg > 33.75 && deg <= 56.25) {
- return "NE";
- } else if (deg > 56.25 && deg <= 78.75) {
- return "ENE";
- } else if (deg > 78.75 && deg <= 101.25) {
- return "E";
- } else if (deg > 101.25 && deg <= 123.75) {
- return "ESE";
- } else if (deg > 123.75 && deg <= 146.25) {
- return "SE";
- } else if (deg > 146.25 && deg <= 168.75) {
- return "SSE";
- } else if (deg > 168.75 && deg <= 191.25) {
- return "S";
- } else if (deg > 191.25 && deg <= 213.75) {
- return "SSW";
- } else if (deg > 213.75 && deg <= 236.25) {
- return "SW";
- } else if (deg > 236.25 && deg <= 258.75) {
- return "WSW";
- } else if (deg > 258.75 && deg <= 281.25) {
- return "W";
- } else if (deg > 281.25 && deg <= 303.75) {
- return "WNW";
- } else if (deg > 303.75 && deg <= 326.25) {
- return "NW";
- } else if (deg > 326.25 && deg <= 348.75) {
- return "NNW";
- } else {
- return "N";
- }
+ if (deg>11.25 && deg<=33.75){
+ return "NNE";
+ } else if (deg > 33.75 && deg <= 56.25) {
+ return "NE";
+ } else if (deg > 56.25 && deg <= 78.75) {
+ return "ENE";
+ } else if (deg > 78.75 && deg <= 101.25) {
+ return "E";
+ } else if (deg > 101.25 && deg <= 123.75) {
+ return "ESE";
+ } else if (deg > 123.75 && deg <= 146.25) {
+ return "SE";
+ } else if (deg > 146.25 && deg <= 168.75) {
+ return "SSE";
+ } else if (deg > 168.75 && deg <= 191.25) {
+ return "S";
+ } else if (deg > 191.25 && deg <= 213.75) {
+ return "SSW";
+ } else if (deg > 213.75 && deg <= 236.25) {
+ return "SW";
+ } else if (deg > 236.25 && deg <= 258.75) {
+ return "WSW";
+ } else if (deg > 258.75 && deg <= 281.25) {
+ return "W";
+ } else if (deg > 281.25 && deg <= 303.75) {
+ return "WNW";
+ } else if (deg > 303.75 && deg <= 326.25) {
+ return "NW";
+ } else if (deg > 326.25 && deg <= 348.75) {
+ return "NNW";
+ } else {
+ return "N";
+ }
},