Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/tkhcalculation/BedQualityD50KmValueFinder.java @ 9532:8e6b9cb9486a
Fixed BedQuality finder
author | gernotbelger |
---|---|
date | Tue, 02 Oct 2018 18:19:44 +0200 |
parents | 23d97d60b889 |
children | 8a84c9fef8ec |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/tkhcalculation/BedQualityD50KmValueFinder.java Tue Oct 02 18:08:02 2018 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/tkhcalculation/BedQualityD50KmValueFinder.java Tue Oct 02 18:19:44 2018 +0200 @@ -23,7 +23,6 @@ import org.dive4elements.river.artifacts.model.Calculation; import org.dive4elements.river.artifacts.model.DateRange; import org.dive4elements.river.artifacts.sinfo.tkhstate.BedQualityD50TimeRangeConfig; -import org.dive4elements.river.artifacts.sinfo.tkhstate.BedQualityD50TimeRangeConfig.BedQualityParseException; import org.dive4elements.river.artifacts.sinfo.tkhstate.TsvHelper.TsvReaderException; import org.dive4elements.river.backend.SedDBSessionHolder; import org.dive4elements.river.model.River; @@ -97,15 +96,16 @@ * Abhängig von Peiljahr * * @param problems - * @throws BedQualityParseException * @throws TsvReaderException * @throws IOException */ public static BedQualityD50KmValueFinder loadBedMeasurements(final Calculation problems, final River river, final DoubleRange kmRange, - final int soundingYear) throws BedQualityParseException, IOException, TsvReaderException { + final int soundingYear) { - final DateRange rangeFromConfigFile = BedQualityD50TimeRangeConfig.getDefaults(river, soundingYear, problems); - final DateRange dateRange = rangeFromConfigFile != null ? rangeFromConfigFile : new DateRange(MIN_DATE, MAX_DATE); + final DateRange dateRange = BedQualityD50TimeRangeConfig.getDefaults(river, soundingYear, problems); + if (dateRange == null) + return null; + return loadBedMeasurements(problems, river, kmRange, dateRange, soundingYear); }