Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/inundationduration/InundationDurationCalculation.java @ 9070:611a523fc42f
VegetationZoneAccessHelper, VegetationTablePanels verbessert
author | gernotbelger |
---|---|
date | Tue, 15 May 2018 18:04:36 +0200 |
parents | 1ffd38826175 |
children | 431f1c269be5 |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/inundationduration/InundationDurationCalculation.java Tue May 15 12:00:26 2018 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/inundationduration/InundationDurationCalculation.java Tue May 15 18:04:36 2018 +0200 @@ -11,6 +11,7 @@ import java.util.ArrayList; import java.util.Collection; +import java.util.List; import org.apache.commons.lang.math.DoubleRange; import org.dive4elements.artifacts.CallContext; @@ -23,6 +24,7 @@ import org.dive4elements.river.artifacts.sinfo.util.CalculationUtils; import org.dive4elements.river.artifacts.sinfo.util.RiverInfo; import org.dive4elements.river.artifacts.uinfo.UINFOArtifact; +import org.dive4elements.river.artifacts.uinfo.vegetationzones.VegetationZoneAccessHelper; import org.dive4elements.river.model.River; /** @@ -44,15 +46,17 @@ final String user = CalculationUtils.findArtifactUser(this.context, uinfo); final RiverAccess access = new RiverAccess(uinfo); - final River river = access.getRiver(); - final DoubleRange calcRange = null; - final RiverInfo riverInfo = new RiverInfo(river); final InundationDurationAccess indurax = new InundationDurationAccess(uinfo); + final River river = indurax.getRiver(); + final RiverInfo riverInfo = new RiverInfo(river); + final DoubleRange calcRange = indurax.getRange(); final int[] totalEpoch = indurax.getTotalEpoch(); final Integer year = indurax.getYear(); // null bei year -> Integer.. evtl ungünstig.. evtl. anders lösen final DoubleRange range = indurax.getRange(); final Double sedimentHeight = indurax.getSedimentHeight(); + final String zonesRaw = indurax.getVegZones(); + final List<VegetationZoneAccessHelper> zones = VegetationZoneAccessHelper.parse(zonesRaw); final InundationDurationCalculationResults results = new InundationDurationCalculationResults(calcModeLabel, user, riverInfo, calcRange);