aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/org/traccar
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2019-11-05 22:33:27 -0800
committerAnton Tananaev <anton.tananaev@gmail.com>2019-11-05 22:33:27 -0800
commit771768c215d31e6b9e4a50079cabdbd96fc62d5f (patch)
tree9eac12404b469d09ccae33f89a06f578889bff5e /src/main/java/org/traccar
parent959c2762c7a8bd65f98b41c45e5e990fe5ff714d (diff)
downloadtrackermap-server-771768c215d31e6b9e4a50079cabdbd96fc62d5f.tar.gz
trackermap-server-771768c215d31e6b9e4a50079cabdbd96fc62d5f.tar.bz2
trackermap-server-771768c215d31e6b9e4a50079cabdbd96fc62d5f.zip
Update Plugin protocol
Diffstat (limited to 'src/main/java/org/traccar')
-rw-r--r--src/main/java/org/traccar/protocol/PluginProtocolDecoder.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/main/java/org/traccar/protocol/PluginProtocolDecoder.java b/src/main/java/org/traccar/protocol/PluginProtocolDecoder.java
index 106889ee0..b5d71854b 100644
--- a/src/main/java/org/traccar/protocol/PluginProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/PluginProtocolDecoder.java
@@ -40,12 +40,12 @@ public class PluginProtocolDecoder extends BaseProtocolDecoder {
.number("(dd)(dd)(dd),") // time (hhmmss)
.number("(-?d+.d+),") // longitude
.number("(-?d+.d+),") // latitude
- .number("(d+),") // speed
+ .number("(d+.?d*),") // speed
.number("(d+),") // course
.number("(-?d+),") // altitude
.number("(-?d+),") // satellites
.number("d+,") // type
- .number("(d+),") // odometer
+ .number("(d+.?d*),") // odometer
.number("(d+),") // status
.expression("[^,]*,")
.expression("[^,]*,")
@@ -78,12 +78,12 @@ public class PluginProtocolDecoder extends BaseProtocolDecoder {
position.setTime(parser.nextDateTime());
position.setLongitude(parser.nextDouble());
position.setLatitude(parser.nextDouble());
- position.setSpeed(UnitsConverter.knotsFromKph(parser.nextInt()));
+ position.setSpeed(UnitsConverter.knotsFromKph(parser.nextDouble()));
position.setCourse(parser.nextInt());
position.setAltitude(parser.nextInt());
position.set(Position.KEY_SATELLITES, parser.nextInt());
- position.set(Position.KEY_ODOMETER, parser.nextInt());
+ position.set(Position.KEY_ODOMETER, (long) (parser.nextDouble() * 1000));
position.set(Position.KEY_STATUS, parser.nextInt());
position.set(Position.KEY_EVENT, parser.nextInt());