Fix Copilot comments

Signed-off-by: Anders Alfredsson <andersb86@gmail.com>

Author: pacive

bundles/org.openhab.binding.smhi/src/main/java/org/openhab/binding/smhi/internal/ForecastAggregator.java

@@ -15,7 +15,6 @@
 import static org.openhab.binding.smhi.internal.SmhiBindingConstants.*;
 
 import java.math.BigDecimal;
-import java.time.ZonedDateTime;
 import java.time.temporal.ChronoUnit;
 import java.util.List;
 
@@ -42,7 +41,7 @@ public static State max(SmhiTimeSeries timeSeries, int dayOffset, @Nullable Para
         if (metadata == null)
             return UnDefType.UNDEF;
 
-        List<Forecast> dayForecasts = timeSeries.getDay(dayOffset);
+        List<Forecast> dayForecasts = timeSeries.getDay(dayOffset, false);
         return dayForecasts.stream().map(forecast -> forecast.getParameter(metadata.name()))
                 .filter(p -> !metadata.missingValue().equals(p)).max(BigDecimal::compareTo)
                 .map(value -> Util.getParameterAsState(metadata, value))
@@ -61,7 +60,7 @@ public static State min(SmhiTimeSeries timeSeries, int dayOffset, @Nullable Para
         if (metadata == null)
             return UnDefType.UNDEF;
 
-        List<Forecast> dayForecasts = timeSeries.getDay(dayOffset);
+        List<Forecast> dayForecasts = timeSeries.getDay(dayOffset, false);
         return dayForecasts.stream().map(forecast -> forecast.getParameter(metadata.name()))
                 .filter(p -> !metadata.missingValue().equals(p)).min(BigDecimal::compareTo)
                 .map(value -> Util.getParameterAsState(metadata, value))
@@ -83,10 +82,7 @@ public static State total(SmhiTimeSeries timeSeries, int dayOffset, @Nullable Pa
         if (baseMetadata == null || totalMetadata == null)
             return UnDefType.UNDEF;
 
-        ZonedDateTime start = timeSeries.getReferenceTime().plusDays(dayOffset).withHour(0);
-        ZonedDateTime end = start.plusDays(1);
-        List<Forecast> dayForecasts = timeSeries
-                .filter(forecast -> forecast.getTime().isAfter(start) && !forecast.getTime().isAfter(end));
+        List<Forecast> dayForecasts = timeSeries.getDay(dayOffset, true);
         if (dayForecasts.size() == 1) {
             return dayForecasts.getFirst().getParameterAsState(baseMetadata);
         }
@@ -112,7 +108,7 @@ public static State noonOrFirst(SmhiTimeSeries timeSeries, int dayOffset, @Nulla
         if (metadata == null)
             return UnDefType.UNDEF;
 
-        List<Forecast> dayForecasts = timeSeries.getDay(dayOffset);
+        List<Forecast> dayForecasts = timeSeries.getDay(dayOffset, false);
         return dayForecasts.stream().filter(forecast -> forecast.getTime().getHour() >= 12).findFirst()
                 .map(f -> f.getParameterAsState(metadata))
                 .orElseGet(() -> Util.getParameterAsState(metadata, metadata.missingValue()));

bundles/org.openhab.binding.smhi/src/main/java/org/openhab/binding/smhi/internal/SmhiTimeSeries.java

@@ -89,8 +89,12 @@ public Optional<Forecast> getForecast(ZonedDateTime startTime, int hourOffset) {
      * @param dayOffset
      * @return
      */
-    public List<Forecast> getDay(int dayOffset) {
+    public List<Forecast> getDay(int dayOffset, boolean useIntervalStartTime) {
         ZonedDateTime day = referenceTime.plusDays(dayOffset).truncatedTo(ChronoUnit.DAYS);
+        if (useIntervalStartTime) {
+            return filter(forecast -> !forecast.getIntervalStartTime().isBefore(day)
+                    && forecast.getIntervalStartTime().isBefore(day.plusDays(1)));
+        }
         return filter(forecast -> !forecast.getTime().isBefore(day) && forecast.getTime().isBefore(day.plusDays(1)));
     }
 

bundles/org.openhab.binding.smhi/src/main/java/org/openhab/binding/smhi/internal/Util.java

@@ -98,12 +98,12 @@ private static StateDescriptionFragment createStateDescription(ParameterMetadata
             case "m s**-1":
             case "km":
             case "octas":
+            case "hPa":
             case "kg/m2":
                 builder.withPattern("%.1f %unit%");
                 break;
             case "degree":
             case "percent":
-            case "hPa":
             case "fraction":
             case "m":
             case "%":