Mercurial > dive4elements > river
diff flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/Calculation5.java @ 2256:dd93a8e1377a
First steps to serve the data in cm if we are are gauges only.
flys-artifacts/trunk@3910 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
---|---|
date | Fri, 03 Feb 2012 18:03:26 +0000 |
parents | 4e3bfa2d9584 |
children | 46918e6a831d |
line wrap: on
line diff
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/Calculation5.java Fri Feb 03 15:22:56 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/Calculation5.java Fri Feb 03 18:03:26 2012 +0000 @@ -1,6 +1,7 @@ package de.intevation.flys.artifacts.model; import java.util.ArrayList; +import java.util.Map; import org.apache.log4j.Logger; @@ -21,7 +22,10 @@ this.endKms = endKms; } - public CalculationResult calculate(WstValueTable wst) { + public CalculationResult calculate( + WstValueTable wst, + Map<Double, Double> kms2gaugeDatums + ) { ArrayList<WW> results = new ArrayList<WW>(); int numProblems = numProblems(); @@ -34,8 +38,8 @@ if (wws.length == 2) { WW ww = new WW( generateName(startKm, endKm), - startKm, wws[0], - endKm, wws[1]); + startKm, kms2gaugeDatums.get(startKm), wws[0], + endKm, kms2gaugeDatums.get(endKm), wws[1]); if (newNumProblems > numProblems) { ww.removeNaNs();