Merge pull request #1978 from Abyss777/master

Simplification of the models hierarchy

1 files changed, 8 insertions, 9 deletions

diff --git a/src/org/traccar/protocol/VisiontekProtocolDecoder.java b/src/org/traccar/protocol/VisiontekProtocolDecoder.java
index 63f43fda8..5d9b905f1 100644
--- a/src/org/traccar/protocol/VisiontekProtocolDecoder.java
+++ b/src/org/traccar/protocol/VisiontekProtocolDecoder.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;
@@ -108,18 +107,18 @@ public class VisiontekProtocolDecoder extends BaseProtocolDecoder {
         position.setCourse(parser.nextDouble());
         position.setAltitude(parser.nextDouble());
 
-        position.set(Event.KEY_SATELLITES, parser.next());
-        position.set(Event.KEY_ODOMETER, parser.next());
-        position.set(Event.KEY_IGNITION, parser.next());
-        position.set(Event.PREFIX_IO + 1, parser.next());
-        position.set(Event.PREFIX_IO + 2, parser.next());
+        position.set(Position.KEY_SATELLITES, parser.next());
+        position.set(Position.KEY_ODOMETER, parser.next());
+        position.set(Position.KEY_IGNITION, parser.next());
+        position.set(Position.PREFIX_IO + 1, parser.next());
+        position.set(Position.PREFIX_IO + 2, parser.next());
         position.set("immobilizer", parser.next());
-        position.set(Event.KEY_POWER, parser.next());
-        position.set(Event.KEY_GSM, parser.next());
+        position.set(Position.KEY_POWER, parser.next());
+        position.set(Position.KEY_GSM, parser.next());
 
         position.setValid(parser.next().equals("A"));
 
-        position.set(Event.KEY_RFID, parser.next());
+        position.set(Position.KEY_RFID, parser.next());
 
         return position;
     }