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

Merge pull request #486 from roramirez/fix_location_id_empty

Browse Source 
currentweather, weatherforecast: fix locationID empty
This commit is contained in:
Michael Teeuw 2016-10-26 21:29:27 +02:00 committed by GitHub
commit ced412372c
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -259,9 +259,9 @@ Module.register("currentweather",{
*/ */
getParams: function() { getParams: function() {
var params = "?"; var params = "?";
if(this.config.locationID !== false) { if(this.config.locationID) {
params += "id=" + this.config.locationID; params += "id=" + this.config.locationID;
} else if(this.config.location !== false) { } else if(this.config.location) {
params += "q=" + this.config.location; params += "q=" + this.config.location;
} else if (this.firstEvent && this.firstEvent.geo) { } else if (this.firstEvent && this.firstEvent.geo) {
params += "lat=" + this.firstEvent.geo.lat + "&lon=" + this.firstEvent.geo.lon params += "lat=" + this.firstEvent.geo.lat + "&lon=" + this.firstEvent.geo.lon

4
modules/default/weatherforecast/weatherforecast.js
View File

@ -249,9 +249,9 @@ Module.register("weatherforecast",{
*/ */
getParams: function() { getParams: function() {
var params = "?"; var params = "?";
if(this.config.locationID !== false) { if(this.config.locationID) {
params += "id=" + this.config.locationID; params += "id=" + this.config.locationID;
} else if(this.config.location !== false) { } else if(this.config.location) {
params += "q=" + this.config.location; params += "q=" + this.config.location;
} else if (this.firstEvent && this.firstEvent.geo) { } else if (this.firstEvent && this.firstEvent.geo) {
params += "lat=" + this.firstEvent.geo.lat + "&lon=" + this.firstEvent.geo.lon params += "lat=" + this.firstEvent.geo.lat + "&lon=" + this.firstEvent.geo.lon