Merge pull request #1978 from Abyss777/master

Simplification of the models hierarchy

1 files changed, 2 insertions, 3 deletions

diff --git a/src/org/traccar/protocol/RitiProtocolDecoder.java b/src/org/traccar/protocol/RitiProtocolDecoder.java
index 5db126a83..b509367bb 100644
--- a/src/org/traccar/protocol/RitiProtocolDecoder.java
+++ b/src/org/traccar/protocol/RitiProtocolDecoder.java
@@ -21,7 +21,6 @@ import org.traccar.BaseProtocolDecoder;
 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;
@@ -66,14 +65,14 @@ public class RitiProtocolDecoder extends BaseProtocolDecoder {
 
         position.set("mode", buf.readUnsignedByte());
         position.set("command", buf.readUnsignedByte());
-        position.set(Event.KEY_POWER, buf.readUnsignedShort());
+        position.set(Position.KEY_POWER, buf.readUnsignedShort());
 
         buf.skipBytes(5);
         buf.readUnsignedShort();
         buf.readUnsignedShort();
 
         position.set("distance", buf.readUnsignedInt());
-        position.set(Event.KEY_ODOMETER, buf.readUnsignedInt());
+        position.set(Position.KEY_ODOMETER, buf.readUnsignedInt());
 
         // Parse GPRMC
         int end = buf.indexOf(buf.readerIndex(), buf.writerIndex(), (byte) '*');