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

Fixed Trailling Spaces

Browse Source
This commit is contained in:
Pranav Sethi 2018-03-03 05:00:26 -05:00
parent a6f08a09d5
commit 43d5311e5e
1 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -395,13 +395,13 @@ Module.register("currentweather",{
var tempInF = 0; var tempInF = 0;
switch (this.config.units){ switch (this.config.units){
case "metric": tempInF = 1.8 * this.temperature + 32; case "metric": tempInF = 1.8 * this.temperature + 32;
break; break;
case "imperial": tempInF = this.temperature; case "imperial": tempInF = this.temperature;
break; break;
case "default": case "default":
var tc = this.temperature - 273.15; var tc = this.temperature - 273.15;
tempInF = 1.8 * tc + 32; tempInF = 1.8 * tc + 32;
break; break;
} }
@ -412,13 +412,13 @@ Module.register("currentweather",{
// this.feelsLike = windChillInC.toFixed(0); // this.feelsLike = windChillInC.toFixed(0);
switch (this.config.units){ switch (this.config.units){
case "metric": this.feelsLike = windChillInC.toFixed(0); case "metric": this.feelsLike = windChillInC.toFixed(0);
break; break;
case "imperial": this.feelsLike = windChillInF.toFixed(0); case "imperial": this.feelsLike = windChillInF.toFixed(0);
break; break;
case "default": case "default":
var tc = windChillInC - 273.15; var tc = windChillInC - 273.15;
this.feelsLike = tc.toFixed(0); this.feelsLike = tc.toFixed(0);
break; break;
} }
@ -430,25 +430,20 @@ Module.register("currentweather",{
+ 1.22874*Math.pow(10,-3)*tempInF*tempInF*this.humidity + 1.22874*Math.pow(10,-3)*tempInF*tempInF*this.humidity
+ 8.5282*Math.pow(10,-4)*tempInF*this.humidity*this.humidity + 8.5282*Math.pow(10,-4)*tempInF*this.humidity*this.humidity
- 1.99*Math.pow(10,-6)*tempInF*tempInF*this.humidity*this.humidity; - 1.99*Math.pow(10,-6)*tempInF*tempInF*this.humidity*this.humidity;
// this.feelsLike = Hindex.toFixed(0); // this.feelsLike = Hindex.toFixed(0);
switch (this.config.units){ switch (this.config.units){
case "metric": this.feelsLike = Hindex.toFixed(0); case "metric": this.feelsLike = Hindex.toFixed(0);
break; break;
case "imperial": this.feelsLike = parseFloat(Hindex * 1.8 + 32).toFixed(0); case "imperial": this.feelsLike = parseFloat(Hindex * 1.8 + 32).toFixed(0);
break; break;
case "default": case "default":
var tc = Hindex - 273.15; var tc = Hindex - 273.15;
this.feelsLike = tc.toFixed(0); this.feelsLike = tc.toFixed(0);
break; break;
} }
} else { } else {
this.feelsLike = parseFloat(this.temperature).toFixed(0); this.feelsLike = parseFloat(this.temperature).toFixed(0);
} }
this.windDirection = this.deg2Cardinal(data.wind.deg); this.windDirection = this.deg2Cardinal(data.wind.deg);
this.windDeg = data.wind.deg; this.windDeg = data.wind.deg;