--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/common/FlowDepthProcessor.java	Mon Jul 02 07:33:53 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/common/FlowDepthProcessor.java	Mon Jul 02 13:00:59 2018 +0200
@@ -13,11 +13,14 @@
 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.exports.DiagramGenerator;
+import org.dive4elements.river.themes.ThemeDocument;
 
-public final class FlowDepthProcessor extends AbstractSInfoLineProcessor<AbstractCalculationResult> {
+public final class FlowDepthProcessor extends AbstractSInfoProcessor {
 
     private static final String AXIS_LABEL = "sinfo.chart.flow_depth.section.yaxis.label";
 
@@ -102,38 +105,37 @@
         super(AXIS_LABEL, HANDLED_FACET_TYPES);
     }
 
-    @Override
-    protected double[][] doGetPoints(final AbstractCalculationResult data, final String facetName) {
+    protected SInfoResultType doGetType(final String facetName) {
 
         if (FACET_FLOW_DEPTH_FILTERED.contentEquals(facetName))
-            return data.getStationPoints(SInfoResultType.flowdepth);
+            return SInfoResultType.flowdepth;
         if (FACET_FLOW_DEPTH_RAW.contentEquals(facetName))
-            return data.getStationPoints(SInfoResultType.flowdepth);
+            return SInfoResultType.flowdepth;
 
         if (FACET_FLOW_DEPTH_TKH_FILTERED.contentEquals(facetName))
-            return data.getStationPoints(SInfoResultType.flowdepthtkh);
+            return SInfoResultType.flowdepthtkh;
         if (FACET_FLOW_DEPTH_TKH_RAW.contentEquals(facetName))
-            return data.getStationPoints(SInfoResultType.flowdepthtkh);
+            return SInfoResultType.flowdepthtkh;
 
         if (FACET_FLOW_DEPTH_MIN_FILTERED.contentEquals(facetName))
-            return data.getStationPoints(SInfoResultType.flowdepthmin);
+            return SInfoResultType.flowdepthmin;
         if (FACET_FLOW_DEPTH_MIN_RAW.contentEquals(facetName))
-            return data.getStationPoints(SInfoResultType.flowdepthmin);
+            return SInfoResultType.flowdepthmin;
 
         if (FACET_FLOW_DEPTH_MAX_FILTERED.contentEquals(facetName))
-            return data.getStationPoints(SInfoResultType.flowdepthmax);
+            return SInfoResultType.flowdepthmax;
         if (FACET_FLOW_DEPTH_MAX_RAW.contentEquals(facetName))
-            return data.getStationPoints(SInfoResultType.flowdepthmax);
+            return SInfoResultType.flowdepthmax;
 
         if (FACET_FLOW_DEPTH_CURRENT_FILTERED.contentEquals(facetName))
-            return data.getStationPoints(SInfoResultType.flowdepthCurrent);
+            return SInfoResultType.flowdepthCurrent;
         if (FACET_FLOW_DEPTH_CURRENT_RAW.contentEquals(facetName))
-            return data.getStationPoints(SInfoResultType.flowdepthCurrent);
+            return SInfoResultType.flowdepthCurrent;
 
         if (FACET_FLOW_DEPTH_HISTORICAL_FILTERED.contentEquals(facetName))
-            return data.getStationPoints(SInfoResultType.flowdepthHistorical);
+            return SInfoResultType.flowdepthHistorical;
         if (FACET_FLOW_DEPTH_HISTORICAL_RAW.contentEquals(facetName))
-            return data.getStationPoints(SInfoResultType.flowdepthHistorical);
+            return SInfoResultType.flowdepthHistorical;
 
         final String error = String.format("Unknown facet name: %s", facetName);
         throw new UnsupportedOperationException(error);
@@ -141,73 +143,79 @@
 
     public static Facet createFlowDepthFilteredFacet(final CallContext context, final String hash, final String id, final AbstractCalculationResult result,
             final int index) {
-        return AbstractSInfoLineProcessor.createFacet(context, hash, id, result, index, SINFO_CHART_FLOW_DEPTH_YAXIS_LABEL, FACET_FLOW_DEPTH_FILTERED,
+        return AbstractSInfoProcessor.createFacet(context, hash, id, result, index, SINFO_CHART_FLOW_DEPTH_YAXIS_LABEL, FACET_FLOW_DEPTH_FILTERED,
                 FACET_FLOW_DEPTH_FILTERED_DESCRIPTION);
     }
 
     public static Facet createFlowDepthRawFacet(final CallContext context, final String hash, final String id, final AbstractCalculationResult result,
             final int index) {
-        return AbstractSInfoLineProcessor.createFacet(context, hash, id, result, index, SINFO_CHART_FLOW_DEPTH_YAXIS_LABEL, FACET_FLOW_DEPTH_RAW,
+        return AbstractSInfoProcessor.createFacet(context, hash, id, result, index, SINFO_CHART_FLOW_DEPTH_YAXIS_LABEL, FACET_FLOW_DEPTH_RAW,
                 FACET_FLOW_DEPTH_RAW_DESCRIPTION);
     }
 
     public static Facet createFlowDepthTkhFilteredFacet(final CallContext context, final String hash, final String id, final AbstractCalculationResult result,
             final int index) {
-        return AbstractSInfoLineProcessor.createFacet(context, hash, id, result, index, SINFO_CHART_FLOW_DEPTH_YAXIS_LABEL, FACET_FLOW_DEPTH_TKH_FILTERED,
+        return AbstractSInfoProcessor.createFacet(context, hash, id, result, index, SINFO_CHART_FLOW_DEPTH_YAXIS_LABEL, FACET_FLOW_DEPTH_TKH_FILTERED,
                 FACET_FLOW_DEPTH_TKH_FILTERED_DESCRIPTION);
     }
 
     public static Facet createFlowDepthTkhRawFacet(final CallContext context, final String hash, final String id, final AbstractCalculationResult result,
             final int index) {
-        return AbstractSInfoLineProcessor.createFacet(context, hash, id, result, index, SINFO_CHART_FLOW_DEPTH_YAXIS_LABEL, FACET_FLOW_DEPTH_TKH_RAW,
+        return AbstractSInfoProcessor.createFacet(context, hash, id, result, index, SINFO_CHART_FLOW_DEPTH_YAXIS_LABEL, FACET_FLOW_DEPTH_TKH_RAW,
                 FACET_FLOW_DEPTH_TKH_RAW_DESCRIPTION);
     }
 
     public static Facet createFlowDepthMinFilteredFacet(final CallContext context, final String hash, final String id, final AbstractCalculationResult result,
             final int index) {
-        return AbstractSInfoLineProcessor.createFacet(context, hash, id, result, index, SINFO_CHART_FLOW_DEPTH_YAXIS_LABEL, FACET_FLOW_DEPTH_MIN_FILTERED,
+        return AbstractSInfoProcessor.createFacet(context, hash, id, result, index, SINFO_CHART_FLOW_DEPTH_YAXIS_LABEL, FACET_FLOW_DEPTH_MIN_FILTERED,
                 FACET_FLOW_DEPTH_MIN_FILTERED_DESCRIPTION);
     }
 
     public static Facet createFlowDepthMinRawFacet(final CallContext context, final String hash, final String id, final AbstractCalculationResult result,
             final int index) {
-        return AbstractSInfoLineProcessor.createFacet(context, hash, id, result, index, SINFO_CHART_FLOW_DEPTH_YAXIS_LABEL, FACET_FLOW_DEPTH_MIN_RAW,
+        return AbstractSInfoProcessor.createFacet(context, hash, id, result, index, SINFO_CHART_FLOW_DEPTH_YAXIS_LABEL, FACET_FLOW_DEPTH_MIN_RAW,
                 FACET_FLOW_DEPTH_MIN_RAW_DESCRIPTION);
     }
 
     public static Facet createFlowDepthMaxFilteredFacet(final CallContext context, final String hash, final String id, final AbstractCalculationResult result,
             final int index) {
-        return AbstractSInfoLineProcessor.createFacet(context, hash, id, result, index, SINFO_CHART_FLOW_DEPTH_YAXIS_LABEL, FACET_FLOW_DEPTH_MAX_FILTERED,
+        return AbstractSInfoProcessor.createFacet(context, hash, id, result, index, SINFO_CHART_FLOW_DEPTH_YAXIS_LABEL, FACET_FLOW_DEPTH_MAX_FILTERED,
                 FACET_FLOW_DEPTH_MAX_FILTERED_DESCRIPTION);
     }
 
     public static Facet createFlowDepthMaxRawFacet(final CallContext context, final String hash, final String id, final AbstractCalculationResult result,
             final int index) {
-        return AbstractSInfoLineProcessor.createFacet(context, hash, id, result, index, SINFO_CHART_FLOW_DEPTH_YAXIS_LABEL, FACET_FLOW_DEPTH_MAX_RAW,
+        return AbstractSInfoProcessor.createFacet(context, hash, id, result, index, SINFO_CHART_FLOW_DEPTH_YAXIS_LABEL, FACET_FLOW_DEPTH_MAX_RAW,
                 FACET_FLOW_DEPTH_MAX_RAW_DESCRIPTION);
     }
 
     public static Facet createFlowDepthCurrentFilteredFacet(final CallContext context, final String hash, final String id,
             final AbstractCalculationResult result, final int index) {
-        return AbstractSInfoLineProcessor.createFacet(context, hash, id, result, index, SINFO_CHART_FLOW_DEPTH_YAXIS_LABEL, FACET_FLOW_DEPTH_CURRENT_FILTERED,
+        return AbstractSInfoProcessor.createFacet(context, hash, id, result, index, SINFO_CHART_FLOW_DEPTH_YAXIS_LABEL, FACET_FLOW_DEPTH_CURRENT_FILTERED,
                 FACET_FLOW_DEPTH_CURRENT_FILTERED_DESCRIPTION);
     }
 
     public static Facet createFlowDepthCurrentRawFacet(final CallContext context, final String hash, final String id, final AbstractCalculationResult result,
             final int index) {
-        return AbstractSInfoLineProcessor.createFacet(context, hash, id, result, index, SINFO_CHART_FLOW_DEPTH_YAXIS_LABEL, FACET_FLOW_DEPTH_CURRENT_RAW,
+        return AbstractSInfoProcessor.createFacet(context, hash, id, result, index, SINFO_CHART_FLOW_DEPTH_YAXIS_LABEL, FACET_FLOW_DEPTH_CURRENT_RAW,
                 FACET_FLOW_DEPTH_CURRENT_RAW_DESCRIPTION);
     }
 
     public static Facet createFlowDepthHistoricalFilteredFacet(final CallContext context, final String hash, final String id,
             final AbstractCalculationResult result, final int index) {
-        return AbstractSInfoLineProcessor.createFacet(context, hash, id, result, index, SINFO_CHART_FLOW_DEPTH_YAXIS_LABEL,
-                FACET_FLOW_DEPTH_HISTORICAL_FILTERED, FACET_FLOW_DEPTH_HISTORICAL_FILTERED_DESCRIPTION);
+        return AbstractSInfoProcessor.createFacet(context, hash, id, result, index, SINFO_CHART_FLOW_DEPTH_YAXIS_LABEL, FACET_FLOW_DEPTH_HISTORICAL_FILTERED,
+                FACET_FLOW_DEPTH_HISTORICAL_FILTERED_DESCRIPTION);
     }
 
     public static Facet createFlowDepthHistoricalRawFacet(final CallContext context, final String hash, final String id, final AbstractCalculationResult result,
             final int index) {
-        return AbstractSInfoLineProcessor.createFacet(context, hash, id, result, index, SINFO_CHART_FLOW_DEPTH_YAXIS_LABEL, FACET_FLOW_DEPTH_HISTORICAL_RAW,
+        return AbstractSInfoProcessor.createFacet(context, hash, id, result, index, SINFO_CHART_FLOW_DEPTH_YAXIS_LABEL, FACET_FLOW_DEPTH_HISTORICAL_RAW,
                 FACET_FLOW_DEPTH_HISTORICAL_RAW_DESCRIPTION);
     }
+
+    @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()), GAP_DISTANCE);
+    }
 }
\ No newline at end of file