diff artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/tkhstate/TkhCalculation.java @ 9335:7dc238bd062c

Fixed: calculation of flow depth and tkh with rounding to cm, calculator return differentiated
author mschaefer
date Mon, 30 Jul 2018 08:03:46 +0200
parents 7b2b086e45f0
children 392745cccede
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/tkhstate/TkhCalculation.java	Mon Jul 30 08:00:24 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/tkhstate/TkhCalculation.java	Mon Jul 30 08:03:46 2018 +0200
@@ -34,6 +34,7 @@
 import org.dive4elements.river.artifacts.sinfo.common.RiverInfoProvider;
 import org.dive4elements.river.artifacts.sinfo.tkhcalculation.DischargeValuesFinder;
 import org.dive4elements.river.artifacts.sinfo.tkhcalculation.TkhCalculator;
+import org.dive4elements.river.artifacts.sinfo.tkhcalculation.TkhCalculator.TkhCalculateState;
 import org.dive4elements.river.artifacts.sinfo.tkhcalculation.WaterlevelValuesFinder;
 import org.dive4elements.river.artifacts.sinfo.util.BedHeightInfo;
 import org.dive4elements.river.artifacts.sinfo.util.CalculationUtils;
@@ -184,7 +185,8 @@
             row.putValue(GeneralResultType.gaugeLabel, riverInfoProvider.findGauge(station));
             row.putValue(GeneralResultType.location, riverInfoProvider.getLocation(station));
 
-            if (tkhCalculator.calculateTkh(station, row))
+            final TkhCalculateState calcState = tkhCalculator.calculateTkh(station, row);
+            if (calcState == TkhCalculateState.SUCCESS)
                 rows.add(row);
         }
 

http://dive4elements.wald.intevation.org