demus/openhab-addons
1
0
Fork 0
mirror of https://github.com/danieldemus/openhab-addons synced 2026-07-29 12:34:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

[meteofrance] Avoid false assumption that rain forecast is provided (#20263)

Browse Source 
* False assumption that forecast is provided avoided.
* Small code cleansing
* Log a message
* Correct orthograph

Signed-off-by: Gaël L'hopital <gael@lhopital.org>
This commit is contained in:
Gaël L'hopital
2026-02-22 17:31:06 +01:00
committed by GitHub
parent 8e4abda621
commit ba9762c7e8
1 changed files with 31 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bundles/org.openhab.binding.meteofrance/src/main/java/org/openhab/binding/meteofrance/internal/handler/RainForecastHandler.java
+17 -16
View File
@@ -59,7 +59,7 @@ public class RainForecastHandler extends BaseThingHandler implements MeteoFrance
private final ChannelUID intensityChannelUID;
private Optional<ScheduledFuture<?>> refreshJob = Optional.empty();
private Optional<PointType> location = Optional.empty();
private @Nullable PointType location;
public RainForecastHandler(Thing thing) {
super(thing);
@@ -81,7 +81,7 @@ public class RainForecastHandler extends BaseThingHandler implements MeteoFrance
ForecastConfiguration config = getConfigAs(ForecastConfiguration.class);
try {
this.location = Optional.of(new PointType(config.location));
this.location = new PointType(config.location);
} catch (IllegalArgumentException e) {
updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.CONFIGURATION_ERROR, "Incorrect 'location' value.");
return;
@@ -110,21 +110,19 @@ public class RainForecastHandler extends BaseThingHandler implements MeteoFrance
private void updateAndPublish() {
getBridgeHandler().ifPresentOrElse(handler -> {
location.ifPresent(loc -> {
RainForecast forecast = handler.getRainForecast(loc);
if (forecast != null) {
if (location instanceof PointType loc && handler.getRainForecast(loc) instanceof RainForecast forecast) {
updateStatus(ThingStatus.ONLINE);
setProperties(forecast.properties);
updateDate(UPDATE_TIME, forecast.updateTime);
}
});
}, () -> logger.warn("No viable bridge"));
}, () -> logger.warn("No bridge found"));
}
private void setProperties(@Nullable Properties forecastProps) {
if (forecastProps == null) {
return;
}
Map<String, String> properties = editProperties();
properties.put("altitude", "%d m".formatted(forecastProps.altitude));
properties.put("name", forecastProps.name);
@@ -132,21 +130,21 @@ public class RainForecastHandler extends BaseThingHandler implements MeteoFrance
properties.put("department", forecastProps.frenchDepartment);
properties.put("timezone", forecastProps.timezone);
properties.put("comfidence", "%d".formatted(forecastProps.confidence));
this.updateProperties(properties);
updateProperties(properties);
setForecast(forecastProps.forecast);
}
private void setForecast(List<Forecast> forecast) {
TimeSeries timeSeries = new TimeSeries(REPLACE);
ZonedDateTime now = ZonedDateTime.now();
private void setForecast(@Nullable List<Forecast> forecast) {
State currentState = null;
long untilNextRun = 0;
if (forecast != null) {
TimeSeries timeSeries = new TimeSeries(REPLACE);
ZonedDateTime now = ZonedDateTime.now();
for (Forecast prevision : forecast) {
State state = prevision.rainIntensity() != RainIntensity.UNKNOWN
? new DecimalType(prevision.rainIntensity().ordinal())
: UnDefType.UNDEF;
State state = RainIntensity.UNKNOWN.equals(prevision.rainIntensity()) ? UnDefType.UNDEF
: new DecimalType(prevision.rainIntensity().ordinal());
if (currentState == null) {
currentState = state;
if (prevision.time().isAfter(now)) {
@@ -155,9 +153,12 @@ public class RainForecastHandler extends BaseThingHandler implements MeteoFrance
}
timeSeries.add(prevision.time().toInstant(), state);
}
updateState(intensityChannelUID, currentState == null ? UnDefType.UNDEF : currentState);
sendTimeSeries(intensityChannelUID, timeSeries);
} else {
logger.info("No rain forecast provided, new attempt on next schedule");
}
updateState(intensityChannelUID, currentState == null ? UnDefType.UNDEF : currentState);
untilNextRun = untilNextRun != 0 ? untilNextRun : 300;
logger.debug("Refresh rain intensity forecast in: {}s", untilNextRun);