From f01ebc2af707bccfd29049afad7d081c58e7f771 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Wed, 13 May 2015 16:21:04 +1200 Subject: Implement units conversion class --- src/org/traccar/protocol/ApelProtocolDecoder.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/org/traccar/protocol/ApelProtocolDecoder.java') diff --git a/src/org/traccar/protocol/ApelProtocolDecoder.java b/src/org/traccar/protocol/ApelProtocolDecoder.java index 6b4e43dbd..5729231a5 100644 --- a/src/org/traccar/protocol/ApelProtocolDecoder.java +++ b/src/org/traccar/protocol/ApelProtocolDecoder.java @@ -30,6 +30,7 @@ import org.jboss.netty.channel.ChannelHandlerContext; import org.traccar.BaseProtocolDecoder; import org.traccar.helper.Crc; import org.traccar.helper.Log; +import org.traccar.helper.UnitsConverter; import org.traccar.model.Event; import org.traccar.model.Position; @@ -193,12 +194,12 @@ public class ApelProtocolDecoder extends BaseProtocolDecoder { if (subtype == MSG_TYPE_STATE_FULL_INFO_T104) { int speed = buf.readUnsignedByte(); position.setValid(speed != 255); - position.setSpeed(speed * 0.539957); + position.setSpeed(UnitsConverter.knotsFromKph(speed)); position.set(Event.KEY_HDOP, buf.readByte()); } else { int speed = buf.readShort(); position.setValid(speed != -1); - position.setSpeed(speed / 100.0 * 0.539957); + position.setSpeed(UnitsConverter.knotsFromKph(speed / 100.0)); } // Course -- cgit v1.2.3