--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/common/FloodDurationProcessor.java	Mon Jul 02 17:40:39 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/common/FloodDurationProcessor.java	Mon Jul 02 19:01:09 2018 +0200
@@ -10,19 +10,27 @@
 
 package org.dive4elements.river.artifacts.sinfo.common;
 
+import java.util.Collection;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
+import java.util.function.Function;
 
 import org.dive4elements.artifactdatabase.state.ArtifactAndFacet;
 import org.dive4elements.artifactdatabase.state.Facet;
 import org.dive4elements.artifacts.CallContext;
 import org.dive4elements.river.artifacts.common.AbstractCalculationResult;
+import org.dive4elements.river.artifacts.common.GeneralResultType;
+import org.dive4elements.river.artifacts.common.ResultRow;
 import org.dive4elements.river.artifacts.resources.Resources;
+import org.dive4elements.river.artifacts.sinfo.flood_duration.DurationWaterlevel;
 import org.dive4elements.river.artifacts.sinfo.flood_duration.FloodDurationCalculationResult;
 import org.dive4elements.river.artifacts.states.DefaultState.ComputeType;
 import org.dive4elements.river.exports.DiagramGenerator;
 import org.dive4elements.river.themes.ThemeDocument;
 
+import gnu.trove.TDoubleArrayList;
+
 /**
  * Processor to generate the facet and data series of infrastructure flood durations
  *
@@ -31,17 +39,13 @@
  */
 public final class FloodDurationProcessor extends AbstractSInfoProcessor {
 
-    public static final String FACET_FLOOD_DURATION = "sinfo_facet_flood_duration";
-
-    public static final String FACET_FLOOD_DURATION_DESCRIPTION = "sinfo_facet_flood_duration.description";
+    private static final String FACET_FLOOD_DURATION = "sinfo_facet_flood_duration";
 
-    public static final String FACET_MAIN_VALUE_1_DURATION = "mainvalue.1.duration";
+    private static final String FACET_FLOOD_DURATION_DESCRIPTION = "sinfo_facet_flood_duration.description";
 
-    public static final String FACET_MAIN_VALUE_2_DURATION = "mainvalue.2.duration";
+    private static final String FACET_MAIN_VALUE_DURATION = "mainvalue.duration";
 
-    public static final String FACET_MAIN_VALUE_3_DURATION = "mainvalue.3.duration";
-
-    public static final String FACET_MAIN_VALUE_DURATION_DESCRIPTION = "mainvalue.duration.description";
+    private static final String FACET_MAIN_VALUE_DURATION_DESCRIPTION = "mainvalue.duration.description";
 
     private static final String I18N_AXIS_LABEL = "sinfo.chart.flood_duration.section.yaxis.label";
 
@@ -49,72 +53,83 @@
 
     static {
         HANDLED_FACET_TYPES.add(FACET_FLOOD_DURATION);
-        HANDLED_FACET_TYPES.add(FACET_MAIN_VALUE_1_DURATION);
-        HANDLED_FACET_TYPES.add(FACET_MAIN_VALUE_2_DURATION);
-        HANDLED_FACET_TYPES.add(FACET_MAIN_VALUE_3_DURATION);
+        HANDLED_FACET_TYPES.add(FACET_MAIN_VALUE_DURATION);
+
     }
 
     public FloodDurationProcessor() {
         super(I18N_AXIS_LABEL, HANDLED_FACET_TYPES);
     }
 
-    // @Override TODO: REMOVE (has been replaced by doGetType
-    // protected double[][] doGetPoints(final AbstractCalculationResult data, final String facetName) {
-    //
-    // if (FACET_FLOOD_DURATION.contentEquals(facetName))
-    // return ((FloodDurationCalculationResult) data).fetchInfrastructurePoints(SInfoResultType.floodDuration);
-    //
-    // if (FACET_MAIN_VALUE_1_DURATION.contentEquals(facetName))
-    // return ((FloodDurationCalculationResult) data).fetchMainValuePoints(SInfoResultType.mainValue1Duration);
-    //
-    // if (FACET_MAIN_VALUE_2_DURATION.contentEquals(facetName))
-    // return ((FloodDurationCalculationResult) data).fetchMainValuePoints(SInfoResultType.mainValue2Duration);
-    //
-    // if (FACET_MAIN_VALUE_3_DURATION.contentEquals(facetName))
-    // return ((FloodDurationCalculationResult) data).fetchMainValuePoints(SInfoResultType.mainValue3Duration);
-    //
-    // final String error = String.format("Unknown facet name: %s", facetName);
-    // throw new UnsupportedOperationException(error);
-    // }
-
     public static Facet createFloodDurationFacet(final CallContext context, final String hash, final String id, final AbstractCalculationResult result,
-            final int index) {
-
-        return AbstractSInfoProcessor.createFacet(context, hash, id, result, index, I18N_AXIS_LABEL, FACET_FLOOD_DURATION, FACET_FLOOD_DURATION_DESCRIPTION);
-    }
-
-    private SInfoResultType doGetType(final String facetName) {
-
-        if (FACET_FLOOD_DURATION.contentEquals(facetName))
-            return SInfoResultType.floodDuration;
+            final int resultIndex) {
 
-        if (FACET_MAIN_VALUE_1_DURATION.contentEquals(facetName))
-            return SInfoResultType.mainValue1Duration;
-
-        if (FACET_MAIN_VALUE_2_DURATION.contentEquals(facetName))
-            return SInfoResultType.mainValue2Duration;
-
-        if (FACET_MAIN_VALUE_3_DURATION.contentEquals(facetName))
-            return SInfoResultType.mainValue3Duration;
-
-        final String error = String.format("Unknown facet name: %s", facetName);
-        throw new UnsupportedOperationException(error);
-
+        return AbstractSInfoProcessor.createFacet(context, hash, id, result, resultIndex, -1, I18N_AXIS_LABEL, FACET_FLOOD_DURATION,
+                FACET_FLOOD_DURATION_DESCRIPTION);
     }
 
     public static Facet createMainValueDurationFacet(final CallContext context, final String hash, final String id, final FloodDurationCalculationResult result,
-            final int index) {
+            final int facetIndex, final int resultIndex, final int dataIndex) {
 
         final String description = Resources.getMsg(context.getMeta(), FACET_MAIN_VALUE_DURATION_DESCRIPTION, FACET_MAIN_VALUE_DURATION_DESCRIPTION,
-                result.getMainValueLabel(index));
-        assert ((index >= 0) && (index <= 2));
-        final String facetName = new String[] { FACET_MAIN_VALUE_1_DURATION, FACET_MAIN_VALUE_2_DURATION, FACET_MAIN_VALUE_3_DURATION }[index];
-        return new SInfoResultFacet(0, facetName, description, I18N_AXIS_LABEL, ComputeType.ADVANCE, id, hash);
+                result.getMainValueLabel(resultIndex));
+
+        return new SInfoResultFacet(facetIndex, resultIndex, dataIndex, FACET_MAIN_VALUE_DURATION, description, I18N_AXIS_LABEL, ComputeType.ADVANCE, id, hash);
     }
 
     @Override
     protected String generateSeries(final DiagramGenerator generator, final ArtifactAndFacet bundle, final ThemeDocument theme, final boolean visible) {
+        final String facetName = bundle.getFacetName();
 
-        return buildSeriesForType(generator, bundle, theme, visible, doGetType(bundle.getFacetName()), GAP_DISTANCE);
+        if (FACET_FLOOD_DURATION.contentEquals(facetName))
+            return buildSeriesForType(generator, bundle, theme, visible, SInfoResultType.floodDuration, null);
+
+        if (FACET_MAIN_VALUE_DURATION.contentEquals(facetName)) {
+
+            final Function<DurationWaterlevel, Double> valueGetter = new Function<DurationWaterlevel, Double>() {
+                @Override
+                public Double apply(final DurationWaterlevel waterlevel) {
+                    return (double) waterlevel.getFloodDurDaysPerYear();
+                }
+            };
+
+            // FIXME: instead (see CollisionXXProcessor) delegate to result
+            final double[][] points = getMainValueDurationPoints(generator, bundle, valueGetter);
+
+            return buildSeriesForType(points, generator, bundle, theme, visible, null);
+        }
+
+        final String error = String.format("Unknown facet name: %s", facetName);
+        throw new UnsupportedOperationException(error);
+    }
+
+    public static final double[][] getMainValueDurationPoints(final DiagramGenerator generator, final ArtifactAndFacet bundle,
+            final Function<DurationWaterlevel, Double> valueGetter) {
+
+        final AbstractCalculationResult data = getResult(generator, bundle);
+
+        final int index = getDataIndex(bundle);
+
+        ((SInfoResultFacet) bundle.getFacet()).getDataIndex();
+
+        final Collection<ResultRow> rows = data.getRows();
+
+        final TDoubleArrayList xPoints = new TDoubleArrayList(rows.size());
+        final TDoubleArrayList yPoints = new TDoubleArrayList(rows.size());
+
+        for (final ResultRow row : rows) {
+
+            final double station = row.getDoubleValue(GeneralResultType.station);
+
+            final List<DurationWaterlevel> waterlevels = (List<DurationWaterlevel>) row.getValue(SInfoResultType.customMultiRowColWaterlevel);
+            final DurationWaterlevel waterlevel = waterlevels.get(index);
+
+            final Double value = valueGetter.apply(waterlevel);
+
+            xPoints.add(station);
+            yPoints.add(value);
+        }
+
+        return new double[][] { xPoints.toNativeArray(), yPoints.toNativeArray() };
     }
 }
\ No newline at end of file