Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/salix/SalixLineCalculation.java @ 9499:853f2dafc16e
VegetationZones in CrossSectionsDiagram
author | gernotbelger |
---|---|
date | Thu, 27 Sep 2018 18:06:26 +0200 |
parents | 53e26734e4d2 |
children | 76c0665888a3 |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/salix/SalixLineCalculation.java Wed Sep 26 15:48:05 2018 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/salix/SalixLineCalculation.java Thu Sep 27 18:06:26 2018 +0200 @@ -22,8 +22,8 @@ import org.dive4elements.river.artifacts.common.GeneralResultType; import org.dive4elements.river.artifacts.model.Calculation; import org.dive4elements.river.artifacts.model.CalculationResult; +import org.dive4elements.river.artifacts.model.river.RiverInfoProvider; import org.dive4elements.river.artifacts.resources.Resources; -import org.dive4elements.river.artifacts.sinfo.common.RiverInfoProvider; import org.dive4elements.river.artifacts.sinfo.tkhstate.BedHeightsFinder; import org.dive4elements.river.artifacts.sinfo.tkhstate.BedHeightsUtils; import org.dive4elements.river.artifacts.sinfo.tkhstate.DefaultBedHeights; @@ -113,8 +113,8 @@ /** * Fills a map of delta-Ws by km-range from the regional scenario input data */ - private void fillRangeScenarios(final NavigableMap<Double, List<Double>> rangeScenarios, final RangeAccess calcRange, - final double partFrom, final double partTo, final int[] deltaWs) { + private void fillRangeScenarios(final NavigableMap<Double, List<Double>> rangeScenarios, final RangeAccess calcRange, final double partFrom, + final double partTo, final int[] deltaWs) { final List<Double> nulls = new ArrayList<>(); final List<Double> dwsm = new ArrayList<>(); for (int i = 0; i <= deltaWs.length - 1; i++) { @@ -145,8 +145,8 @@ /** * Fetches historical and reference bed heights and fills a map of delta-MSHs for all fetched stations in the calc range */ - private void fillRangeScenarios(final NavigableMap<Double, List<Double>> rangeScenarios, final RangeAccess calcRange, - final double partFrom, final double partTo, final int historicalBedHeightId) { + private void fillRangeScenarios(final NavigableMap<Double, List<Double>> rangeScenarios, final RangeAccess calcRange, final double partFrom, + final double partTo, final int historicalBedHeightId) { // Find relevant default bed-heights final River river = calcRange.getRiver(); @@ -173,8 +173,7 @@ final String msg = Resources.getMsg(this.context.getMeta(), "uinfo_salix_calc.warning.missing_bedheights"); this.problems.addProblem(station, msg); } - } - else + } else rangeScenarios.get(station).add(Double.valueOf(delta)); } rangeScenarios.put(Double.valueOf(partTo + 0.0001), nulls); @@ -270,6 +269,7 @@ return ""; } + // FIXME: check if needed /** * Fetches a iota or waterlevel height of a station from a salix calculation result */