--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flood_duration/FloodDurationCalculation.java	Wed Oct 09 15:58:46 2019 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flood_duration/FloodDurationCalculation.java	Wed Oct 09 16:17:16 2019 +0200
@@ -9,7 +9,7 @@
  */
 package org.dive4elements.river.artifacts.sinfo.flood_duration;
 
-import java.util.List;
+import java.util.Set;
 
 import org.apache.commons.lang.math.DoubleRange;
 import org.dive4elements.artifacts.CallContext;
@@ -20,11 +20,10 @@
 import org.dive4elements.river.artifacts.model.river.RiverInfoProvider;
 import org.dive4elements.river.artifacts.resources.Resources;
 import org.dive4elements.river.artifacts.sinfo.SINFOArtifact;
+import org.dive4elements.river.artifacts.sinfo.flood_duration.FloodDurationCalculationResult.Infrastructure;
 import org.dive4elements.river.artifacts.sinfo.tkhstate.WinfoArtifactWrapper;
 import org.dive4elements.river.artifacts.sinfo.util.CalculationUtils;
 import org.dive4elements.river.artifacts.sinfo.util.RiverInfo;
-import org.dive4elements.river.jfree.StickyAxisAnnotation;
-import org.dive4elements.river.model.Attribute.AttributeKey;
 import org.dive4elements.river.model.River;
 
 /**
@@ -72,11 +71,15 @@
     /**
      * Calculates the flood durations of the infrastructures of a km range of a river
      */
-    private void calculateResult(final String label, final DoubleRange calcRange, final RiverInfoProvider riverInfoProvider,
-            final FloodDurationAccess access, final Calculation problems, final WINFOArtifact winfo, final FloodDurationCalculationResults results) {
+    private void calculateResult(final String label, final DoubleRange calcRange, final RiverInfoProvider riverInfoProvider, final FloodDurationAccess access,
+            final Calculation problems, final WINFOArtifact winfo, final FloodDurationCalculationResults results) {
 
         final FloodDurationCalculator calculator = new FloodDurationCalculator(this.context, riverInfoProvider);
-        calculator.execute(problems, label, calcRange, access.getRiverside(), access.getIsWspl(), winfo, results);
+
+        // FIXME: fetch from acces; maybe we need database for that... whatever
+        final Set<Infrastructure> infrastructureKeys = null;
+
+        calculator.execute(problems, label, calcRange, access.getRiverside(), infrastructureKeys, access.getIsWspl(), winfo, results);
     }
 
     /**
@@ -100,44 +103,9 @@
         if (!Double.isNaN(station)) {
             winfo.addStringData("ld_locations", Double.toString(station));
             return calculator.calcWQDays(problems, station, winfo);
-        }
-        else {
+        } else {
             winfo.addStringData("ld_locations", Double.toString(calcRange.getMinimumDouble()));
             return calculator.calcWQDays(problems, calcRange.getMinimumDouble(), winfo);
         }
     }
-
-    /**
-     * Calculates the annotations of the infrastructure(s) of a station for a flood duration calculation
-     */
-    public List<StickyAxisAnnotation> calcInfrastructureAnnotations(final double station, final AttributeKey riverside, final boolean isW,
-            final FloodDurationCalculationResult result) {
-
-        final Calculation problems = new Calculation();
-
-        final FloodDurationCalculator calculator = new FloodDurationCalculator(this.context, null);
-        return calculator.calcInfrastructureAnnotations(problems, station, riverside, isW, result);
-    }
-
-    /**
-     * Calculates the annotations of the W main values of a station
-     */
-    public List<StickyAxisAnnotation> calcMainValueWAnnotations(final double station, final FloodDurationCalculationResult result) {
-
-        final Calculation problems = new Calculation();
-
-        final FloodDurationCalculator calculator = new FloodDurationCalculator(this.context, null);
-        return calculator.calcMainValueWAnnotations(problems, station, result);
-    }
-
-    /**
-     * Calculates the annotations of the Q main values of a station
-     */
-    public List<StickyAxisAnnotation> calcMainValueQAnnotations(final double station, final FloodDurationCalculationResult result) {
-
-        final Calculation problems = new Calculation();
-
-        final FloodDurationCalculator calculator = new FloodDurationCalculator(this.context, null);
-        return calculator.calcMainValueQAnnotations(problems, station, result);
-    }
 }
\ No newline at end of file