Check supported_features to identify legacy/modern weather

pkissling · Nov 30, 2023 · a5ceef2 · a5ceef2
1 parent 6daeb5a
commit a5ceef2
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/clock-weather-card.ts b/src/clock-weather-card.ts
@@ -519,7 +519,7 @@ export class ClockWeatherCard extends LitElement {
   }
 
   private mergeForecasts (maxRowsCount: number, hourly: boolean): MergedWeatherForecast[] {
-    const forecasts = this.getWeather().attributes.forecast ?? this.forecasts ?? []
+    const forecasts = this.isLegacyWeather() ? this.getWeather().attributes.forecast ?? [] : this.forecasts ?? []
     const agg = forecasts.reduce<Record<number, WeatherForecast[]>>((forecasts, forecast) => {
       const d = new Date(forecast.datetime)
       const unit = hourly ? `${d.getMonth()}-${d.getDate()}-${+d.getHours()}` : d.getDate()
@@ -616,7 +616,7 @@ export class ClockWeatherCard extends LitElement {
   }
 
   private isLegacyWeather (): boolean {
-    return (this.getWeather().attributes.forecast?.length ?? 0) > 0
+    return !this.supportsFeature(WeatherEntityFeature.FORECAST_DAILY) && !this.supportsFeature(WeatherEntityFeature.FORECAST_HOURLY)
   }
 
   private supportsFeature (feature: WeatherEntityFeature): boolean {