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/GlobalSatProtocolDecoder.java b/src/org/traccar/protocol/GlobalSatProtocolDecoder.java
index 8c378af90..b8bb742e4 100644
--- a/src/org/traccar/protocol/GlobalSatProtocolDecoder.java
+++ b/src/org/traccar/protocol/GlobalSatProtocolDecoder.java
@@ -22,7 +22,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;
@@ -164,7 +163,7 @@ public class GlobalSatProtocolDecoder extends BaseProtocolDecoder {
                     position.setCourse(Double.parseDouble(value));
                     break;
                 case 'N':
-                    position.set(Event.KEY_BATTERY, value);
+                    position.set(Position.KEY_BATTERY, value);
                     break;
                 default:
                     // Unsupported
@@ -222,8 +221,8 @@ public class GlobalSatProtocolDecoder extends BaseProtocolDecoder {
         position.setSpeed(parser.nextDouble());
         position.setCourse(parser.nextDouble());
 
-        position.set(Event.KEY_SATELLITES, parser.nextInt());
-        position.set(Event.KEY_HDOP, parser.next());
+        position.set(Position.KEY_SATELLITES, parser.nextInt());
+        position.set(Position.KEY_HDOP, parser.next());
 
         return position;
     }