Merge pull request #1592 from MichMich/revert-1564-develop

Revert "Added autoLocation and autoTimezone option for weather modules and clock respectively."

CHANGELOG.md

@@ -15,8 +15,6 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Italian translation for "Feels"
 - Disabled the screensaver on raspbian with installation script 
 - Added option to truncate the number of vertical lines a calendar item can span if `wrapEvents` is enabled.
-- Added autoLocation options for weather forcast and current weather modules.
-- Added autoTimezone option for the default clock module.
 - Danish translation for "Feels" and "Weeks"
 - Added option to split multiple day events in calendar to separate numbered events
 - Slovakian translation

modules/default/clock/clock.js

@@ -26,7 +26,6 @@ Module.register("clock",{
 		analogShowDate: "top", // options: false, 'top', or 'bottom'
 		secondsColor: "#888888",
 		timezone: null,
-		autoTimezone: false
 	},
 	// Define required scripts.
 	getScripts: function() {
@@ -40,31 +39,16 @@ Module.register("clock",{
 	start: function() {
 		Log.info("Starting module: " + this.name);
 
-		if (this.config.autoTimezone) {
-			this.sendSocketNotification("AUTO_TIMEZONE");
-		} else {
 		// Schedule update interval.
 		var self = this;
 		setInterval(function() {
 			self.updateDom();
 		}, 1000);
-		}
 
 		// Set locale.
 		moment.locale(config.language);
 
 	},
-
-	socketNotificationReceived: function (notification, payload) {
-		if (notification === "UPDATE_TIMEZONE") {
-			var self = this;
-			self.config.timezone = payload.timezone;
-			setInterval(function() {
-				self.updateDom();
-			}, 1000);
-		}
-	},
-
 	// Override dom generator.
 	getDom: function() {
 

modules/default/clock/node_helper.js

@@ -1,29 +0,0 @@
-var http = require("http");
-var NodeHelper = require("node_helper");
-
-module.exports = NodeHelper.create({
-	start: function () {
-	},
-
-	socketNotificationReceived: function (notification, payload) {
-		var self = this;
-
-		if (notification === "AUTO_TIMEZONE") {
-			console.log("Loading timezone...");
-			http.get("http://ip-api.com/json", function (req) {
-				var data = "";
-				req.on("data", function (d) {
-					data += d;
-				});
-				req.on("end", function () {
-					var body = JSON.parse(data);
-					payload.timezone = body.timezone;
-					self.sendSocketNotification("UPDATE_TIMEZONE", payload);
-				});
-			}).on("error", function () {
-				payload.error = "Could not figure out the timezone.";
-				self.sendSocketNotification("UPDATE_TIMEZONE", payload);
-			});
-		}
-	}
-});

modules/default/currentweather/currentweather.js

@@ -11,7 +11,6 @@ Module.register("currentweather",{
 
 	// Default module config.
 	defaults: {
-		autoLocation: false,
 		location: false,
 		locationID: false,
 		appid: "",
@@ -110,19 +109,8 @@ Module.register("currentweather",{
 		this.weatherType = null;
 		this.feelsLike = null;
 		this.loaded = false;
-
-		if (this.config.autoLocation) {
-			this.sendSocketNotification("AUTO_LOCATION");
-		} else {
 		this.scheduleUpdate(this.config.initialLoadDelay);
-		}
-	},
 
-	socketNotificationReceived: function (notification, payload) {
-		if (notification === "UPDATE_LOCATION") {
-			this.config.location = payload.location;
-			this.scheduleUpdate(this.config.initialLoadDelay);
-		}
 	},
 
 	// add extra information of current weather

modules/default/currentweather/node_helper.js

@@ -1,29 +0,0 @@
-var http = require("http");
-var NodeHelper = require("node_helper");
-
-module.exports = NodeHelper.create({
-	start: function () {
-	},
-
-	socketNotificationReceived: function (notification, payload) {
-		var self = this;
-
-		if (notification === "AUTO_LOCATION") {
-			console.log("Loading timezone...");
-			http.get("http://ip-api.com/json", function (req) {
-				var data = "";
-				req.on("data", function (d) {
-					data += d;
-				});
-				req.on("end", function () {
-					var body = JSON.parse(data);
-					payload.location = body.city + ", " + body.regionName;
-					self.sendSocketNotification("UPDATE_LOCATION", payload);
-				});
-			}).on("error", function () {
-				payload.error = "Could not figure out the timezone.";
-				self.sendSocketNotification("UPDATE_LOCATION", payload);
-			});
-		}
-	}
-});

modules/default/weatherforecast/node_helper.js

@@ -1,29 +0,0 @@
-var http = require("http");
-var NodeHelper = require("node_helper");
-
-module.exports = NodeHelper.create({
-	start: function () {
-	},
-
-	socketNotificationReceived: function (notification, payload) {
-		var self = this;
-
-		if (notification === "AUTO_LOCATION") {
-			console.log("Loading timezone...");
-			http.get("http://ip-api.com/json", function (req) {
-				var data = "";
-				req.on("data", function (d) {
-					data += d;
-				});
-				req.on("end", function () {
-					var body = JSON.parse(data);
-					payload.location = body.city + ", " + body.regionName;
-					self.sendSocketNotification("UPDATE_LOCATION", payload);
-				});
-			}).on("error", function () {
-				payload.error = "Could not figure out the timezone.";
-				self.sendSocketNotification("UPDATE_LOCATION", payload);
-			});
-		}
-	}
-});

modules/default/weatherforecast/weatherforecast.js

@@ -11,7 +11,6 @@ Module.register("weatherforecast",{
 
 	// Default module config.
 	defaults: {
-		autoLocation: false,
 		location: false,
 		locationID: false,
 		appid: "",
@@ -96,20 +95,10 @@ Module.register("weatherforecast",{
 
 		this.forecast = [];
 		this.loaded = false;
+		this.scheduleUpdate(this.config.initialLoadDelay);
+
 		this.updateTimer = null;
 
-		if (this.config.autoLocation) {
-			this.sendSocketNotification("AUTO_LOCATION");
-		} else {
-			this.scheduleUpdate(this.config.initialLoadDelay);
-		}
-	},
-
-	socketNotificationReceived: function (notification, payload) {
-		if (notification === "UPDATE_LOCATION") {
-			this.config.location = payload.location;
-			this.scheduleUpdate(this.config.initialLoadDelay);
-		}
 	},
 
 	// Override dom generator.