--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/tkhstate/BedHeightsFinder.java	Wed Mar 07 17:36:04 2018 +0100
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/tkhstate/BedHeightsFinder.java	Fri Mar 09 18:47:06 2018 +0100
@@ -11,7 +11,6 @@
 
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.List;
 import java.util.Map.Entry;
 import java.util.NavigableMap;
@@ -19,11 +18,9 @@
 
 import org.apache.commons.lang.math.DoubleRange;
 import org.dive4elements.river.artifacts.math.Linear;
-import org.dive4elements.river.artifacts.model.Calculation;
 import org.dive4elements.river.artifacts.sinfo.util.BedHeightInfo;
 import org.dive4elements.river.model.BedHeight;
 import org.dive4elements.river.model.BedHeightValue;
-import org.dive4elements.river.model.River;
 
 /**
  * Provides bed heigts for vcarious calculations.
@@ -37,23 +34,14 @@
     private final NavigableMap<Double, BedHeightValue> values;
 
     /**
-     * Create specific bed heights used in tkh-calculation
-     *
-     * @param problems
+     * Create bed height finders from a collection of bed heights.
      */
-    public static Collection<BedHeightsFinder> createTkhBedHeights(final River river, final Calculation problems, final DoubleRange range) {
-        // FIXME: determine relevant bed-heights by river: read from some configuration file
-        // '3' is already the right one for demo-model == '"DGM-2004_Epoche-2-SOBEK"'
-        final int bedheightId = 3;
-
-        final Collection<BedHeight> bedHeights = Collections.singletonList(BedHeight.getBedHeightById(bedheightId));
-
-        // TODO: check for overlapping ranges... and provide a warning message, else we get problems later
-
+    public static Collection<BedHeightsFinder> createTkhBedHeights(final DoubleRange range, final Collection<BedHeight> bedHeights) {
         final List<BedHeightsFinder> result = new ArrayList<>(bedHeights.size());
 
         for (final BedHeight bedHeight : bedHeights) {
-            result.add(createBedHeights(bedHeight, range));
+            final BedHeightsFinder finder = createBedHeights(bedHeight, range);
+            result.add(finder);
         }
 
         return result;