From ba5b275446c017c9c2bfd2109c4322e0ceb517d6 Mon Sep 17 00:00:00 2001
From: Rudy Gnodde <rudy.gnodde@beech.it>
Date: Tue, 26 Mar 2024 16:08:20 +0100
Subject: [PATCH] [BUGFIX] Fix weather offset when forecast does not start
 today

Resolves: #25
---
 src/card.js | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/card.js b/src/card.js
index cb909a6..5601761 100644
--- a/src/card.js
+++ b/src/card.js
@@ -354,7 +354,7 @@ export class WeekPlannerCard extends LitElement {
         `;
     }
 
-    _getWeatherIcon(weatherState, dayNumber) {
+    _getWeatherIcon(weatherState) {
         const condition = weatherState?.condition;
         if (!condition) {
             return null;
@@ -465,11 +465,20 @@ export class WeekPlannerCard extends LitElement {
         let days = [];
 
         const weatherState = this._weather ? this.hass.states[this._weather.entity] : null;
+        let weatherForecast = {};
+        weatherState?.attributes?.forecast?.forEach((forecast) => {
+            const dateKey = DateTime.fromISO(forecast.datetime).toISODate();
+            weatherForecast[dateKey] = {
+                icon: this._getWeatherIcon(forecast),
+                condition: this.hass.formatEntityState(weatherState, forecast.condition),
+                temperature: this.hass.formatEntityAttributeValue(weatherState, 'temperature', forecast.temperature),
+                templow: this.hass.formatEntityAttributeValue(weatherState, 'templow', forecast.templow)
+            };
+        });
 
         let startDate = DateTime.now().startOf('day');
         let endDate = DateTime.now().startOf('day').plus({ days: this._numberOfDays });
 
-        let dayNumber = 0;
         while (startDate < endDate) {
             let events = [];
 
@@ -483,15 +492,9 @@ export class WeekPlannerCard extends LitElement {
             days.push({
                 date: startDate,
                 events: events,
-                weather: weatherState?.attributes?.forecast[dayNumber] ? {
-                    icon: this._getWeatherIcon(weatherState.attributes.forecast[dayNumber], dayNumber),
-                    condition: this.hass.formatEntityState(weatherState, weatherState.attributes.forecast[dayNumber].condition),
-                    temperature: this.hass.formatEntityAttributeValue(weatherState, 'temperature', weatherState.attributes.forecast[dayNumber].temperature),
-                    templow: this.hass.formatEntityAttributeValue(weatherState, 'templow', weatherState.attributes.forecast[dayNumber].templow)
-                } : null,
+                weather: weatherForecast[dateKey] ?? null,
             });
             startDate = startDate.plus({ days: 1 });
-            dayNumber++;
         }
 
         const jsonDays = JSON.stringify(days)