--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flowdepth/FlowDepthCalculation.java	Wed Mar 28 17:04:20 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flowdepth/FlowDepthCalculation.java	Thu Mar 29 15:48:17 2018 +0200
@@ -90,7 +90,7 @@
             return null;
 
         /* REMARK: fetch ALL wst kms, because we want to determine the original reference gauge */
-        final WaterlevelData waterlevel = new WaterlevelFetcher().findWaterlevel(this.context, wstId, Double.NaN, Double.NaN, problems);
+        final WaterlevelData waterlevel = new WaterlevelFetcher().findWaterlevel(this.context, wstId, calcRange, problems);
         if (waterlevel == null)
             return null;
 
@@ -101,8 +101,6 @@
         final String label = String.format("%s - %s", wspLabel, soundingLabel);
 
         FlowDepthUtils.checkYearDifference(label, waterlevel.getYear(), bedHeight.getInfo().getYear(), problems);
-        checkWaterlevelDiscretisation(wstKms, calcRange, problems);
-        // TODO: prüfen, ob sohlhöhen die calcRange abdecken/überschneiden
 
         /* re-determine the reference gauge, in the same way as the WaterlevelArtifact would do it */
         final RiverInfoProvider riverInfoProvider = infoProvider.forWaterlevel(waterlevel);
@@ -110,35 +108,14 @@
         final int wspYear = waterlevel.getYear();
         final WstInfo wstInfo = new WstInfo(wspLabel, wspYear, riverInfoProvider.getReferenceGauge());
 
-        final WaterlevelValuesFinder waterlevelProvider = WaterlevelValuesFinder.fromKms(wstKms);
+        final WaterlevelValuesFinder waterlevelProvider = WaterlevelValuesFinder.fromKms(problems, wstKms);
         final DischargeValuesFinder dischargeProvider = DischargeValuesFinder.fromKms(wstKms);
 
         final River river = riverInfoProvider.getRiver();
-        final TkhCalculator tkhCalculator = TkhCalculator.buildTkhCalculator(useTkh, this.context, problems, label, river, calcRange, waterlevelProvider,
-                dischargeProvider,
-                bedHeight);
+        final TkhCalculator tkhCalculator = TkhCalculator.buildTkhCalculator(useTkh, problems, label, river, calcRange, waterlevelProvider,
+                dischargeProvider, bedHeight);
 
         final FlowDepthCalculator calculator = new FlowDepthCalculator(riverInfoProvider, wspLabel, bedHeight, tkhCalculator);
         return calculator.execute(label, wstInfo, calcRange);
     }
-
-    /* Checks if the discretisation of the waterlevel exceeds 1000m */
-    private void checkWaterlevelDiscretisation(final WKms wstKms, final DoubleRange calcRange, final Calculation problems) {
-
-        final int size = wstKms.size();
-        for (int i = 0; i < size - 2; i++) {
-            final double kmPrev = wstKms.getKm(i);
-            final double kmNext = wstKms.getKm(i + 1);
-
-            /* only check if we are within the calculation range */
-            if (calcRange.overlapsRange(new DoubleRange(kmPrev, kmNext))) {
-                if (Math.abs(kmPrev - kmNext) > 1) {
-                    final String label = wstKms.getName();
-
-                    final String message = Resources.getMsg(this.context.getMeta(), "sinfo_calc_flow_depth.warning.waterlevel_discretisation", null, label);
-                    problems.addProblem(kmPrev, message);
-                }
-            }
-        }
-    }
 }
\ No newline at end of file