Handle motion fluctuation (fix #5000)

6 files changed, 41 insertions, 8 deletions

diff --git a/src/main/java/org/traccar/handler/events/MotionEventHandler.java b/src/main/java/org/traccar/handler/events/MotionEventHandler.java
index 1b9763c41..c406bd935 100644
--- a/src/main/java/org/traccar/handler/events/MotionEventHandler.java
+++ b/src/main/java/org/traccar/handler/events/MotionEventHandler.java
@@ -75,7 +75,7 @@ public class MotionEventHandler extends BaseEventHandler {
             state.toDevice(device);
             try {
                 storage.updateObject(device, new Request(
-                        new Columns.Include("motionState", "motionTime", "motionDistance"),
+                        new Columns.Include("motionStreak", "motionState", "motionTime", "motionDistance"),
                         new Condition.Equals("id", device.getId())));
             } catch (StorageException e) {
                 LOGGER.warn("Update device motion error", e);
diff --git a/src/main/java/org/traccar/model/Device.java b/src/main/java/org/traccar/model/Device.java
index 7728172cb..b8c87921d 100644
--- a/src/main/java/org/traccar/model/Device.java
+++ b/src/main/java/org/traccar/model/Device.java
@@ -162,6 +162,19 @@ public class Device extends GroupedModel implements Disableable {
         this.expirationTime = expirationTime;
     }
 
+    private boolean motionStreak;
+
+    @QueryIgnore
+    @JsonIgnore
+    public boolean getMotionStreak() {
+        return motionStreak;
+    }
+
+    @JsonIgnore
+    public void setMotionStreak(boolean motionStreak) {
+        this.motionStreak = motionStreak;
+    }
+
     private boolean motionState;
 
     @QueryIgnore
diff --git a/src/main/java/org/traccar/reports/common/ReportUtils.java b/src/main/java/org/traccar/reports/common/ReportUtils.java
index 120dadcf5..a7c420095 100644
--- a/src/main/java/org/traccar/reports/common/ReportUtils.java
+++ b/src/main/java/org/traccar/reports/common/ReportUtils.java
@@ -354,7 +354,9 @@ public class ReportUtils {
             boolean trips = reportClass.equals(TripReportItem.class);
 
             MotionState motionState = new MotionState();
-            motionState.setMotionState(isMoving(positions, 0, tripsConfig));
+            boolean initialValue = isMoving(positions, 0, tripsConfig);
+            motionState.setMotionStreak(initialValue);
+            motionState.setMotionState(initialValue);
 
             boolean detected = trips == motionState.getMotionState();
             int startEventIndex = detected ? 0 : -1;
diff --git a/src/main/java/org/traccar/session/state/MotionProcessor.java b/src/main/java/org/traccar/session/state/MotionProcessor.java
index b9d706492..a1737a739 100644
--- a/src/main/java/org/traccar/session/state/MotionProcessor.java
+++ b/src/main/java/org/traccar/session/state/MotionProcessor.java
@@ -59,6 +59,7 @@ public final class MotionProcessor {
                     String eventType = newState ? Event.TYPE_DEVICE_MOVING : Event.TYPE_DEVICE_STOPPED;
                     Event event = new Event(eventType, position);
 
+                    state.setMotionStreak(newState);
                     state.setMotionTime(null);
                     state.setMotionDistance(0);
                     state.setEvent(event);
@@ -67,8 +68,13 @@ public final class MotionProcessor {
             }
         } else {
             state.setMotionState(newState);
-            state.setMotionTime(position.getFixTime());
-            state.setMotionDistance(position.getDouble(Position.KEY_TOTAL_DISTANCE));
+            if (state.getMotionStreak() == newState) {
+                state.setMotionTime(null);
+                state.setMotionDistance(0);
+            } else {
+                state.setMotionTime(position.getFixTime());
+                state.setMotionDistance(position.getDouble(Position.KEY_TOTAL_DISTANCE));
+            }
         }
     }
 
diff --git a/src/main/java/org/traccar/session/state/MotionState.java b/src/main/java/org/traccar/session/state/MotionState.java
index e3ce58ab2..6c917ad16 100644
--- a/src/main/java/org/traccar/session/state/MotionState.java
+++ b/src/main/java/org/traccar/session/state/MotionState.java
@@ -24,6 +24,7 @@ public class MotionState {
 
     public static MotionState fromDevice(Device device) {
         MotionState state = new MotionState();
+        state.motionStreak = device.getMotionStreak();
         state.motionState = device.getMotionState();
         state.motionTime = device.getMotionTime();
         state.motionDistance = device.getMotionDistance();
@@ -31,6 +32,7 @@ public class MotionState {
     }
 
     public void toDevice(Device device) {
+        device.setMotionStreak(motionStreak);
         device.setMotionState(motionState);
         device.setMotionTime(motionTime);
         device.setMotionDistance(motionDistance);
@@ -42,6 +44,17 @@ public class MotionState {
         return changed;
     }
 
+    private boolean motionStreak;
+
+    public boolean getMotionStreak() {
+        return motionStreak;
+    }
+
+    public void setMotionStreak(boolean motionStreak) {
+        this.motionStreak = motionStreak;
+        changed = true;
+    }
+
     private boolean motionState;
 
     public boolean getMotionState() {
diff --git a/src/test/java/org/traccar/handler/events/MotionEventHandlerTest.java b/src/test/java/org/traccar/handler/events/MotionEventHandlerTest.java
index 25c766b51..b77676dc8 100644
--- a/src/test/java/org/traccar/handler/events/MotionEventHandlerTest.java
+++ b/src/test/java/org/traccar/handler/events/MotionEventHandlerTest.java
@@ -1,6 +1,5 @@
 package org.traccar.handler.events;
 
-import org.junit.Ignore;
 import org.junit.Test;
 import org.traccar.BaseTest;
 import org.traccar.model.Event;
@@ -62,7 +61,6 @@ public class MotionEventHandlerTest extends BaseTest {
         verifyState(state, false, 0);
     }
 
-    @Ignore
     @Test
     public void testMotionFluctuation() throws ParseException {
         TripsConfig tripsConfig = new TripsConfig(500, 300000, 300000, 0, false, false, 0.01);
@@ -87,11 +85,11 @@ public class MotionEventHandlerTest extends BaseTest {
 
         MotionProcessor.updateState(state, position("2017-01-01 00:04:00", true, 1000, null), true, tripsConfig);
         assertNull(state.getEvent());
-        verifyState(state, true, 1000);
+        verifyState(state, true, 0);
 
         MotionProcessor.updateState(state, position("2017-01-01 00:06:00", true, 2000, null), true, tripsConfig);
         assertNull(state.getEvent());
-        verifyState(state, true, 2000);
+        verifyState(state, true, 0);
     }
 
     @Test
@@ -99,6 +97,7 @@ public class MotionEventHandlerTest extends BaseTest {
         TripsConfig tripsConfig = new TripsConfig(500, 300000, 300000, 0, true, false, 0.01);
 
         MotionState state = new MotionState();
+        state.setMotionStreak(true);
         state.setMotionState(true);
 
         MotionProcessor.updateState(state, position("2017-01-01 00:00:00", false, 100, true), false, tripsConfig);