Mercurial > dive4elements > river
comparison artifacts/src/main/java/org/dive4elements/river/artifacts/GaugeDischargeArtifact.java @ 8361:c494f9a61490
Instead of adding datum to Q-values, correctly transform W-values to meter above datum.
| author | Tom Gottfried <tom@intevation.de> |
|---|---|
| date | Wed, 01 Oct 2014 15:42:55 +0200 |
| parents | e4606eae8ea5 |
| children | 55b5d6d98d15 |
comparison
equal
deleted
inserted
replaced
| 8360:75ccacd37bec | 8361:c494f9a61490 |
|---|---|
| 215 double [][] values = map.get(name); | 215 double [][] values = map.get(name); |
| 216 if (values == null) { | 216 if (values == null) { |
| 217 log.error("No values for this gauge / discharge found."); | 217 log.error("No values for this gauge / discharge found."); |
| 218 return error(new WQKms[0], "no.gauge.found"); | 218 return error(new WQKms[0], "no.gauge.found"); |
| 219 } | 219 } |
| 220 for (int i = 0 ; i < values[0].length; i++) { | 220 for (int i = 0 ; i < values[1].length; i++) { |
| 221 values[0][i] += gauge.getDatum().doubleValue(); | 221 values[1][i] = values[1][i]/100d + gauge.getDatum().doubleValue(); |
| 222 } | 222 } |
| 223 double [] kms = new double[values[0].length]; | 223 double [] kms = new double[values[1].length]; |
| 224 Arrays.fill(kms, gauge.getStation().doubleValue()); | 224 Arrays.fill(kms, gauge.getStation().doubleValue()); |
| 225 res.add(new WQKms(kms, values[0], values[1], name, W.CENTIMETER_AT_GAUGE)); | 225 res.add(new WQKms(kms, values[0], values[1], name)); |
| 226 | 226 |
| 227 return new CalculationResult( | 227 return new CalculationResult( |
| 228 res.toArray(new WQKms[res.size()]), | 228 res.toArray(new WQKms[res.size()]), |
| 229 new Calculation()); | 229 new Calculation()); |
| 230 } | 230 } |