From ebee80d10ea57d7b3000eb5ea52dd8c88c0f16f5 Mon Sep 17 00:00:00 2001
From: fewieden <felix@wiedenba.ch>
Date: Thu, 27 Dec 2018 17:13:49 +0100
Subject: [PATCH] small improvements

---
 modules/default/weather/weather.js       | 37 ++++++++++++++++++------
 modules/default/weather/weatherobject.js |  2 +-
 2 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/modules/default/weather/weather.js b/modules/default/weather/weather.js
index 598263a1..b3832dd0 100644
--- a/modules/default/weather/weather.js
+++ b/modules/default/weather/weather.js
@@ -39,13 +39,15 @@ Module.register("weather",{
 
 		apiVersion: "2.5",
 		apiBase: "http://api.openweathermap.org/data/",
-		weatherEndpoint: "weather",
+		weatherEndpoint: "/weather",
 
 		appendLocationNameToHeader: true,
 		calendarClass: "calendar",
+		tableClass: 'small',
 
 		onlyTemp: false,
-		roundTemp: false
+		roundTemp: false,
+		showRainAmount: true
 	},
 
 	// Module properties.
@@ -70,8 +72,18 @@ Module.register("weather",{
 		return scripts
 	},
 
+	// Override getHeader method.
+	getHeader: function() {
+		if (this.config.appendLocationNameToHeader && this.weatherProvider) {
+			return this.data.header + " " + this.weatherProvider.fetchedLocation();
+		}
+
+		return this.data.header;
+	},
+
 	// Start the weather module.
 	start: function () {
+		moment.locale(this.config.lang);
 		// Initialize the weather provider.
 		this.weatherProvider = WeatherProvider.initialize(this.config.weatherProvider, this);
 
@@ -87,11 +99,6 @@ Module.register("weather",{
 
 	// 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) {
@@ -139,7 +146,7 @@ Module.register("weather",{
 	updateAvailable: function() {
 		Log.log("New weather information available.");
 		this.updateDom(300);
-		this.scheduleUpdate(5000);
+		this.scheduleUpdate(60000);
 	},
 
 	scheduleUpdate: function(delay = null) {
@@ -160,7 +167,7 @@ Module.register("weather",{
 	roundValue: function(temperature) {
 		var decimals = this.config.roundTemp ? 0 : 1;
 		return parseFloat(temperature).toFixed(decimals);
-	}
+	},
 
 	addFilters() {
 		this.nunjucksEnvironment().addFilter("formatTime", function(date) {
@@ -201,5 +208,17 @@ Module.register("weather",{
 		this.nunjucksEnvironment().addFilter("roundValue", function(value) {
 			return this.roundValue(value);
 		}.bind(this));
+
+		this.nunjucksEnvironment().addFilter("formatRain", function(value) {
+			if (isNaN(value)) {
+				return "";
+			}
+
+			if(this.config.units === "imperial") {
+				return (parseFloat(value) / 25.4).toFixed(2) + " in";
+			} else {
+				return parseFloat(value).toFixed(1) + " mm";
+			}
+		}.bind(this));
 	}
 });
diff --git a/modules/default/weather/weatherobject.js b/modules/default/weather/weatherobject.js
index 59d2298a..ff0de841 100644
--- a/modules/default/weather/weatherobject.js
+++ b/modules/default/weather/weatherobject.js
@@ -27,7 +27,7 @@ class WeatherObject {
 	}
 
 	cardinalWindDirection () {
-		if (this.windDirection>11.25 && this.windDirection<=33.75){
+		if (this.windDirection > 11.25 && this.windDirection <= 33.75){
 			return "NNE";
 		} else if (this.windDirection > 33.75 && this.windDirection <= 56.25) {
 			return "NE";