diff artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flood_duration/FloodDurationState.java @ 9202:b4402594213b

More work on calculations and output for S-Info flood duration workflow (chart types 1 and 2)
author mschaefer
date Mon, 02 Jul 2018 07:33:53 +0200
parents a4121ec450d6
children 3dae6b78e1da
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flood_duration/FloodDurationState.java	Sun Jul 01 15:29:40 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flood_duration/FloodDurationState.java	Mon Jul 02 07:33:53 2018 +0200
@@ -22,6 +22,7 @@
 import org.dive4elements.river.artifacts.model.ReportFacet;
 import org.dive4elements.river.artifacts.sinfo.SINFOArtifact;
 import org.dive4elements.river.artifacts.sinfo.common.FloodDurationProcessor;
+import org.dive4elements.river.artifacts.sinfo.common.FloodHeightProcessor;
 import org.dive4elements.river.artifacts.states.DefaultState;
 
 /**
@@ -79,7 +80,15 @@
         for (final FloodDurationCalculationResult result : resultList) {
 
             facets.add(FloodDurationProcessor.createFloodDurationFacet(context, hash, this.id, result, index));
-            facets.add(FloodDurationProcessor.createMainValueDurationFacet(context, hash, this.id, result, index));
+            for (int j = 0; j <= 2; j++) {
+                if (result.getMainValueLabel(j) != null)
+                    facets.add(FloodDurationProcessor.createMainValueDurationFacet(context, hash, this.id, result, j));
+            }
+            facets.add(FloodHeightProcessor.createFloodHeightFacet(context, hash, this.id, result, index));
+            for (int j = 0; j <= 2; j++) {
+                if (result.getMainValueLabel(j) != null)
+                    facets.add(FloodHeightProcessor.createMainValueHeightFacet(context, hash, this.id, result, j));
+            }
 
             facets.add(new DataFacet(FacetTypes.CSV, "CSV data", ComputeType.ADVANCE, hash, this.id));
             facets.add(new DataFacet(FacetTypes.PDF, "PDF data", ComputeType.ADVANCE, hash, this.id));

http://dive4elements.wald.intevation.org