From 9a1ed9d4390bd1f81d142f49e853709f950ed02d Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Sun, 9 May 2021 17:15:37 +0200
Subject: [PATCH] use rounded values for color determination
---
src/logic/tile/tiles/CurrentWeatherTile.py | 11 +++++++----
src/logic/tile/tiles/HourlyForecastTile.py | 11 +++++++----
2 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/src/logic/tile/tiles/CurrentWeatherTile.py b/src/logic/tile/tiles/CurrentWeatherTile.py
index 5e03caf..162aec6 100644
--- a/src/logic/tile/tiles/CurrentWeatherTile.py
+++ b/src/logic/tile/tiles/CurrentWeatherTile.py
@@ -39,11 +39,14 @@ class CurrentWeatherTile(Tile):
sunset = Helpers.timestamp_to_timezone(currentWeather['sunset'], timeZone)
isDayTime = Helpers.is_dayTime(sunrise, sunset, datetime.now(tz=timeZone))
+ temperatureRounded = Helpers.round_to_decimals(currentTemperature, 1)
+ feelsLikeRounded = Helpers.round_to_decimals(feelsLike, 0)
+
return {
- 'temperature': Helpers.round_to_decimals(currentTemperature, 1),
- 'temperatureColor': Helpers.determine_color_for_temperature(currentTemperature),
- 'feelsLike': Helpers.round_to_decimals(feelsLike, 0),
- 'feelsLikeColor': Helpers.determine_color_for_temperature(feelsLike),
+ 'temperature': temperatureRounded,
+ 'temperatureColor': Helpers.determine_color_for_temperature(float(temperatureRounded)),
+ 'feelsLike': feelsLikeRounded,
+ 'feelsLikeColor': Helpers.determine_color_for_temperature(float(feelsLikeRounded)),
'icon': icon,
'iconColor': Helpers.determine_color_for_weather_icon(icon, isDayTime),
'windDegrees': currentWeather['wind_deg'],
diff --git a/src/logic/tile/tiles/HourlyForecastTile.py b/src/logic/tile/tiles/HourlyForecastTile.py
index 093b35d..864e6a7 100644
--- a/src/logic/tile/tiles/HourlyForecastTile.py
+++ b/src/logic/tile/tiles/HourlyForecastTile.py
@@ -50,14 +50,17 @@ class HourlyForecastTile(Tile):
rainProbability = round(entry['pop'] * 100, -1) # -1 rounds to the next ten
windSpeed = entry['wind_speed'] * 3.6
+ temperatureRounded = Helpers.round_to_decimals(temperature, 0)
+ windSpeedRounded = Helpers.round_to_decimals(windSpeed, 0)
+
hourData.append({
'hour': timestamp.strftime('%H'),
- 'temperature': Helpers.round_to_decimals(temperature, 0),
- 'temperatureColor': Helpers.determine_color_for_temperature(temperature),
+ 'temperature': temperatureRounded,
+ 'temperatureColor': Helpers.determine_color_for_temperature(float(temperatureRounded)),
'icon': icon,
'iconColor': Helpers.determine_color_for_weather_icon(iconId, isDayTime),
- 'windSpeed': f'{Helpers.round_to_decimals(windSpeed, 0)} km/h',
- 'windSpeedColor': Helpers.determine_color_for_wind(windSpeed),
+ 'windSpeed': f'{windSpeedRounded} km/h',
+ 'windSpeedColor': Helpers.determine_color_for_wind(float(windSpeedRounded)),
'rainProbability': f'{Helpers.round_to_decimals(rainProbability, 0)} %',
'isDayTime': isDayTime,
'description': entry['weather'][0]['description']
--
GitLab