aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/protocol/CalAmpProtocolDecoder.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/CalAmpProtocolDecoder.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/CalAmpProtocolDecoder.java')
-rw-r--r--src/org/traccar/protocol/CalAmpProtocolDecoder.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/org/traccar/protocol/CalAmpProtocolDecoder.java b/src/org/traccar/protocol/CalAmpProtocolDecoder.java
index f5362f705..f6b06ebe7 100644
--- a/src/org/traccar/protocol/CalAmpProtocolDecoder.java
+++ b/src/org/traccar/protocol/CalAmpProtocolDecoder.java
@@ -26,6 +26,7 @@ import org.jboss.netty.channel.ChannelHandlerContext;
import org.jboss.netty.channel.Channels;
import org.jboss.netty.channel.MessageEvent;
import org.traccar.BaseProtocolDecoder;
+import org.traccar.helper.UnitsConverter;
import org.traccar.model.Event;
import org.traccar.model.Position;
@@ -170,11 +171,11 @@ public class CalAmpProtocolDecoder extends BaseProtocolDecoder {
position.setLongitude(buf.readInt() * 0.0000001);
if (type != MSG_MINI_EVENT_REPORT) {
position.setAltitude(buf.readInt() * 0.01);
- position.setSpeed(buf.readUnsignedInt() * 0.0194384449); // cm/s
+ position.setSpeed(UnitsConverter.knotsFromCps(buf.readUnsignedInt()));
}
position.setCourse(buf.readShort());
if (type == MSG_MINI_EVENT_REPORT) {
- position.setSpeed(buf.readUnsignedByte() * 0.539957); // km/h
+ position.setSpeed(UnitsConverter.knotsFromKph(buf.readUnsignedByte()));
}
// Fix status