diff artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flood_duration/FloodDurationCalculation.java @ 9236:b515ed950d39

S-Info flood durations with automatic km step width
author mschaefer
date Fri, 06 Jul 2018 17:56:18 +0200
parents 0dcd1cd41915
children c2a0028bfa9f
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flood_duration/FloodDurationCalculation.java	Fri Jul 06 15:29:12 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flood_duration/FloodDurationCalculation.java	Fri Jul 06 17:56:18 2018 +0200
@@ -22,7 +22,6 @@
 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;
 
 /**
  * Calculation of the flood durations of the infrastructures of the km range of a river
@@ -49,16 +48,15 @@
 
         final RiverInfoProvider infoProvider = RiverInfoProvider.forRange(this.context, river, calcRange);
         final String calcModeLabel = Resources.getMsg(this.context.getMeta(), sinfo.getCalculationMode().name());
-        final Infrastructure infrasSeries = Infrastructure.getSeries(river);
-        final String infrasType = (infrasSeries != null) ? infrasSeries.getType().getName() : "?";
-        final String label = infrasType + ", " + Resources.getMsg(this.context.getMeta(), access.getRiverside().getKey());
+        final String label = Resources.getMsg(this.context.getMeta(), access.getRiverside().getKey());
 
         final Calculation problems = new Calculation();
 
         // Calculate the selected main values, if any
         /* misuse winfo-artifact to calculate waterlevels in the same way */
         final WINFOArtifact winfo = new WinfoArtifactWrapper(sinfo);
-        // TODO Aktivieren wenn Step-Eingabe im Workflow weg: winfo.addStringData("ld_step", "100");
+        winfo.addStringData("ld_mode", "distance");
+        winfo.addStringData("ld_step", "100");
 
         final FloodDurationCalculationResults results = new FloodDurationCalculationResults(calcModeLabel, user, riverInfo, calcRange);
 

http://dive4elements.wald.intevation.org