Mercurial > dive4elements > river
changeset 9235:d47f6641f597
sinfo.flood_duration step entfernt bei Eingabe 100m-step muss noch hinzugefügt werden
| author | gernotbelger |
|---|---|
| date | Fri, 06 Jul 2018 15:29:12 +0200 |
| parents | 2d4750874c57 |
| children | b515ed950d39 |
| files | artifacts/doc/conf/artifacts/sinfo.xml artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flood_duration/FloodDurationCalculator.java |
| diffstat | 2 files changed, 4 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/artifacts/doc/conf/artifacts/sinfo.xml Fri Jul 06 13:12:04 2018 +0200 +++ b/artifacts/doc/conf/artifacts/sinfo.xml Fri Jul 06 15:29:12 2018 +0200 @@ -307,18 +307,12 @@ <!-- Schrittweite benötigt für wq-state: TODO: vermutlich hier auch nicht? --> <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition"> <from state="state.sinfo.calculation_mode" /> - <to state="state.sinfo.distance" /> + <to state="state.sinfo.distance_only" /> <condition data="calculation_mode" value="sinfo_calc_flood_duration" operator="equal" /> - </transition> - - <state id="state.sinfo.distance" description="state.sinfo.distance" state="org.dive4elements.river.artifacts.states.DistanceSelect" helpText="help.state.sinfo.distance"> - <data name="ld_from" type="Double" /> - <data name="ld_to" type="Double" /> - <data name="ld_step" type="Double" /> - </state> + </transition> <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition"> - <from state="state.sinfo.distance" /> + <from state="state.sinfo.distance_only" /> <to state="state.sinfo.riverside" /> <condition data="calculation_mode" value="sinfo_calc_flood_duration" operator="equal" /> </transition>
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flood_duration/FloodDurationCalculator.java Fri Jul 06 13:12:04 2018 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flood_duration/FloodDurationCalculator.java Fri Jul 06 15:29:12 2018 +0200 @@ -80,7 +80,7 @@ // Merge all stations (range/step, borders of gauge ranges, infrastructures) final Map<Double, InfrastructureValue> allStations = new HashMap<>(); final Map<Double, InfrastructureValue> secondBank = new HashMap<>(); // any second infrastructure in case of both-banks-option - addRangeStations(allStations, winfo); + // addRangeStations(allStations, winfo); //@Schäfer: bitte überprüfen, wie diese Funktion ersetzt werden muss addGaugeLimits(allStations, durFinders.keySet(), calcRange.getMinimumDouble(), calcRange.getMaximumDouble()); addInfrastructures(allStations, secondBank, infras); final double[] stationsSorted = sortStations(allStations.keySet());