Merge pull request #1978 from Abyss777/master

Simplification of the models hierarchy

1 files changed, 4 insertions, 5 deletions

diff --git a/src/org/traccar/protocol/WatchProtocolDecoder.java b/src/org/traccar/protocol/WatchProtocolDecoder.java
index 0c35ef3a0..b9b42332f 100644
--- a/src/org/traccar/protocol/WatchProtocolDecoder.java
+++ b/src/org/traccar/protocol/WatchProtocolDecoder.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;
@@ -100,7 +99,7 @@ public class WatchProtocolDecoder extends BaseProtocolDecoder {
 
                     getLastLocation(position, null);
 
-                    position.set(Event.KEY_BATTERY, values[3]);
+                    position.set(Position.KEY_BATTERY, values[3]);
 
                     return position;
                 }
@@ -133,9 +132,9 @@ public class WatchProtocolDecoder extends BaseProtocolDecoder {
             position.setCourse(parser.nextDouble());
             position.setAltitude(parser.nextDouble());
 
-            position.set(Event.KEY_SATELLITES, parser.nextInt());
-            position.set(Event.KEY_GSM, parser.nextInt());
-            position.set(Event.KEY_BATTERY, parser.nextInt());
+            position.set(Position.KEY_SATELLITES, parser.nextInt());
+            position.set(Position.KEY_GSM, parser.nextInt());
+            position.set(Position.KEY_BATTERY, parser.nextInt());
 
             position.set("steps", parser.nextInt());