From 7d4394ae6b2e334b3157f78bcebe9716b3472805 Mon Sep 17 00:00:00 2001 From: James Brown <64858662+james-d-brown@users.noreply.github.com> Date: Tue, 24 Dec 2024 12:04:27 +0000 Subject: [PATCH] Generate graphics with valid date pools when event detection is declared, #130 --- wres-config/src/wres/config/yaml/DeclarationInterpolator.java | 1 + wres-vis/src/wres/vis/charts/ChartFactory.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/wres-config/src/wres/config/yaml/DeclarationInterpolator.java b/wres-config/src/wres/config/yaml/DeclarationInterpolator.java index b65dcfb8a..b68ee757c 100644 --- a/wres-config/src/wres/config/yaml/DeclarationInterpolator.java +++ b/wres-config/src/wres/config/yaml/DeclarationInterpolator.java @@ -950,6 +950,7 @@ private static Outputs.GraphicFormat getGraphicsFormatOptions( Outputs.GraphicFo } // Valid date pools? else if ( ( Objects.nonNull( builder.validDatePools() ) + || Objects.nonNull( builder.eventDetection() ) || DeclarationInterpolator.hasExplicitValidDatePools( builder.timePools() ) ) && options.getShape() == Outputs.GraphicFormat.GraphicShape.DEFAULT ) { diff --git a/wres-vis/src/wres/vis/charts/ChartFactory.java b/wres-vis/src/wres/vis/charts/ChartFactory.java index 85b386fe4..9b486c151 100644 --- a/wres-vis/src/wres/vis/charts/ChartFactory.java +++ b/wres-vis/src/wres/vis/charts/ChartFactory.java @@ -2365,7 +2365,8 @@ private static ChartType getChartType( MetricConstants metricName, Objects.requireNonNull( metricName ); // Pooling window case - if ( graphicShape == GraphicShape.ISSUED_DATE_POOLS || graphicShape == GraphicShape.VALID_DATE_POOLS ) + if ( graphicShape == GraphicShape.ISSUED_DATE_POOLS + || graphicShape == GraphicShape.VALID_DATE_POOLS ) { return ChartType.POOLING_WINDOW; }