From 4b47a62d2dc0dd7f1b7ced01a7e6c7887e3840ad Mon Sep 17 00:00:00 2001
From: Renaud Allard <renaud@allard.it>
Date: Mon, 17 Oct 2016 23:30:07 +0200
Subject: Do not double check the filter results Some cleaning in the logic

---
 src/org/traccar/FilterHandler.java | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

(limited to 'src/org')

diff --git a/src/org/traccar/FilterHandler.java b/src/org/traccar/FilterHandler.java
index 8acc06935..62df83378 100644
--- a/src/org/traccar/FilterHandler.java
+++ b/src/org/traccar/FilterHandler.java
@@ -150,36 +150,33 @@ public class FilterHandler extends BaseDataHandler {
 
     private boolean filter(Position p) {
 
+        boolean result = false;
         String filterType = "";
 
-        boolean result = filterInvalid(p) || filterZero(p) || filterDuplicate(p)
-                || filterFuture(p) || filterApproximate(p) || filterStatic(p)
-                || filterDistance(p);
-
         if (filterInvalid(p)) {
-            filterType = "Invalid ";
+            filterType = filterType + "Invalid ";
         }
         if (filterZero(p)) {
-            filterType = (filterType + "Zero ");
+            filterType = filterType + "Zero ";
         }
         if (filterDuplicate(p)) {
-            filterType = (filterType + "Duplicate ");
+            filterType = filterType + "Duplicate ";
         }
         if (filterFuture(p)) {
-            filterType = (filterType + "Future ");
+            filterType = filterType + "Future ";
         }
         if (filterApproximate(p)) {
-            filterType = (filterType + "Approximate ");
+            filterType = filterType + "Approximate ";
         }
         if (filterStatic(p)) {
-            filterType = (filterType + "Static ");
+            filterType = filterType + "Static ";
         }
         if (filterDistance(p)) {
-            filterType = (filterType + "Distance ");
+            filterType = filterType + "Distance ";
         }
 
-        if (filterLimit(p)) {
-            result = false;
+        if (!"".equals(filterType) && !filterLimit(p)) {
+            result = true;
         }
 
         if (result) {
-- 
cgit v1.2.3