aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/org/traccar/session
diff options
context:
space:
mode:
authorAnton Tananaev <anton@traccar.org>2022-12-14 16:08:25 -0800
committerAnton Tananaev <anton@traccar.org>2022-12-14 16:08:25 -0800
commit3b36ac38a0c4e193ea8085eb5556dffd8205bb17 (patch)
tree45d60d8132bdacac3901282bb8ba09ddb3640c45 /src/main/java/org/traccar/session
parent836dc4138fdcf560a31c6a90769b19f6a0d0e438 (diff)
downloadtrackermap-server-3b36ac38a0c4e193ea8085eb5556dffd8205bb17.tar.gz
trackermap-server-3b36ac38a0c4e193ea8085eb5556dffd8205bb17.tar.bz2
trackermap-server-3b36ac38a0c4e193ea8085eb5556dffd8205bb17.zip
Handle motion fluctuation (fix #5000)
Diffstat (limited to 'src/main/java/org/traccar/session')
-rw-r--r--src/main/java/org/traccar/session/state/MotionProcessor.java10
-rw-r--r--src/main/java/org/traccar/session/state/MotionState.java13
2 files changed, 21 insertions, 2 deletions
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() {