aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/protocol/NavigilProtocolDecoder.java
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2015-05-13 16:21:04 +1200
committerAnton Tananaev <anton.tananaev@gmail.com>2015-05-13 16:21:04 +1200
commitf01ebc2af707bccfd29049afad7d081c58e7f771 (patch)
treef0ccb599554be8e29c141da64df19b65969d4abb /src/org/traccar/protocol/NavigilProtocolDecoder.java
parent84d99d15e6048eb87ad4547273c5c9e6f69488b5 (diff)
downloadtrackermap-server-f01ebc2af707bccfd29049afad7d081c58e7f771.tar.gz
trackermap-server-f01ebc2af707bccfd29049afad7d081c58e7f771.tar.bz2
trackermap-server-f01ebc2af707bccfd29049afad7d081c58e7f771.zip
Implement units conversion class
Diffstat (limited to 'src/org/traccar/protocol/NavigilProtocolDecoder.java')
-rw-r--r--src/org/traccar/protocol/NavigilProtocolDecoder.java9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/org/traccar/protocol/NavigilProtocolDecoder.java b/src/org/traccar/protocol/NavigilProtocolDecoder.java
index a51acf3fe..0a2e8ce44 100644
--- a/src/org/traccar/protocol/NavigilProtocolDecoder.java
+++ b/src/org/traccar/protocol/NavigilProtocolDecoder.java
@@ -25,6 +25,7 @@ import org.jboss.netty.channel.ChannelHandlerContext;
import org.traccar.BaseProtocolDecoder;
import org.traccar.helper.Crc;
+import org.traccar.helper.UnitsConverter;
import org.traccar.model.Event;
import org.traccar.model.Position;
@@ -161,8 +162,8 @@ public class NavigilProtocolDecoder extends BaseProtocolDecoder {
position.setLatitude(buf.readMedium() * 0.00002);
position.setLongitude(buf.readMedium() * 0.00002);
- position.setSpeed(buf.readUnsignedByte() * 0.539957);
- position.setCourse(buf.readUnsignedByte() * 2.0);
+ position.setSpeed(UnitsConverter.knotsFromKph(buf.readUnsignedByte()));
+ position.setCourse(buf.readUnsignedByte() * 2);
short flags = buf.readUnsignedByte();
position.setValid((flags & 0x80) == 0x80 && (flags & 0x40) == 0x40);
@@ -184,7 +185,7 @@ public class NavigilProtocolDecoder extends BaseProtocolDecoder {
buf.readUnsignedByte(); // report trigger
- position.setSpeed(buf.readUnsignedByte() * 0.539957);
+ position.setSpeed(UnitsConverter.knotsFromKph(buf.readUnsignedByte()));
short flags = buf.readUnsignedByte();
position.setValid((flags & 0x80) == 0x80 && (flags & 0x40) == 0x40);
@@ -251,7 +252,7 @@ public class NavigilProtocolDecoder extends BaseProtocolDecoder {
position.setLatitude(buf.readInt() * 0.0000001);
position.setLongitude(buf.readInt() * 0.0000001);
- position.setSpeed(buf.readUnsignedByte() * 0.539957);
+ position.setSpeed(UnitsConverter.knotsFromKph(buf.readUnsignedByte()));
position.setCourse(buf.readUnsignedByte() * 2.0);
buf.readUnsignedByte(); // satellites in fix