Merge pull request #1978 from Abyss777/master

Simplification of the models hierarchy

1 files changed, 10 insertions, 11 deletions

diff --git a/src/org/traccar/protocol/AstraProtocolDecoder.java b/src/org/traccar/protocol/AstraProtocolDecoder.java
index 8f40abedf..f6b4ed559 100644
--- a/src/org/traccar/protocol/AstraProtocolDecoder.java
+++ b/src/org/traccar/protocol/AstraProtocolDecoder.java
@@ -22,7 +22,6 @@ import org.traccar.BaseProtocolDecoder;
 import org.traccar.helper.BitUtil;
 import org.traccar.helper.DateBuilder;
 import org.traccar.helper.UnitsConverter;
-import org.traccar.model.Event;
 import org.traccar.model.Position;
 
 import java.net.SocketAddress;
@@ -78,13 +77,13 @@ public class AstraProtocolDecoder extends BaseProtocolDecoder {
             position.setCourse(buf.readUnsignedByte() * 2);
 
             int reason = buf.readUnsignedMedium();
-            position.set(Event.KEY_EVENT, reason);
+            position.set(Position.KEY_EVENT, reason);
 
-            position.set(Event.KEY_STATUS, buf.readUnsignedShort());
-            position.set(Event.PREFIX_IO + 1, buf.readUnsignedByte());
-            position.set(Event.PREFIX_ADC + 1, buf.readUnsignedByte());
-            position.set(Event.KEY_BATTERY, buf.readUnsignedByte());
-            position.set(Event.KEY_POWER, buf.readUnsignedByte());
+            position.set(Position.KEY_STATUS, buf.readUnsignedShort());
+            position.set(Position.PREFIX_IO + 1, buf.readUnsignedByte());
+            position.set(Position.PREFIX_ADC + 1, buf.readUnsignedByte());
+            position.set(Position.KEY_BATTERY, buf.readUnsignedByte());
+            position.set(Position.KEY_POWER, buf.readUnsignedByte());
 
             buf.readUnsignedByte(); // max journey speed
             buf.skipBytes(6); // accelerometer
@@ -94,15 +93,15 @@ public class AstraProtocolDecoder extends BaseProtocolDecoder {
             position.setAltitude(buf.readUnsignedByte() * 20);
 
             int quality = buf.readUnsignedByte();
-            position.set(Event.KEY_SATELLITES, quality & 0xf);
-            position.set(Event.KEY_GSM, quality >> 4);
+            position.set(Position.KEY_SATELLITES, quality & 0xf);
+            position.set(Position.KEY_GSM, quality >> 4);
 
             buf.readUnsignedByte(); // geofence events
 
             if (BitUtil.check(reason, 6) || BitUtil.check(reason, 7)) {
 
-                position.set(Event.KEY_RFID, buf.readBytes(7).toString(StandardCharsets.US_ASCII));
-                position.set(Event.KEY_ODOMETER, buf.readUnsignedMedium());
+                position.set(Position.KEY_RFID, buf.readBytes(7).toString(StandardCharsets.US_ASCII));
+                position.set(Position.KEY_ODOMETER, buf.readUnsignedMedium());
 
                 buf.readUnsignedShort(); // engine time