3 files changed, 21 insertions, 15 deletions
diff --git a/src/org/traccar/api/resource/EventResource.java b/src/org/traccar/api/resource/EventResource.java
index 4ea3e3b49..74a748ea5 100644
--- a/src/org/traccar/api/resource/EventResource.java
+++ b/src/org/traccar/api/resource/EventResource.java
@@ -35,5 +35,5 @@ public class EventResource extends BaseResource {
             @QueryParam("interval") int interval) throws SQLException {
         Context.getPermissionsManager().checkDevice(getUserId(), deviceId);
         return Context.getDataManager().getLastEvents(deviceId, type, interval);
-        }
+    }
 }
diff --git a/src/org/traccar/model/Event.java b/src/org/traccar/model/Event.java
index 75049c433..6de885c70 100644
--- a/src/org/traccar/model/Event.java
+++ b/src/org/traccar/model/Event.java
@@ -8,13 +8,13 @@ public class Event extends Message {
         this.setType(type);
         this.setDeviceId(deviceId);
         this.setPositionId(positionId);
-        this.eventTime = new Date();
+        this.serverTime = new Date();
     }
 
     public Event(String type, long deviceId) {
         this.setType(type);
         this.setDeviceId(deviceId);
-        this.eventTime = new Date();
+        this.serverTime = new Date();
     }
 
     public Event() {
@@ -43,21 +43,21 @@ public class Event extends Message {
     public static final String TYPE_GEOFENCE_ENTER = "geofenceEnter";
     public static final String TYPE_GEOFENCE_EXIT = "geofenceExit";
 
-    private Date eventTime;
+    private Date serverTime;
 
-    public Date getEventTime() {
-        if (eventTime != null) {
-            return new Date(eventTime.getTime());
+    public Date getServerTime() {
+        if (serverTime != null) {
+            return new Date(serverTime.getTime());
         } else {
             return null;
         }
     }
 
-    public void setEventTime(Date eventTime) {
-        if (eventTime != null) {
-            this.eventTime = new Date(eventTime.getTime());
+    public void setServerTime(Date serverTime) {
+        if (serverTime != null) {
+            this.serverTime = new Date(serverTime.getTime());
         } else {
-            this.eventTime = null;
+            this.serverTime = null;
         }
     }
 
diff --git a/src/org/traccar/protocol/Tk103ProtocolDecoder.java b/src/org/traccar/protocol/Tk103ProtocolDecoder.java
index 9512910f2..36378d088 100644
--- a/src/org/traccar/protocol/Tk103ProtocolDecoder.java
+++ b/src/org/traccar/protocol/Tk103ProtocolDecoder.java
@@ -170,10 +170,16 @@ public class Tk103ProtocolDecoder extends BaseProtocolDecoder {
         position.setLatitude(parser.nextCoordinate());
         position.setLongitude(parser.nextCoordinate());
 
-        if (Context.getConfig().getBoolean(getProtocolName() + ".mph")) {
-            position.setSpeed(UnitsConverter.knotsFromMph(parser.nextDouble()));
-        } else {
-            position.setSpeed(UnitsConverter.knotsFromKph(parser.nextDouble()));
+        switch (Context.getConfig().getString(getProtocolName() + ".speed", "kmh")) {
+            case "kn":
+                position.setSpeed(parser.nextDouble());
+                break;
+            case "mph":
+                position.setSpeed(UnitsConverter.knotsFromMph(parser.nextDouble()));
+                break;
+            default:
+                position.setSpeed(UnitsConverter.knotsFromKph(parser.nextDouble()));
+                break;
         }
 
         dateBuilder.setTime(parser.nextInt(), parser.nextInt(), parser.nextInt());