Merge pull request #1978 from Abyss777/master

Simplification of the models hierarchy

1 files changed, 3 insertions, 4 deletions

diff --git a/src/org/traccar/protocol/EasyTrackProtocolDecoder.java b/src/org/traccar/protocol/EasyTrackProtocolDecoder.java
index 320cb3a4f..013b9cc43 100644
--- a/src/org/traccar/protocol/EasyTrackProtocolDecoder.java
+++ b/src/org/traccar/protocol/EasyTrackProtocolDecoder.java
@@ -21,7 +21,6 @@ import org.traccar.helper.BitUtil;
 import org.traccar.helper.DateBuilder;
 import org.traccar.helper.Parser;
 import org.traccar.helper.PatternBuilder;
-import org.traccar.model.Event;
 import org.traccar.model.Position;
 
 import java.net.SocketAddress;
@@ -100,11 +99,11 @@ public class EasyTrackProtocolDecoder extends BaseProtocolDecoder {
         position.setSpeed(parser.nextInt(16) / 100.0);
         position.setCourse(parser.nextInt(16) / 100.0);
 
-        position.set(Event.KEY_STATUS, parser.next());
+        position.set(Position.KEY_STATUS, parser.next());
         position.set("signal", parser.next());
-        position.set(Event.KEY_POWER, parser.nextDouble());
+        position.set(Position.KEY_POWER, parser.nextDouble());
         position.set("oil", parser.nextInt(16));
-        position.set(Event.KEY_ODOMETER, parser.nextInt(16));
+        position.set(Position.KEY_ODOMETER, parser.nextInt(16));
 
         position.setAltitude(parser.nextDouble());