[PATCH 2 of 2] Merge

Wald Commits scm-commit at wald.intevation.org
Mon Jul 2 19:13:27 CEST 2018


# HG changeset patch
# User mschaefer
# Date 1530551574 -7200
# Node ID 559775e2f53c190ad76ec09e5e135cd137351649
# Parent  3dae6b78e1daa311e32015468e2f721c1d36829d
# Parent  b38be7ea53e2bec78d4c69587bd88112f87a2e86
Merge

diff -r 3dae6b78e1da -r 559775e2f53c artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/common/GaugeMainValueFinder.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/common/GaugeMainValueFinder.java	Mon Jul 02 19:01:09 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/common/GaugeMainValueFinder.java	Mon Jul 02 19:12:54 2018 +0200
@@ -38,7 +38,7 @@
 
     private final MainValueTypeKey keyType;
 
-    private final String approxPrefix = "ca."; // "\u2248" geht wohl nicht
+    private final String approxPrefix = "\u2248";
 
     private Entry<Double, MainValue> foundCeiling;
 
@@ -87,7 +87,8 @@
      * (name for an exact match, circa expression for +/- 10% match, less-than/between/greater-than expression otherwise)
      */
     public String findZoneName(final double value) {
-        if (!this.findValue(value))
+        this.findValue(value);
+        if (Double.isNaN(this.foundRelativeDistance))
             return "";
 
         // Clearly below or just (max. 10%) below lowest named value


More information about the Dive4Elements-commits mailing list