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/WondexProtocolDecoder.java b/src/org/traccar/protocol/WondexProtocolDecoder.java
index 366466143..81aeff54e 100644
--- a/src/org/traccar/protocol/WondexProtocolDecoder.java
+++ b/src/org/traccar/protocol/WondexProtocolDecoder.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;
@@ -77,7 +76,7 @@ public class WondexProtocolDecoder extends BaseProtocolDecoder {
             position.setDeviceId(getDeviceId());
             getLastLocation(position, new Date());
             position.setValid(false);
-            position.set(Event.KEY_RESULT, buf.toString(StandardCharsets.US_ASCII));
+            position.set(Position.KEY_RESULT, buf.toString(StandardCharsets.US_ASCII));
 
             return position;
         } else {
@@ -108,15 +107,15 @@ public class WondexProtocolDecoder extends BaseProtocolDecoder {
 
             int satellites = parser.nextInt();
             position.setValid(satellites >= 3);
-            position.set(Event.KEY_SATELLITES, satellites);
-
-            position.set(Event.KEY_EVENT, parser.next());
-            position.set(Event.KEY_BATTERY, parser.next());
-            position.set(Event.KEY_ODOMETER, parser.next());
-            position.set(Event.KEY_INPUT, parser.next());
-            position.set(Event.PREFIX_ADC + 1, parser.next());
-            position.set(Event.PREFIX_ADC + 2, parser.next());
-            position.set(Event.KEY_OUTPUT, parser.next());
+            position.set(Position.KEY_SATELLITES, satellites);
+
+            position.set(Position.KEY_EVENT, parser.next());
+            position.set(Position.KEY_BATTERY, parser.next());
+            position.set(Position.KEY_ODOMETER, parser.next());
+            position.set(Position.KEY_INPUT, parser.next());
+            position.set(Position.PREFIX_ADC + 1, parser.next());
+            position.set(Position.PREFIX_ADC + 2, parser.next());
+            position.set(Position.KEY_OUTPUT, parser.next());
 
             return position;
         }