Refactor motion handling

1 files changed, 17 insertions, 9 deletions

diff --git a/src/main/java/org/traccar/session/DeviceState.java b/src/main/java/org/traccar/session/DeviceState.java
index f67b906c4..7bf2a62ac 100644
--- a/src/main/java/org/traccar/session/DeviceState.java
+++ b/src/main/java/org/traccar/session/DeviceState.java
@@ -16,30 +16,38 @@
  */
 package org.traccar.session;
 
-import org.traccar.model.Position;
-
 import java.util.Date;
 
 public class DeviceState {
 
-    private Boolean motionState;
+    private boolean motionState;
 
     public void setMotionState(boolean motionState) {
         this.motionState = motionState;
     }
 
-    public Boolean getMotionState() {
+    public boolean getMotionState() {
         return motionState;
     }
 
-    private Position motionPosition;
+    private Date motionTime;
+
+    public Date getMotionTime() {
+        return motionTime;
+    }
+
+    public void setMotionTime(Date motionTime) {
+        this.motionTime = motionTime;
+    }
+
+    private double motionDistance;
 
-    public void setMotionPosition(Position motionPosition) {
-        this.motionPosition = motionPosition;
+    public double getMotionDistance() {
+        return motionDistance;
     }
 
-    public Position getMotionPosition() {
-        return motionPosition;
+    public void setMotionDistance(double motionDistance) {
+        this.motionDistance = motionDistance;
     }
 
     private boolean overspeedState;