Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flood_duration/FloodDurationCalculation.java @ 9195:a4121ec450d6
'ca.'-issue
ExportContextCSV+PDF separated
uinfo.inundationduration url export
author | gernotbelger |
---|---|
date | Fri, 29 Jun 2018 14:52:54 +0200 |
parents | 1614cb14308f |
children | b4402594213b |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flood_duration/FloodDurationCalculation.java Thu Jun 28 15:57:40 2018 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flood_duration/FloodDurationCalculation.java Fri Jun 29 14:52:54 2018 +0200 @@ -11,16 +11,13 @@ import org.apache.commons.lang.math.DoubleRange; import org.dive4elements.artifacts.CallContext; -import org.dive4elements.river.artifacts.WINFOArtifact; import org.dive4elements.river.artifacts.model.Calculation; import org.dive4elements.river.artifacts.model.CalculationResult; 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; import org.dive4elements.river.model.River; import org.dive4elements.river.model.sinfo.Infrastructure; @@ -44,7 +41,6 @@ /* access input data */ final FloodDurationAccess access = new FloodDurationAccess(sinfo); final River river = access.getRiver(); - final RiverInfo riverInfo = new RiverInfo(river); final DoubleRange calcRange = access.getRange(); final RiverInfoProvider infoProvider = RiverInfoProvider.forRange(this.context, river, calcRange); @@ -55,15 +51,8 @@ final Calculation problems = new Calculation(); - final FloodDurationCalculationResults results = new FloodDurationCalculationResults(calcModeLabel, user, riverInfo, calcRange); - - final FloodDurationCalculationResult result = calculateResult(calcModeLabel, infrasType, riverside, calcRange, infoProvider, + final FloodDurationCalculationResults results = calculateResult(calcModeLabel, infrasType, riverside, calcRange, infoProvider, RiversideChoiceKey.fromKey(access.getRiverside()), user, problems); - results.addResult(result, problems); - - // Calculate the selected main values, if any - /* misuse winfo-artifact to calculate waterlevels in the same way */ - final WINFOArtifact winfo = new WinfoArtifactWrapper(sinfo); return new CalculationResult(results, problems); } @@ -71,12 +60,12 @@ /** * Calculates the flood durations of the infrastructures of a km range of a river */ - private FloodDurationCalculationResult calculateResult(final String calcModeLabel, final String infrastructureType, final String riverside, + private FloodDurationCalculationResults calculateResult(final String calcModeLabel, final String infrastructureType, final String riverside, final DoubleRange calcRange, final RiverInfoProvider riverInfoProvider, final RiversideChoiceKey riversideKey, final String user, final Calculation problems) { final FloodDurationCalculator calculator = new FloodDurationCalculator(this.context, riverInfoProvider); final String label = infrastructureType + ", " + riverside; - return calculator.execute(problems, label, calcModeLabel, calcRange, riversideKey, user).getResult(); + return calculator.execute(problems, label, calcModeLabel, calcRange, riversideKey, user); } } \ No newline at end of file