From d572c9cc537f01d548c7db1703c3b7390e907de1 Mon Sep 17 00:00:00 2001
From: zv <zv@zvcloud.net>
Date: Sun, 14 Jun 2026 12:52:42 +0200
Subject: [PATCH] fix: show rain icon for likely hourly precipitation

---
 components/forecast/day-forecast-modal.tsx | 34 ++++++++++++----------
 components/forecast/forecast-panel.tsx     |  6 ++--
 lib/forecast-utils.ts                      | 11 +++++++
 3 files changed, 34 insertions(+), 17 deletions(-)

diff --git a/components/forecast/day-forecast-modal.tsx b/components/forecast/day-forecast-modal.tsx
index c4f86a5..20cbe44 100644
--- a/components/forecast/day-forecast-modal.tsx
+++ b/components/forecast/day-forecast-modal.tsx
@@ -13,6 +13,7 @@ import {
   formatForecastRainfall,
   formatForecastTemperature,
   formatForecastWind,
+  getEffectiveHourlyWeatherCode,
   getForecastCondition,
   isForecastNight,
 } from "@/lib/forecast-utils";
@@ -150,21 +151,24 @@ export function DayForecastModal({
                   <h3 className="text-sm font-semibold">{t("forecast.hourlyForDay")}</h3>
                   <div className="weather-scrollbar -mx-4 mt-4 overflow-x-auto px-4 pb-2 sm:-mx-5 sm:px-5">
                     <ul className="flex min-w-max gap-2">
-                      {hours.map((hour) => (
-                        <li
-                          key={hour.time}
-                          className="w-[5.2rem] rounded-card border border-border/60 bg-surface-muted/55 px-2 py-3 text-center"
-                          title={getForecastCondition(hour.weatherCode, language)}
-                        >
-                          <p className="text-xs font-medium text-muted">{formatHour(hour.time)}</p>
-                          <ForecastIcon code={hour.weatherCode} isNight={isForecastNight(hour.time, day)} className="mx-auto my-3 size-6 text-accent" />
-                          <p className="text-lg font-semibold tracking-tight">{formatForecastTemperature(hour.temperature, language, temperatureUnit)}</p>
-                          <p className="mt-2 flex items-center justify-center gap-1 text-[0.66rem] text-accent">
-                            <Droplets className="size-3" />
-                            {hour.precipitationProbability === null ? "—" : `${hour.precipitationProbability}%`}
-                          </p>
-                        </li>
-                      ))}
+                      {hours.map((hour) => {
+                        const weatherCode = getEffectiveHourlyWeatherCode(hour);
+                        return (
+                          <li
+                            key={hour.time}
+                            className="w-[5.2rem] rounded-card border border-border/60 bg-surface-muted/55 px-2 py-3 text-center"
+                            title={getForecastCondition(weatherCode, language)}
+                          >
+                            <p className="text-xs font-medium text-muted">{formatHour(hour.time)}</p>
+                            <ForecastIcon code={weatherCode} isNight={isForecastNight(hour.time, day)} className="mx-auto my-3 size-6 text-accent" />
+                            <p className="text-lg font-semibold tracking-tight">{formatForecastTemperature(hour.temperature, language, temperatureUnit)}</p>
+                            <p className="mt-2 flex items-center justify-center gap-1 text-[0.66rem] text-accent">
+                              <Droplets className="size-3" />
+                              {hour.precipitationProbability === null ? "—" : `${hour.precipitationProbability}%`}
+                            </p>
+                          </li>
+                        );
+                      })}
                     </ul>
                   </div>
                 </Card>
diff --git a/components/forecast/forecast-panel.tsx b/components/forecast/forecast-panel.tsx
index 8ea1c3b..288ac28 100644
--- a/components/forecast/forecast-panel.tsx
+++ b/components/forecast/forecast-panel.tsx
@@ -18,6 +18,7 @@ import {
   formatForecastTemperature,
   formatForecastWind,
   getDailyForecastForHour,
+  getEffectiveHourlyWeatherCode,
   getForecastCondition,
   getHourlyForecastForDay,
   getUpcomingHourlyForecast,
@@ -157,6 +158,7 @@ export function ForecastPanel({ latitude, longitude, locationName }: { latitude?
                 <ul className="flex min-w-max gap-2">
                   {upcomingHours.map((hour, index) => {
                     const day = getDailyForecastForHour(forecast.daily, hour.time);
+                    const weatherCode = getEffectiveHourlyWeatherCode(hour);
                     return (
                       <motion.li
                         key={hour.time}
@@ -164,10 +166,10 @@ export function ForecastPanel({ latitude, longitude, locationName }: { latitude?
                         animate={{ opacity: 1, y: 0 }}
                         transition={{ delay: Math.min(index * 0.018, 0.3), duration: 0.25 }}
                         className="w-[4.6rem] rounded-card border border-border/60 bg-surface-muted/55 px-2 py-3 text-center lg:w-[5.5rem] lg:py-4"
-                        title={getForecastCondition(hour.weatherCode, language)}
+                        title={getForecastCondition(weatherCode, language)}
                       >
                         <p className="text-xs font-medium text-muted">{formatHour(hour.time)}</p>
-                        <ForecastIcon code={hour.weatherCode} isNight={isForecastNight(hour.time, day)} className="mx-auto my-3 size-6 text-accent" />
+                        <ForecastIcon code={weatherCode} isNight={isForecastNight(hour.time, day)} className="mx-auto my-3 size-6 text-accent" />
                         <p className="text-lg font-semibold tracking-tight">{formatForecastTemperature(hour.temperature, language, temperatureUnit)}</p>
                         <p className="mt-2 flex items-center justify-center gap-1 text-[0.66rem] text-accent"><Droplets className="size-3" />{hour.precipitationProbability === null ? "—" : `${hour.precipitationProbability}%`}</p>
                         <div className="mt-3 hidden space-y-1.5 border-t border-border/65 pt-3 text-[0.66rem] text-muted lg:block">
diff --git a/lib/forecast-utils.ts b/lib/forecast-utils.ts
index 90a95c3..b281b4a 100644
--- a/lib/forecast-utils.ts
+++ b/lib/forecast-utils.ts
@@ -20,6 +20,17 @@ export function getForecastCondition(code: number | null, language: Language) {
   return translate(language, getForecastConditionKey(code));
 }
 
+function isDryWeatherCode(code: number | null) {
+  return code === null || (code >= 0 && code <= 3) || code === 45 || code === 48;
+}
+
+export function getEffectiveHourlyWeatherCode(hour: Pick<HourlyForecast, "weatherCode" | "precipitation" | "precipitationProbability">) {
+  const hasMeasuredPrecipitation = (hour.precipitation ?? 0) > 0;
+  const hasLikelyPrecipitation = (hour.precipitationProbability ?? 0) >= 70;
+  if (isDryWeatherCode(hour.weatherCode) && (hasMeasuredPrecipitation || hasLikelyPrecipitation)) return 61;
+  return hour.weatherCode;
+}
+
 export function formatForecastTemperature(value: number | null, language: Language, unit: TemperatureUnit = DEFAULT_TEMPERATURE_UNIT) {
   if (value === null) return "—";
   return formatTemperature(value, language, unit);