diff artifacts/src/main/java/org/dive4elements/river/exports/ComputedDischargeCurveExporter.java @ 8724:47199406994a

(issue1801) Determine gauge at a station always with same tolerance.
author Tom Gottfried <tom@intevation.de>
date Wed, 29 Apr 2015 12:30:57 +0200
parents 4de385d58a3e
children 5e38e2924c07
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/exports/ComputedDischargeCurveExporter.java	Wed Apr 29 11:56:04 2015 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/exports/ComputedDischargeCurveExporter.java	Wed Apr 29 12:30:57 2015 +0200
@@ -47,8 +47,6 @@
 import org.dive4elements.river.utils.RiverUtils;
 import org.dive4elements.river.utils.Formatter;
 
-import static org.dive4elements.river.exports.injector.InjectorConstants.GAUGE_EPSILON;
-
 /**
  * @author <a href="mailto:ingo.weinzierl@intevation.de">Ingo Weinzierl</a>
  */
@@ -111,9 +109,8 @@
 
             double[] kms = rangeAccess.getKmRange();
 
-            Gauge gauge = river.determineGaugeByPosition(kms[0]);
-            if (Math.abs(kms[0] - gauge.getStation().doubleValue())
-                < GAUGE_EPSILON) {
+            Gauge gauge = river.determineGaugeAtStation(kms[0]);
+            if (gauge != null) {
                 wUnit = "cm";
                 gaugeName = gauge.getName();
                 gaugeDatum = gauge.getDatum().doubleValue();

http://dive4elements.wald.intevation.org