diff options
author | Anton Tananaev <anton.tananaev@gmail.com> | 2016-05-31 11:01:33 +1200 |
---|---|---|
committer | Anton Tananaev <anton.tananaev@gmail.com> | 2016-05-31 11:01:33 +1200 |
commit | 4176894097bb9f3d06ff339e9e845c4969ca6874 (patch) | |
tree | adc2f19957d2371621222476cdb4a766a55a227d | |
parent | d3e34416e9825833fa1db02112c56981999df039 (diff) | |
download | trackermap-server-4176894097bb9f3d06ff339e9e845c4969ca6874.tar.gz trackermap-server-4176894097bb9f3d06ff339e9e845c4969ca6874.tar.bz2 trackermap-server-4176894097bb9f3d06ff339e9e845c4969ca6874.zip |
Support more speed units for TK103
-rw-r--r-- | src/org/traccar/protocol/Tk103ProtocolDecoder.java | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/org/traccar/protocol/Tk103ProtocolDecoder.java b/src/org/traccar/protocol/Tk103ProtocolDecoder.java index 9512910f2..36378d088 100644 --- a/src/org/traccar/protocol/Tk103ProtocolDecoder.java +++ b/src/org/traccar/protocol/Tk103ProtocolDecoder.java @@ -170,10 +170,16 @@ public class Tk103ProtocolDecoder extends BaseProtocolDecoder { position.setLatitude(parser.nextCoordinate()); position.setLongitude(parser.nextCoordinate()); - if (Context.getConfig().getBoolean(getProtocolName() + ".mph")) { - position.setSpeed(UnitsConverter.knotsFromMph(parser.nextDouble())); - } else { - position.setSpeed(UnitsConverter.knotsFromKph(parser.nextDouble())); + switch (Context.getConfig().getString(getProtocolName() + ".speed", "kmh")) { + case "kn": + position.setSpeed(parser.nextDouble()); + break; + case "mph": + position.setSpeed(UnitsConverter.knotsFromMph(parser.nextDouble())); + break; + default: + position.setSpeed(UnitsConverter.knotsFromKph(parser.nextDouble())); + break; } dateBuilder.setTime(parser.nextInt(), parser.nextInt(), parser.nextInt()); |