From 5ca3fbeaea6d5c6c11b2f2e8a5b2959db7f4fcc9 Mon Sep 17 00:00:00 2001
From: Jacob Ebey <jacob-ebey@live.com>
Date: Sat, 9 Feb 2019 12:42:42 -0800
Subject: [PATCH] Added autoLocation option for weather modules.

---
 CHANGELOG.md                                  |  1 +
 .../default/currentweather/currentweather.js  | 14 ++++++++-
 modules/default/currentweather/node_helper.js | 29 +++++++++++++++++++
 .../default/weatherforecast/node_helper.js    | 29 +++++++++++++++++++
 .../weatherforecast/weatherforecast.js        | 15 ++++++++--
 5 files changed, 85 insertions(+), 3 deletions(-)
 create mode 100644 modules/default/currentweather/node_helper.js
 create mode 100644 modules/default/weatherforecast/node_helper.js

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0d4787a3..3ff24c38 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@ 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.
 
 ### Updated
 - Bumped the Electron dependency to v3.0.13 to support the most recent Raspbian. [#1500](https://github.com/MichMich/MagicMirror/issues/1500)
diff --git a/modules/default/currentweather/currentweather.js b/modules/default/currentweather/currentweather.js
index 2a6d24b9..0472b7a1 100644
--- a/modules/default/currentweather/currentweather.js
+++ b/modules/default/currentweather/currentweather.js
@@ -11,6 +11,7 @@ Module.register("currentweather",{
 
 	// Default module config.
 	defaults: {
+		autoLocation: false,
 		location: false,
 		locationID: false,
 		appid: "",
@@ -109,8 +110,19 @@ Module.register("currentweather",{
 		this.weatherType = null;
 		this.feelsLike = null;
 		this.loaded = false;
-		this.scheduleUpdate(this.config.initialLoadDelay);
 
+		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
diff --git a/modules/default/currentweather/node_helper.js b/modules/default/currentweather/node_helper.js
new file mode 100644
index 00000000..f650cdb8
--- /dev/null
+++ b/modules/default/currentweather/node_helper.js
@@ -0,0 +1,29 @@
+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);
+            });
+		}
+	}
+});
diff --git a/modules/default/weatherforecast/node_helper.js b/modules/default/weatherforecast/node_helper.js
new file mode 100644
index 00000000..f650cdb8
--- /dev/null
+++ b/modules/default/weatherforecast/node_helper.js
@@ -0,0 +1,29 @@
+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);
+            });
+		}
+	}
+});
diff --git a/modules/default/weatherforecast/weatherforecast.js b/modules/default/weatherforecast/weatherforecast.js
index 67193696..1867da36 100644
--- a/modules/default/weatherforecast/weatherforecast.js
+++ b/modules/default/weatherforecast/weatherforecast.js
@@ -11,6 +11,7 @@ Module.register("weatherforecast",{
 
 	// Default module config.
 	defaults: {
+		autoLocation: false,
 		location: false,
 		locationID: false,
 		appid: "",
@@ -95,10 +96,20 @@ 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.