2 files changed, 87 insertions, 0 deletions
diff --git a/src/org/traccar/model/Device.java b/src/org/traccar/model/Device.java
index 934e753b1..d32f9f851 100644
--- a/src/org/traccar/model/Device.java
+++ b/src/org/traccar/model/Device.java
@@ -101,4 +101,17 @@ public class Device {
         this.groupId = groupId;
     }
 
+    public static final String STATUS_MOVING = "moving";
+    public static final String STATUS_STOPPED = "stopped";
+
+    private String motion;
+
+    public String getMotion() {
+        return motion;
+    }
+
+    public void setMotion(String motion) {
+        this.motion = motion;
+    }
+
 }
diff --git a/src/org/traccar/model/Event.java b/src/org/traccar/model/Event.java
new file mode 100644
index 000000000..6de885c70
--- /dev/null
+++ b/src/org/traccar/model/Event.java
@@ -0,0 +1,74 @@
+package org.traccar.model;
+
+import java.util.Date;
+
+public class Event extends Message {
+
+    public Event(String type, long deviceId, long positionId) {
+        this.setType(type);
+        this.setDeviceId(deviceId);
+        this.setPositionId(positionId);
+        this.serverTime = new Date();
+    }
+
+    public Event(String type, long deviceId) {
+        this.setType(type);
+        this.setDeviceId(deviceId);
+        this.serverTime = new Date();
+    }
+
+    public Event() {
+    }
+
+    private long id;
+
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public static final String TYPE_COMMAND_RESULT = "commandResult";
+
+    public static final String TYPE_DEVICE_ONLINE = "deviceOnline";
+    public static final String TYPE_DEVICE_OFFLINE = "deviceOffline";
+
+    public static final String TYPE_DEVICE_MOVING = "deviceMoving";
+    public static final String TYPE_DEVICE_STOPPED = "deviceStopped";
+
+    public static final String TYPE_DEVICE_OVERSPEED = "deviceOverspeed";
+
+    public static final String TYPE_GEOFENCE_ENTER = "geofenceEnter";
+    public static final String TYPE_GEOFENCE_EXIT = "geofenceExit";
+
+    private Date serverTime;
+
+    public Date getServerTime() {
+        if (serverTime != null) {
+            return new Date(serverTime.getTime());
+        } else {
+            return null;
+        }
+    }
+
+    public void setServerTime(Date serverTime) {
+        if (serverTime != null) {
+            this.serverTime = new Date(serverTime.getTime());
+        } else {
+            this.serverTime = null;
+        }
+    }
+
+    private long positionId;
+
+    public long getPositionId() {
+        return positionId;
+    }
+
+    public void setPositionId(long positionId) {
+        this.positionId = positionId;
+    }
+
+}