dive4elements/river: artifacts/src/main/java/org/dive4elements/river/artifacts/WINFOArtifact.java comparison

issue1399: WINFOArtifact: Compute difference also if part of difference building oneselve.

author	Felix Wolfsteller <felix.wolfsteller@intevation.de>
date	Fri, 19 Jul 2013 13:39:40 +0200
parents	5c880567a020
children	f4421417f3e1

comparison

equal deleted inserted replaced

-:e8e76d50d119
+:075c00b767d7
 {
 logger.debug("WINFOArtifact.getWaterlevelData");
 String calculationMode = getDataAsString("calculation_mode");
-if (calculationMode.equals("calc.discharge.longitudinal.section")
+// If this WINFO-Artifact has a calculation trait.
-) {
+if (calculationMode != null) {
-return getDischargeLongitudinalSectionData();
+if (calculationMode.equals("calc.discharge.longitudinal.section")
-}
+) {
-else if (calculationMode.equals("calc.extreme.curve")) {
+return getDischargeLongitudinalSectionData();
-return (CalculationResult)
+}
-this.compute(context, ComputeType.ADVANCE, false);
+else if (calculationMode.equals("calc.extreme.curve")) {
-}
+return (CalculationResult)
+this.compute(context, ComputeType.ADVANCE, false);
+}
+else if (calculationMode.equals("calc.w.differences")) {
+return (CalculationResult)
+this.compute(context, ComputeType.ADVANCE, true);
+}
+else {
+logger.warn("Unhandled calculation_mode " + calculation_mode);
+}
+}
+// Otherwise get it from parameterization.
 River river = RiverUtils.getRiver(this);
 if (river == null) {
 return error(new WQKms[0], "no.river.selected");
 }

Mercurial > dive4elements > river