diff flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/DischargeTables.java @ 4138:1d9c9a3493ea

#904 Use the correct scale to convert discharge table values into [cm].
author Ingo Weinzierl <ingo.weinzierl@intevation.de>
date Mon, 15 Oct 2012 16:05:20 +0200
parents b2ea89a665bc
children cb9f22c3553f
line wrap: on
line diff
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/DischargeTables.java	Mon Oct 15 14:52:57 2012 +0200
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/DischargeTables.java	Mon Oct 15 16:05:20 2012 +0200
@@ -26,7 +26,11 @@
     /** Private logger. */
     private static Logger log = Logger.getLogger(DischargeTables.class);
 
-    public static final double DEFAULT_SCALE = 100.0;
+    /** Scale to convert discharge table values of master table into [cm] */
+    public static final double MASTER_SCALE = 100d;
+
+    /** Scale to convert discharge table values of historical tables into [cm] */
+    public static final double HISTORICAL_SCALE = 1d;
 
     public static final int MASTER = 0;
 
@@ -71,7 +75,7 @@
     }
 
     public double [][] getFirstTable() {
-        return getFirstTable(DEFAULT_SCALE);
+        return getFirstTable(MASTER_SCALE);
     }
 
     public double [][] getFirstTable(double scale) {
@@ -83,7 +87,7 @@
     }
 
     public Map<String, double [][]> getValues() {
-        return getValues(DEFAULT_SCALE);
+        return getValues(MASTER_SCALE);
     }
 
     public Map<String, double [][]> getValues(double scale) {

http://dive4elements.wald.intevation.org