--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/common/FloodHeightProcessor.java	Mon Jul 02 17:40:39 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/common/FloodHeightProcessor.java	Mon Jul 02 19:01:09 2018 +0200
@@ -12,12 +12,14 @@
 
 import java.util.HashSet;
 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.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;
@@ -32,17 +34,13 @@
  */
 public final class FloodHeightProcessor extends AbstractSInfoProcessor {
 
-    public static final String FACET_FLOOD_HEIGHT = "sinfo_facet_flood_height";
-
-    public static final String FACET_FLOOD_HEIGHT_DESCRIPTION = "sinfo_facet_flood_height.description";
+    private static final String FACET_FLOOD_HEIGHT = "sinfo_facet_flood_height";
 
-    public static final String FACET_MAIN_VALUE_1_HEIGHT = "mainvalue.1.w";
+    private static final String FACET_FLOOD_HEIGHT_DESCRIPTION = "sinfo_facet_flood_height.description";
 
-    public static final String FACET_MAIN_VALUE_2_HEIGHT = "mainvalue.2.w";
+    private static final String FACET_MAIN_VALUE_HEIGHT = "mainvalue.w";
 
-    public static final String FACET_MAIN_VALUE_3_HEIGHT = "mainvalue.3.w";
-
-    public static final String FACET_MAIN_VALUE_HEIGHT_DESCRIPTION = "mainvalue.w.description";
+    private static final String FACET_MAIN_VALUE_HEIGHT_DESCRIPTION = "mainvalue.w.description";
 
     private static final String I18N_AXIS_LABEL = LongitudinalSectionGenerator.I18N_YAXIS_LABEL;
 
@@ -50,49 +48,45 @@
 
     static {
         HANDLED_FACET_TYPES.add(FACET_FLOOD_HEIGHT);
-        HANDLED_FACET_TYPES.add(FACET_MAIN_VALUE_1_HEIGHT);
-        HANDLED_FACET_TYPES.add(FACET_MAIN_VALUE_2_HEIGHT);
-        HANDLED_FACET_TYPES.add(FACET_MAIN_VALUE_3_HEIGHT);
+        HANDLED_FACET_TYPES.add(FACET_MAIN_VALUE_HEIGHT);
     }
 
     public FloodHeightProcessor() {
         super(I18N_AXIS_LABEL, HANDLED_FACET_TYPES);
     }
 
-    protected SInfoResultType doGetType(final String facetName) {
-        if (FACET_FLOOD_HEIGHT.contentEquals(facetName))
-            return SInfoResultType.infrastructureHeight;
-
-        if (FACET_MAIN_VALUE_1_HEIGHT.contentEquals(facetName))
-            return SInfoResultType.waterlevel1;
-
-        if (FACET_MAIN_VALUE_2_HEIGHT.contentEquals(facetName))
-            return SInfoResultType.waterlevel2;
-
-        if (FACET_MAIN_VALUE_3_HEIGHT.contentEquals(facetName))
-            return SInfoResultType.waterlevel3;
-
-        final String error = String.format("Unknown facet name: %s", facetName);
-        throw new UnsupportedOperationException(error);
-    }
-
     public static Facet createFloodHeightFacet(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_HEIGHT, FACET_FLOOD_HEIGHT_DESCRIPTION);
+        return AbstractSInfoProcessor.createFacet(context, hash, id, result, index, -1, I18N_AXIS_LABEL, FACET_FLOOD_HEIGHT, FACET_FLOOD_HEIGHT_DESCRIPTION);
     }
 
     public static Facet createMainValueHeightFacet(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_HEIGHT_DESCRIPTION, FACET_MAIN_VALUE_HEIGHT_DESCRIPTION,
-                result.getMainValueLabel(index));
-        assert ((index >= 0) && (index <= 2));
-        final String facetName = new String[] { FACET_MAIN_VALUE_1_HEIGHT, FACET_MAIN_VALUE_2_HEIGHT, FACET_MAIN_VALUE_3_HEIGHT }[index];
-        return new SInfoResultFacet(0, facetName, description, I18N_AXIS_LABEL, ComputeType.ADVANCE, id, hash);
+                result.getMainValueLabel(dataIndex));
+
+        return new SInfoResultFacet(facetIndex, resultIndex, dataIndex, FACET_MAIN_VALUE_HEIGHT, description, I18N_AXIS_LABEL, ComputeType.ADVANCE, id, hash);
     }
 
     @Override
     protected String generateSeries(final DiagramGenerator generator, final ArtifactAndFacet bundle, final ThemeDocument theme, final boolean visible) {
 
-        return buildSeriesForType(generator, bundle, theme, visible, doGetType(bundle.getFacetName()), null);
+        final String facetName = bundle.getFacetName();
+
+        if (FACET_FLOOD_HEIGHT.contentEquals(facetName))
+            return buildSeriesForType(generator, bundle, theme, visible, SInfoResultType.infrastructureHeight, null);
+
+        if (FACET_MAIN_VALUE_HEIGHT.contentEquals(facetName)) {
+            final double[][] heightPoints = FloodDurationProcessor.getMainValueDurationPoints(generator, bundle, new Function<DurationWaterlevel, Double>() {
+                @Override
+                public Double apply(final DurationWaterlevel waterlevel) {
+                    return waterlevel.getWaterlevel();
+                }
+            });
+            return buildSeriesForType(heightPoints, generator, bundle, theme, visible, null);
+        }
+
+        final String error = String.format("Unknown facet name: %s", facetName);
+        throw new UnsupportedOperationException(error);
     }
 }
\ No newline at end of file