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/AuroProtocolDecoder.java b/src/org/traccar/protocol/AuroProtocolDecoder.java
index fd7690733..ff3ab5b0d 100644
--- a/src/org/traccar/protocol/AuroProtocolDecoder.java
+++ b/src/org/traccar/protocol/AuroProtocolDecoder.java
@@ -21,7 +21,6 @@ import org.traccar.helper.DateBuilder;
 import org.traccar.helper.Parser;
 import org.traccar.helper.PatternBuilder;
 import org.traccar.helper.UnitsConverter;
-import org.traccar.model.Event;
 import org.traccar.model.Position;
 
 import java.net.SocketAddress;
@@ -66,7 +65,7 @@ public class AuroProtocolDecoder extends BaseProtocolDecoder {
         Position position = new Position();
         position.setProtocol(getProtocolName());
 
-        position.set(Event.KEY_INDEX, parser.nextInt());
+        position.set(Position.KEY_INDEX, parser.nextInt());
 
         if (!identify(parser.next(), channel, remoteAddress)) {
             return null;
@@ -85,8 +84,8 @@ public class AuroProtocolDecoder extends BaseProtocolDecoder {
         position.setCourse(parser.nextDouble());
         position.setSpeed(UnitsConverter.knotsFromKph(parser.nextDouble()));
 
-        position.set(Event.KEY_BATTERY, parser.nextInt());
-        position.set(Event.KEY_CHARGE, parser.nextInt() == 1);
+        position.set(Position.KEY_BATTERY, parser.nextInt());
+        position.set(Position.KEY_CHARGE, parser.nextInt() == 1);
 
         return position;
     }