aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/protocol/NvsProtocolDecoder.java
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2016-05-26 10:02:37 -0700
committerAnton Tananaev <anton.tananaev@gmail.com>2016-05-26 10:02:37 -0700
commitd3e34416e9825833fa1db02112c56981999df039 (patch)
treed21b4414b532bfc53c9a905f3caa09f70b43b59e /src/org/traccar/protocol/NvsProtocolDecoder.java
parentac2405f0d57fac51fe95aa755f90fe82f26f73bc (diff)
parentaa12e5c750e771016545269ffa39409b06b47eee (diff)
downloadtrackermap-server-d3e34416e9825833fa1db02112c56981999df039.tar.gz
trackermap-server-d3e34416e9825833fa1db02112c56981999df039.tar.bz2
trackermap-server-d3e34416e9825833fa1db02112c56981999df039.zip
Merge pull request #1978 from Abyss777/master
Simplification of the models hierarchy
Diffstat (limited to 'src/org/traccar/protocol/NvsProtocolDecoder.java')
-rw-r--r--src/org/traccar/protocol/NvsProtocolDecoder.java11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/org/traccar/protocol/NvsProtocolDecoder.java b/src/org/traccar/protocol/NvsProtocolDecoder.java
index 5d91a04ab..2a195c599 100644
--- a/src/org/traccar/protocol/NvsProtocolDecoder.java
+++ b/src/org/traccar/protocol/NvsProtocolDecoder.java
@@ -20,7 +20,6 @@ import org.jboss.netty.buffer.ChannelBuffers;
import org.jboss.netty.channel.Channel;
import org.traccar.BaseProtocolDecoder;
import org.traccar.helper.UnitsConverter;
-import org.traccar.model.Event;
import org.traccar.model.Position;
import java.net.SocketAddress;
@@ -84,7 +83,7 @@ public class NvsProtocolDecoder extends BaseProtocolDecoder {
position.setAltitude(buf.readShort());
position.setCourse(buf.readUnsignedShort());
- position.set(Event.KEY_SATELLITES, buf.readUnsignedByte());
+ position.set(Position.KEY_SATELLITES, buf.readUnsignedByte());
position.setSpeed(UnitsConverter.knotsFromKph(buf.readUnsignedShort()));
position.setValid(buf.readUnsignedByte() != 0);
@@ -96,25 +95,25 @@ public class NvsProtocolDecoder extends BaseProtocolDecoder {
// Read 1 byte data
int cnt = buf.readUnsignedByte();
for (int j = 0; j < cnt; j++) {
- position.set(Event.PREFIX_IO + buf.readUnsignedByte(), buf.readUnsignedByte());
+ position.set(Position.PREFIX_IO + buf.readUnsignedByte(), buf.readUnsignedByte());
}
// Read 2 byte data
cnt = buf.readUnsignedByte();
for (int j = 0; j < cnt; j++) {
- position.set(Event.PREFIX_IO + buf.readUnsignedByte(), buf.readUnsignedShort());
+ position.set(Position.PREFIX_IO + buf.readUnsignedByte(), buf.readUnsignedShort());
}
// Read 4 byte data
cnt = buf.readUnsignedByte();
for (int j = 0; j < cnt; j++) {
- position.set(Event.PREFIX_IO + buf.readUnsignedByte(), buf.readUnsignedInt());
+ position.set(Position.PREFIX_IO + buf.readUnsignedByte(), buf.readUnsignedInt());
}
// Read 8 byte data
cnt = buf.readUnsignedByte();
for (int j = 0; j < cnt; j++) {
- position.set(Event.PREFIX_IO + buf.readUnsignedByte(), buf.readLong());
+ position.set(Position.PREFIX_IO + buf.readUnsignedByte(), buf.readLong());
}
positions.add(position);