Merge commands implementation (fix #7)

2 files changed, 36 insertions, 2 deletions

diff --git a/src/org/traccar/model/Command.java b/src/org/traccar/model/Command.java
new file mode 100644
index 000000000..f7702dbd0
--- /dev/null
+++ b/src/org/traccar/model/Command.java
@@ -0,0 +1,33 @@
+package org.traccar.model;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+public class Command implements Factory {
+
+    @Override
+    public Command create() {
+        return new Command();
+    }
+
+    private long deviceId;
+    public long getDeviceId() { return deviceId; }
+    public void setDeviceId(long deviceId) { this.deviceId = deviceId; }
+
+    private String type;
+    public String getType() { return type; }
+    public void setType(String type) { this.type = type; }
+
+    private Map<String, Object> other = new LinkedHashMap<>();
+    public Map<String, Object> getOther() { return other; }
+    public void setOther(Map<String, Object> other) { this.other = other; }
+
+    public static final String TYPE_POSITION_STOP = "positionStop";
+    public static final String TYPE_POSITION_FIX = "positionFix";
+    public static final String TYPE_ENGINE_STOP = "engineStop";
+    public static final String TYPE_ENGINE_RESUME = "engineResume";
+
+    public static final String KEY_UNIQUE_ID = "uniqueId";
+    public static final String KEY_FREQUENCY = "frequency";
+
+}
diff --git a/src/org/traccar/model/Event.java b/src/org/traccar/model/Event.java
index 0768ec9f3..b42a776ae 100644
--- a/src/org/traccar/model/Event.java
+++ b/src/org/traccar/model/Event.java
@@ -42,13 +42,14 @@ public abstract class Event {
     public void setDeviceTime(Date deviceTime) { this.deviceTime = deviceTime; }
 
     private Map<String, Object> other = new LinkedHashMap<>();
+    public Map<String, Object> getOther() { return other; }
+    public void setOther(Map<String, Object> other) { this.other = other; }
+
     public void set(String key, Object value) {
         if (value != null && (!(value instanceof String) || !((String) value).isEmpty())) {
             other.put(key, value);
         }
     }
-    public void setOther(Map<String, Object> other) { this.other = other; }
-    public Map<String, Object> getOther() { return other; }
 
     public static final String KEY_INDEX = "index";
     public static final String KEY_HDOP = "hdop";