diff artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flood_duration/FloodDurationCalculation.java @ 9398:929d645691ae

Fixed: sinfo flood duration: no w/q problem report with unchecked wspl option
author mschaefer
date Mon, 13 Aug 2018 17:27:52 +0200
parents f318359b81a2
children 853f2dafc16e
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flood_duration/FloodDurationCalculation.java	Mon Aug 13 17:26:33 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flood_duration/FloodDurationCalculation.java	Mon Aug 13 17:27:52 2018 +0200
@@ -20,7 +20,6 @@
 import org.dive4elements.river.artifacts.resources.Resources;
 import org.dive4elements.river.artifacts.sinfo.SINFOArtifact;
 import org.dive4elements.river.artifacts.sinfo.common.RiverInfoProvider;
-import org.dive4elements.river.artifacts.sinfo.flood_duration.RiversideRadioChoice.RiversideChoiceKey;
 import org.dive4elements.river.artifacts.sinfo.tkhstate.WinfoArtifactWrapper;
 import org.dive4elements.river.artifacts.sinfo.util.CalculationUtils;
 import org.dive4elements.river.artifacts.sinfo.util.RiverInfo;
@@ -51,7 +50,7 @@
         final RiverInfo riverInfo = new RiverInfo(river);
         final DoubleRange calcRange = access.getRange();
 
-        final RiverInfoProvider infoProvider = RiverInfoProvider.forRange(this.context, river, calcRange);
+        final RiverInfoProvider infoProvider = RiverInfoProvider.forRange(this.context, river, calcRange, true);
         final String calcModeLabel = Resources.getMsg(this.context.getMeta(), sinfo.getCalculationMode().name());
         final String label = Resources.getMsg(this.context.getMeta(), access.getRiverside().getKey());
 
@@ -65,7 +64,7 @@
 
         final FloodDurationCalculationResults results = new FloodDurationCalculationResults(calcModeLabel, user, riverInfo, calcRange);
 
-        calculateResult(label, calcRange, infoProvider, access.getRiverside(), problems, winfo, results);
+        calculateResult(label, calcRange, infoProvider, access, problems, winfo, results);
 
         return new CalculationResult(results, problems);
     }
@@ -74,10 +73,10 @@
      * Calculates the flood durations of the infrastructures of a km range of a river
      */
     private void calculateResult(final String label, final DoubleRange calcRange, final RiverInfoProvider riverInfoProvider,
-            final RiversideChoiceKey riverside, final Calculation problems, final WINFOArtifact winfo, final FloodDurationCalculationResults results) {
+            final FloodDurationAccess access, final Calculation problems, final WINFOArtifact winfo, final FloodDurationCalculationResults results) {
 
         final FloodDurationCalculator calculator = new FloodDurationCalculator(this.context, riverInfoProvider);
-        calculator.execute(problems, label, calcRange, riverside, winfo, results);
+        calculator.execute(problems, label, calcRange, access.getRiverside(), access.getIsWspl(), winfo, results);
     }
 
     /**
@@ -89,7 +88,7 @@
         final FloodDurationAccess access = new FloodDurationAccess(sinfo);
         final River river = access.getRiver();
         final DoubleRange calcRange = access.getRange();
-        final RiverInfoProvider infoProvider = RiverInfoProvider.forRange(this.context, river, calcRange);
+        final RiverInfoProvider infoProvider = RiverInfoProvider.forRange(this.context, river, calcRange, true);
 
         final Calculation problems = new Calculation();
 

http://dive4elements.wald.intevation.org