aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/org/traccar/protocol/OsmAndProtocolDecoder.java21
1 files changed, 19 insertions, 2 deletions
diff --git a/src/org/traccar/protocol/OsmAndProtocolDecoder.java b/src/org/traccar/protocol/OsmAndProtocolDecoder.java
index 6f8513c41..222369f58 100644
--- a/src/org/traccar/protocol/OsmAndProtocolDecoder.java
+++ b/src/org/traccar/protocol/OsmAndProtocolDecoder.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2013 - 2016 Anton Tananaev (anton@traccar.org)
+ * Copyright 2013 - 2017 Anton Tananaev (anton@traccar.org)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -25,7 +25,9 @@ import org.jboss.netty.handler.codec.http.HttpVersion;
import org.jboss.netty.handler.codec.http.QueryStringDecoder;
import org.joda.time.format.ISODateTimeFormat;
import org.traccar.BaseProtocolDecoder;
+import org.traccar.Context;
import org.traccar.DeviceSession;
+import org.traccar.helper.UnitsConverter;
import org.traccar.model.Position;
import java.net.SocketAddress;
@@ -38,8 +40,11 @@ import java.util.Map;
public class OsmAndProtocolDecoder extends BaseProtocolDecoder {
+ private String speedUnits;
+
public OsmAndProtocolDecoder(OsmAndProtocol protocol) {
super(protocol);
+ speedUnits = Context.getConfig().getString("osmand.speedUnits", "kn");
}
private void sendResponse(Channel channel, HttpResponseStatus status) {
@@ -110,7 +115,19 @@ public class OsmAndProtocolDecoder extends BaseProtocolDecoder {
position.setLongitude(Double.parseDouble(location[1]));
break;
case "speed":
- position.setSpeed(Double.parseDouble(value));
+ switch (speedUnits) {
+ case "kph":
+ position.setSpeed(UnitsConverter.knotsFromKph(Double.parseDouble(value)));
+ break;
+ case "mps":
+ position.setSpeed(UnitsConverter.knotsFromMps(Double.parseDouble(value)));
+ break;
+ case "mph":
+ position.setSpeed(UnitsConverter.knotsFromMph(Double.parseDouble(value)));
+ break;
+ default:
+ position.setSpeed(Double.parseDouble(value));
+ }
break;
case "bearing":
case "heading":