changeset 6176:4edad3e414cb

Fix km filtering in Datacage, we default to mode distance now Patch approved by Sascha Teichmann
author Andre Heinecke <aheinecke@intevation.de>
date Mon, 03 Jun 2013 18:17:45 +0200 (2013-06-03)
parents 6a04081a2f69
children 573112007ec7
files artifacts/src/main/java/org/dive4elements/river/artifacts/datacage/templating/FunctionResolver.java
diffstat 1 files changed, 2 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/datacage/templating/FunctionResolver.java	Mon Jun 03 17:46:59 2013 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/datacage/templating/FunctionResolver.java	Mon Jun 03 18:17:45 2013 +0200
@@ -249,7 +249,7 @@
                 return -FAR_AWAY;
             }
         }
-        else if (mode.equals("distance")) {
+        else {
             if (!(from instanceof String)) {
                 return -FAR_AWAY;
             }
@@ -261,9 +261,6 @@
                 return -FAR_AWAY;
             }
         }
-        else {
-            return -FAR_AWAY;
-        }
     }
 
     /** Implementation for getting the maximum value of location or distance
@@ -301,7 +298,7 @@
                 return FAR_AWAY;
             }
         }
-        else if (mode.equals("distance")) {
+        else {
             if (!(to instanceof String)) {
                 return FAR_AWAY;
             }
@@ -315,9 +312,6 @@
                 }
             }
         }
-        else {
-            return FAR_AWAY;
-        }
     }
 
     /** Implementation for doing a string replace

http://dive4elements.wald.intevation.org