# HG changeset patch # User Andre Heinecke # Date 1370276265 -7200 # Node ID 4edad3e414cb59932c5bf216683a75aec5f160f8 # Parent 6a04081a2f69d994c103d4fccb5c85e9c60282b4 Fix km filtering in Datacage, we default to mode distance now Patch approved by Sascha Teichmann diff -r 6a04081a2f69 -r 4edad3e414cb artifacts/src/main/java/org/dive4elements/river/artifacts/datacage/templating/FunctionResolver.java --- 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