--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flood_duration/FloodDurationInfrastructureFacet.java	Wed Jul 18 18:53:15 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flood_duration/FloodDurationInfrastructureFacet.java	Thu Jul 19 08:07:03 2018 +0200
@@ -10,8 +10,6 @@
 
 package org.dive4elements.river.artifacts.sinfo.flood_duration;
 
-import static org.dive4elements.river.exports.injector.InjectorConstants.CURRENT_KM;
-
 import java.util.List;
 
 import org.apache.log4j.Logger;
@@ -21,6 +19,7 @@
 import org.dive4elements.river.artifacts.D4EArtifact;
 import org.dive4elements.river.artifacts.model.CalculationResult;
 import org.dive4elements.river.artifacts.states.DefaultState.ComputeType;
+import org.dive4elements.river.exports.fixings.FixChartGenerator;
 import org.dive4elements.river.jfree.RiverAnnotation;
 import org.dive4elements.river.jfree.StickyAxisAnnotation;
 
@@ -43,12 +42,6 @@
 
     /**
      * Returns the data this facet requires.
-     *
-     * @param artifact the owner artifact.
-     * @param context  the CallContext (can be used to find out if in
-     *                 navigable fixation-setting, or durationcurve).
-     *
-     * @return the data.
      */
     @Override
     public Object getData(final Artifact artifact, final CallContext context) {
@@ -61,40 +54,12 @@
 
         final FloodDurationCalculationResults data = (FloodDurationCalculationResults) res.getData();
 
-        // final List<StickyAxisAnnotation> annotations = new ArrayList<>();
-        // annotations.add(data.getInfrastructureWAnnotation());
-        // annotations.add(data.getInfrastructureQAnnotation());
-
-        final double currentKm = getCurrentKm(context);
+        final double currentKm = FixChartGenerator.getCurrentKm(context);
 
         final List<StickyAxisAnnotation> annotations = new FloodDurationCalculation(context).calcInfrastructureAnnotations(currentKm,
                 data.getResults().get(this.index));
-        if (annotations != null) {
-            return new RiverAnnotation(this.description, annotations);
-        }
-        else
-            return null;
-    }
 
-    /**
-     * Returns the current km from the context.
-     * If the context is null or doesn't contain a currentKm
-     * then a double value of -1 will be returned.
-     *
-     * @param context
-     *            The CallContext instance
-     * @return the current km as double
-     */
-    // FIXME: copied from org.dive4elements.river.artifacts.model.fixings.FixingsFacet
-    private double getCurrentKm(final CallContext context) {
-        if (context == null)
-            return Double.NaN;
-
-        final Double dkm = (Double) context.getContextValue(CURRENT_KM);
-        if (dkm == null)
-            return Double.NaN;
-
-        return dkm.doubleValue();
+        return new RiverAnnotation(this.description, annotations);
     }