--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/common/FloodHeightProcessor.java	Mon Jul 02 07:33:53 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/common/FloodHeightProcessor.java	Mon Jul 02 13:00:59 2018 +0200
@@ -13,13 +13,16 @@
 import java.util.HashSet;
 import java.util.Set;
 
+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.FloodDurationCalculationResult;
 import org.dive4elements.river.artifacts.states.DefaultState.ComputeType;
+import org.dive4elements.river.exports.DiagramGenerator;
 import org.dive4elements.river.exports.LongitudinalSectionGenerator;
+import org.dive4elements.river.themes.ThemeDocument;
 
 /**
  * Processor to generate the facet and data series of infrastructure flood heights
@@ -27,7 +30,7 @@
  * @author Matthias Schäfer
  *
  */
-public final class FloodHeightProcessor extends AbstractSInfoLineProcessor<AbstractCalculationResult> {
+public final class FloodHeightProcessor extends AbstractSInfoProcessor {
 
     public static final String FACET_FLOOD_HEIGHT = "sinfo_facet_flood_height";
 
@@ -56,37 +59,40 @@
         super(I18N_AXIS_LABEL, HANDLED_FACET_TYPES);
     }
 
-
-    @Override
-    protected double[][] doGetPoints(final AbstractCalculationResult data, final String facetName) {
+    protected SInfoResultType doGetType(final String facetName) {
         if (FACET_FLOOD_HEIGHT.contentEquals(facetName))
-            return ((FloodDurationCalculationResult) data).fetchInfrastructurePoints(SInfoResultType.infrastructureHeight);
+            return SInfoResultType.infrastructureHeight;
 
         if (FACET_MAIN_VALUE_1_HEIGHT.contentEquals(facetName))
-            return ((FloodDurationCalculationResult) data).fetchMainValuePoints(SInfoResultType.waterlevel1);
+            return SInfoResultType.waterlevel1;
 
         if (FACET_MAIN_VALUE_2_HEIGHT.contentEquals(facetName))
-            return ((FloodDurationCalculationResult) data).fetchMainValuePoints(SInfoResultType.waterlevel2);
+            return SInfoResultType.waterlevel2;
 
         if (FACET_MAIN_VALUE_3_HEIGHT.contentEquals(facetName))
-            return ((FloodDurationCalculationResult) data).fetchMainValuePoints(SInfoResultType.waterlevel3);
+            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 AbstractSInfoLineProcessor.createFacet(context, hash, id, result, index, I18N_AXIS_LABEL,
-                FACET_FLOOD_HEIGHT, FACET_FLOOD_HEIGHT_DESCRIPTION);
+    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);
     }
 
-    public static Facet createMainValueHeightFacet(final CallContext context, final String hash, final String id,
-            final FloodDurationCalculationResult result, final int index) {
+    public static Facet createMainValueHeightFacet(final CallContext context, final String hash, final String id, final FloodDurationCalculationResult result,
+            final int index) {
         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);
     }
+
+    @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);
+    }
 }
\ No newline at end of file