iconTable |
The conversion table to convert the weather conditions to weather-icons.
diff --git a/modules/default/currentweather/currentweather.js b/modules/default/currentweather/currentweather.js
index 0662ef62..39db3f09 100644
--- a/modules/default/currentweather/currentweather.js
+++ b/modules/default/currentweather/currentweather.js
@@ -11,8 +11,8 @@ Module.register("currentweather",{
// Default module config.
defaults: {
- location: "",
- locationID: "",
+ location: false,
+ locationID: false,
appid: "",
units: config.units,
updateInterval: 10 * 60 * 1000, // every 10 minutes
@@ -32,6 +32,9 @@ Module.register("currentweather",{
apiBase: "http://api.openweathermap.org/data/",
weatherEndpoint: "weather",
+ appendLocationNameToHeader: true,
+ calendarClass: "calendar",
+
iconTable: {
"01d": "wi-day-sunny",
"02d": "wi-day-cloudy",
@@ -54,6 +57,12 @@ Module.register("currentweather",{
},
},
+ // create a variable for the first upcoming calendaar event. Used if no location is specified.
+ firstEvent: false,
+
+ // create a variable to hold the location name based on the API result.
+ fetchedLocatioName: "",
+
// Define required scripts.
getScripts: function() {
return ["moment.js"];
@@ -103,12 +112,6 @@ Module.register("currentweather",{
return wrapper;
}
- if (this.config.location === "") {
- wrapper.innerHTML = "Please set the openweather location in the config for module: " + this.name + ".";
- wrapper.className = "dimmed light small";
- return wrapper;
- }
-
if (!this.loaded) {
wrapper.innerHTML = this.translate('LOADING');
wrapper.className = "dimmed light small";
@@ -178,11 +181,50 @@ Module.register("currentweather",{
return wrapper;
},
+ // Override getHeader method.
+ getHeader: function() {
+ if (this.config.appendLocationNameToHeader) {
+ return this.data.header + " " + this.fetchedLocatioName;
+ }
+
+ return this.data.header;
+ },
+
+ // Override notification handler.
+ notificationReceived: function(notification, payload, sender) {
+ if (notification === "DOM_OBJECTS_CREATED") {
+ if (this.config.appendLocationNameToHeader) {
+ this.hide(0, {lockString: this.identifier});
+ }
+ }
+ if (notification === "CALENDAR_EVENTS") {
+ var senderClasses = sender.data.classes.toLowerCase().split(" ");
+ if (senderClasses.indexOf(this.config.calendarClass.toLowerCase()) !== -1) {
+ var lastEvent = this.firstEvent;
+ this.firstEvent = false;
+
+ for (e in payload) {
+ var event = payload[e];
+ if (event.location || event.geo) {
+ this.firstEvent = event;
+ //Log.log("First upcoming event with location: ", event);
+ break;
+ }
+ }
+ }
+ }
+ },
+
/* updateWeather(compliments)
* Requests new data from openweather.org.
* Calls processWeather on succesfull response.
*/
updateWeather: function() {
+ if (this.config.appid === "") {
+ Log.error("CurrentWeather: APPID not set!");
+ return;
+ }
+
var url = this.config.apiBase + this.config.apiVersion + "/" + this.config.weatherEndpoint + this.getParams();
var self = this;
var retry = true;
@@ -194,11 +236,10 @@ Module.register("currentweather",{
if (this.status === 200) {
self.processWeather(JSON.parse(this.response));
} else if (this.status === 401) {
- self.config.appid = "";
self.updateDom(self.config.animationSpeed);
Log.error(self.name + ": Incorrect APPID.");
- retry = false;
+ retry = true;
} else {
Log.error(self.name + ": Could not load weather.");
}
@@ -218,11 +259,19 @@ Module.register("currentweather",{
*/
getParams: function() {
var params = "?";
- if(this.config.locationID !== "") {
+ if(this.config.locationID !== false) {
params += "id=" + this.config.locationID;
- } else {
+ } else if(this.config.location !== false) {
params += "q=" + this.config.location;
+ } else if (this.firstEvent && this.firstEvent.geo) {
+ params += "lat=" + this.firstEvent.geo.lat + "&lon=" + this.firstEvent.geo.lon
+ } else if (this.firstEvent && this.firstEvent.location) {
+ params += "q=" + this.firstEvent.location;
+ } else {
+ this.hide(this.config.animationSpeed, {lockString:this.identifier});
+ return;
}
+
params += "&units=" + this.config.units;
params += "&lang=" + this.config.lang;
params += "&APPID=" + this.config.appid;
@@ -285,7 +334,7 @@ Module.register("currentweather",{
this.sunriseSunsetIcon = (sunrise < now && sunset > now) ? "wi-sunset" : "wi-sunrise";
-
+ this.show(this.config.animationSpeed, {lockString:this.identifier});
this.loaded = true;
this.updateDom(this.config.animationSpeed);
},
diff --git a/modules/default/weatherforecast/README.md b/modules/default/weatherforecast/README.md
index aba03a41..a1df57c1 100644
--- a/modules/default/weatherforecast/README.md
+++ b/modules/default/weatherforecast/README.md
@@ -35,19 +35,20 @@ The following properties can be configured:
|