- Simplification of the hierarchy of models classes

- Removed automatically founded unnecessary imports

1 files changed, 104 insertions, 1 deletions

diff --git a/src/org/traccar/model/Position.java b/src/org/traccar/model/Position.java
index 1a38681ca..22d1be846 100644
--- a/src/org/traccar/model/Position.java
+++ b/src/org/traccar/model/Position.java
@@ -17,7 +17,110 @@ package org.traccar.model;
 
 import java.util.Date;
 
-public class Position extends Event {
+public class Position extends Message {
+
+    // Words separated by dashes (word-second-third)
+    public static final String KEY_ORIGINAL = "raw";
+    public static final String KEY_INDEX = "index";
+    public static final String KEY_HDOP = "hdop";
+    public static final String KEY_SATELLITES = "sat";
+    public static final String KEY_GSM = "gsm";
+    public static final String KEY_GPS = "gps";
+    public static final String KEY_EVENT = "event";
+    public static final String KEY_ALARM = "alarm";
+    public static final String KEY_STATUS = "status";
+    public static final String KEY_ODOMETER = "odometer";
+    public static final String KEY_HOURS = "hours";
+    public static final String KEY_INPUT = "input";
+    public static final String KEY_OUTPUT = "output";
+    public static final String KEY_POWER = "power";
+    public static final String KEY_BATTERY = "battery";
+    public static final String KEY_MCC = "mcc";
+    public static final String KEY_MNC = "mnc";
+    public static final String KEY_LAC = "lac";
+    public static final String KEY_CID = "cid";
+    public static final String KEY_FUEL = "fuel";
+    public static final String KEY_RFID = "rfid";
+    public static final String KEY_VERSION = "version";
+    public static final String KEY_TYPE = "type";
+    public static final String KEY_IGNITION = "ignition";
+    public static final String KEY_FLAGS = "flags";
+    public static final String KEY_CHARGE = "charge";
+    public static final String KEY_IP = "ip";
+    public static final String KEY_ARCHIVE = "archive";
+    public static final String KEY_DISTANCE = "distance";
+    public static final String KEY_RPM = "rpm";
+    public static final String KEY_VIN = "vin";
+    public static final String KEY_APPROXIMATE = "approximate";
+    public static final String KEY_THROTTLE = "throttle";
+    public static final String KEY_MOTION = "motion";
+
+    public static final String KEY_OBD_SPEED = "obd-speed";
+    public static final String KEY_OBD_ODOMETER = "obd-odometer";
+
+    public static final String KEY_RESULT = "result";
+
+    // Starts with 1 not 0
+    public static final String PREFIX_TEMP = "temp";
+    public static final String PREFIX_ADC = "adc";
+    public static final String PREFIX_IO = "io";
+    public static final String PREFIX_COUNT = "count";
+
+    private long id;
+
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    private String protocol;
+
+    public String getProtocol() {
+        return protocol;
+    }
+
+    public void setProtocol(String protocol) {
+        this.protocol = protocol;
+    }
+
+    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 Date deviceTime;
+
+    public Date getDeviceTime() {
+        if (deviceTime != null) {
+            return new Date(deviceTime.getTime());
+        } else {
+            return null;
+        }
+    }
+
+    public void setDeviceTime(Date deviceTime) {
+        if (deviceTime != null) {
+            this.deviceTime = new Date(deviceTime.getTime());
+        } else {
+            this.deviceTime = null;
+        }
+    }
 
     private Date fixTime;