Merge pull request #1978 from Abyss777/master

Simplification of the models hierarchy

1 files changed, 6 insertions, 7 deletions

diff --git a/src/org/traccar/protocol/ArnaviProtocolDecoder.java b/src/org/traccar/protocol/ArnaviProtocolDecoder.java
index 47c459446..46728c53e 100644
--- a/src/org/traccar/protocol/ArnaviProtocolDecoder.java
+++ b/src/org/traccar/protocol/ArnaviProtocolDecoder.java
@@ -20,7 +20,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;
@@ -73,12 +72,12 @@ public class ArnaviProtocolDecoder extends BaseProtocolDecoder {
         }
         position.setDeviceId(getDeviceId());
 
-        position.set(Event.KEY_INDEX, parser.nextInt());
-        position.set(Event.KEY_POWER, parser.nextInt() * 0.01);
-        position.set(Event.KEY_BATTERY, parser.nextInt() * 0.01);
-        position.set(Event.KEY_IGNITION, parser.nextInt() == 1);
-        position.set(Event.KEY_INPUT, parser.nextInt());
-        position.set(Event.KEY_SATELLITES, parser.nextInt());
+        position.set(Position.KEY_INDEX, parser.nextInt());
+        position.set(Position.KEY_POWER, parser.nextInt() * 0.01);
+        position.set(Position.KEY_BATTERY, parser.nextInt() * 0.01);
+        position.set(Position.KEY_IGNITION, parser.nextInt() == 1);
+        position.set(Position.KEY_INPUT, parser.nextInt());
+        position.set(Position.KEY_SATELLITES, parser.nextInt());
 
         DateBuilder dateBuilder = new DateBuilder()
                 .setTime(parser.nextInt(), parser.nextInt(), parser.nextInt());