From 27e8b2f8b24b12ddc4662c5559419d72755bbf08 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton@traccar.org>
Date: Thu, 14 Jul 2022 18:50:44 -0700
Subject: Filter for old data (fix #3800)

---
 src/main/java/org/traccar/config/Keys.java           | 12 ++++++++++--
 src/main/java/org/traccar/handler/FilterHandler.java |  9 +++++++++
 2 files changed, 19 insertions(+), 2 deletions(-)

(limited to 'src/main')

diff --git a/src/main/java/org/traccar/config/Keys.java b/src/main/java/org/traccar/config/Keys.java
index 7ab45312f..5f31fe99c 100644
--- a/src/main/java/org/traccar/config/Keys.java
+++ b/src/main/java/org/traccar/config/Keys.java
@@ -1104,13 +1104,21 @@ public final class Keys {
             List.of(KeyType.CONFIG));
 
     /**
-     * Filter records with fix time in future. The values is specified in seconds. Records that have fix time more than
-     * specified number of seconds later than current server time would be filtered out.
+     * Filter records with fix time in the future. The value is specified in seconds. Records that have fix time more
+     * than the specified number of seconds later than current server time would be filtered out.
      */
     public static final ConfigKey<Long> FILTER_FUTURE = new LongConfigKey(
             "filter.future",
             List.of(KeyType.CONFIG));
 
+    /**
+     * Filter records with fix time in the past. The value is specified in seconds. Records that have fix time more
+     * than the specified number of seconds before current server time would be filtered out.
+     */
+    public static final ConfigKey<Long> FILTER_PAST = new LongConfigKey(
+            "filter.past",
+            List.of(KeyType.CONFIG));
+
     /**
      * Filter positions with accuracy less than specified value in meters.
      */
diff --git a/src/main/java/org/traccar/handler/FilterHandler.java b/src/main/java/org/traccar/handler/FilterHandler.java
index 0bd57319a..37f5cd566 100644
--- a/src/main/java/org/traccar/handler/FilterHandler.java
+++ b/src/main/java/org/traccar/handler/FilterHandler.java
@@ -47,6 +47,7 @@ public class FilterHandler extends BaseDataHandler {
     private final boolean filterZero;
     private final boolean filterDuplicate;
     private final long filterFuture;
+    private final long filterPast;
     private final boolean filterApproximate;
     private final int filterAccuracy;
     private final boolean filterStatic;
@@ -67,6 +68,7 @@ public class FilterHandler extends BaseDataHandler {
         filterZero = config.getBoolean(Keys.FILTER_ZERO);
         filterDuplicate = config.getBoolean(Keys.FILTER_DUPLICATE);
         filterFuture = config.getLong(Keys.FILTER_FUTURE) * 1000;
+        filterPast = config.getLong(Keys.FILTER_PAST) * 1000;
         filterAccuracy = config.getInteger(Keys.FILTER_ACCURACY);
         filterApproximate = config.getBoolean(Keys.FILTER_APPROXIMATE);
         filterStatic = config.getBoolean(Keys.FILTER_STATIC);
@@ -116,6 +118,10 @@ public class FilterHandler extends BaseDataHandler {
         return filterFuture != 0 && position.getFixTime().getTime() > System.currentTimeMillis() + filterFuture;
     }
 
+    private boolean filterPast(Position position) {
+        return filterPast != 0 && position.getFixTime().getTime() < System.currentTimeMillis() - filterPast;
+    }
+
     private boolean filterAccuracy(Position position) {
         return filterAccuracy != 0 && position.getAccuracy() > filterAccuracy;
     }
@@ -185,6 +191,9 @@ public class FilterHandler extends BaseDataHandler {
         if (filterFuture(position)) {
             filterType.append("Future ");
         }
+        if (filterPast(position)) {
+            filterType.append("Past ");
+        }
         if (filterAccuracy(position)) {
             filterType.append("Accuracy ");
         }
-- 
cgit v1.2.3