--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/MiddleBedHeightCalculation.java	Fri May 18 10:51:04 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/MiddleBedHeightCalculation.java	Fri May 18 11:58:38 2012 +0000
@@ -92,12 +92,14 @@
     ) {
         logger.info("MiddleBedHeightCalculation.buildCalculationResult");
 
-        int size = singles.size() + epochs.size();
+        int    size = singles.size() + epochs.size();
+        double kmLo = artifact.getDataAsDouble("ld_from");
+        double kmHi = artifact.getDataAsDouble("ld_to");
 
         List<MiddleBedHeightData> data = new ArrayList<MiddleBedHeightData>();
 
         for (BedHeightSingle single: singles) {
-            MiddleBedHeightData d = prepareSingleData(single);
+            MiddleBedHeightData d = prepareSingleData(single, kmLo, kmHi);
 
             if (d != null) {
                 data.add(d);
@@ -105,7 +107,7 @@
         }
 
         for (BedHeightEpoch epoch: epochs) {
-            MiddleBedHeightData d = prepareEpochData(epoch);
+            MiddleBedHeightData d = prepareEpochData(epoch, kmLo, kmHi);
 
             if (d != null) {
                 data.add(d);
@@ -119,10 +121,15 @@
     }
 
 
-    protected MiddleBedHeightData prepareSingleData(BedHeightSingle single) {
+    protected MiddleBedHeightData prepareSingleData(
+        BedHeightSingle single,
+        double kmLo,
+        double kmHi
+    ) {
         logger.debug("Prepare data for single: " + single.getDescription());
 
-        List<BedHeightSingleValue> values = single.getValues();
+        List<BedHeightSingleValue> values =
+            BedHeightSingleValue.getBedHeightSingleValues(single, kmLo, kmHi);
 
         MiddleBedHeightData data = new MiddleBedHeightData(
             single.getYear(),
@@ -145,12 +152,17 @@
     }
 
 
-    protected MiddleBedHeightData prepareEpochData(BedHeightEpoch epoch) {
+    protected MiddleBedHeightData prepareEpochData(
+        BedHeightEpoch epoch,
+        double kmLo,
+        double kmHi
+    ) {
         logger.debug("Prepare data for epoch: " + epoch.getDescription());
 
         TimeInterval ti = epoch.getTimeInterval();
 
-        List<BedHeightEpochValue> values = epoch.getValues();
+        List<BedHeightEpochValue> values =
+            BedHeightEpochValue.getBedHeightEpochValues(epoch, kmLo, kmHi);
 
         MiddleBedHeightData data = new MiddleBedHeightData(
             DateUtils.getYearFromDate(ti.getStartTime()),