# HG changeset patch
# User Felix Wolfsteller <felix.wolfsteller@intevation.de>
# Date 1337866799 0
# Node ID 79f6d0802b063e7e1111fcd7084308fb9e361ebc
# Parent  f8a1a8af338e7129cd3f549c3110ebca9e7f49a7
Prepare improved Discharge curve compatibility.

flys-artifacts/trunk@4504 c6561f87-3c4e-4783-a992-168aeb5c3f6f

diff -r f8a1a8af338e -r 79f6d0802b06 flys-artifacts/ChangeLog
--- a/flys-artifacts/ChangeLog	Thu May 24 10:45:12 2012 +0000
+++ b/flys-artifacts/ChangeLog	Thu May 24 13:39:59 2012 +0000
@@ -1,3 +1,11 @@
+2012-05-24	Felix Wolfsteller	<felix.wolfsteller@intevation.de>
+
+	* src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java
+	  (getWaterlevelData): Exception for discharge case.
+
+	* src/main/java/de/intevation/flys/utils/FLYSUtils.java
+	  (getLocations): Exception for discharge case.
+
 2012-05-24  Raimund Renkert <raimund.renkert@intevation.de>
 
 	Issue 667.
diff -r f8a1a8af338e -r 79f6d0802b06 flys-artifacts/src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java	Thu May 24 10:45:12 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java	Thu May 24 13:39:59 2012 +0000
@@ -318,6 +318,10 @@
     {
         logger.debug("WINFOArtifact.getWaterlevelData");
 
+        if (getDataAsString("calculation_mode").equals("calc.discharge.longitudinal.section")) {
+            return getDischargeLongitudinalSectionData();
+        }
+
         River river = FLYSUtils.getRiver(this);
         if (river == null) {
             return error(new WQKms[0], "no.river.selected");
diff -r f8a1a8af338e -r 79f6d0802b06 flys-artifacts/src/main/java/de/intevation/flys/utils/FLYSUtils.java
--- a/flys-artifacts/src/main/java/de/intevation/flys/utils/FLYSUtils.java	Thu May 24 10:45:12 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/utils/FLYSUtils.java	Thu May 24 13:39:59 2012 +0000
@@ -317,6 +317,16 @@
         String locationStr = flys.getDataAsString("ld_locations");
 
         if (locationStr == null || locationStr.length() == 0) {
+            if (flys instanceof WINFOArtifact) {
+                WINFOArtifact winfo = (WINFOArtifact) flys;
+                if (winfo.getReferenceStartKm() != null) {
+                    return new double[]
+                        {
+                            winfo.getReferenceStartKm().doubleValue(),
+                            winfo.getReferenceEndKms()[0]
+                        };
+                }
+            }
             return null;
         }