From 62ce7a0e37f8149ab8cb88cf877d6cd4e6c7cb83 Mon Sep 17 00:00:00 2001
From: Chris van Marle <qistoph@gmail.com>
Date: Thu, 31 Aug 2017 18:18:19 +0200
Subject: [PATCH] Weather forecast settings match current weather

This change makes the config of weather forecast more in line with
current weather. It uses the configured units (metric, imperial,
default) to determine the sign.
---
 .../weatherforecast/weatherforecast.js        | 31 ++++++++++---------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/modules/default/weatherforecast/weatherforecast.js b/modules/default/weatherforecast/weatherforecast.js
index 0168e559..8ccf0f54 100644
--- a/modules/default/weatherforecast/weatherforecast.js
+++ b/modules/default/weatherforecast/weatherforecast.js
@@ -140,27 +140,28 @@ Module.register("weatherforecast",{
 			icon.className = "wi weathericon " + forecast.icon;
 			iconCell.appendChild(icon);
 
-			var maxTempCell = document.createElement("td");
-			maxTempCell.innerHTML = forecast.maxTemp;
-			if(typeof(this.config.scale) == "string" && this.config.scale.toUpperCase() == "C") {
-				maxTempCell.innerHTML += " °C";
-			} else {
-				if(typeof(this.config.scale) == "string" && this.config.scale.toUpperCase() == "F") {
-					maxTempCell.innerHTML += " °F";
+			var degreeLabel = "";
+			if(this.config.scale) {
+				switch(this.config.units) {
+					case "metric":
+						degreeLabel = " &deg;C";
+						break;
+					case "imperial":
+						degreeLabel = " &deg;F";
+						break;
+					case "default":
+						degreeLabel = "K";
+						break;
 				}
 			}
+
+			var maxTempCell = document.createElement("td");
+			maxTempCell.innerHTML = forecast.maxTemp + degreeLabel;
 			maxTempCell.className = "align-right bright max-temp";
 			row.appendChild(maxTempCell);
 
 			var minTempCell = document.createElement("td");
-			minTempCell.innerHTML = forecast.minTemp;
-			if(typeof(this.config.scale) == "string" && this.config.scale.toUpperCase() == "C") {
-				minTempCell.innerHTML += " °C";
-			} else {
-				if(typeof(this.config.scale) == "string" && this.config.scale.toUpperCase() == "F") {
-					minTempCell.innerHTML += " °F";
-				}
-			}
+			minTempCell.innerHTML = forecast.minTemp + degreeLabel;
 			minTempCell.className = "align-right min-temp";
 			row.appendChild(minTempCell);