diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2019-05-12 13:50:07 -0700 |
|---|---|---|
| committer | Anton Tananaev <anton.tananaev@gmail.com> | 2019-05-12 13:50:07 -0700 |
| commit | 277b2f7c4538a540a950efd3c465b3c0f192a76a (patch) | |
| tree | b027c633bb330e6327037a1edb17542b4a566417 | |
| parent | d07cf0b77fc020a68472a48d3941975491552324 (diff) | |
| download | trackermap-server-277b2f7c4538a540a950efd3c465b3c0f192a76a.tar.gz trackermap-server-277b2f7c4538a540a950efd3c465b3c0f192a76a.tar.bz2 trackermap-server-277b2f7c4538a540a950efd3c465b3c0f192a76a.zip | |
Support GlobalSat buffered data
| -rw-r--r-- | src/main/java/org/traccar/protocol/GlobalSatProtocolDecoder.java | 4 | ||||
| -rw-r--r-- | src/test/java/org/traccar/protocol/GlobalSatProtocolDecoderTest.java | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/main/java/org/traccar/protocol/GlobalSatProtocolDecoder.java b/src/main/java/org/traccar/protocol/GlobalSatProtocolDecoder.java index 3d4ab5760..8c48f8775 100644 --- a/src/main/java/org/traccar/protocol/GlobalSatProtocolDecoder.java +++ b/src/main/java/org/traccar/protocol/GlobalSatProtocolDecoder.java @@ -1,5 +1,5 @@ /* - * Copyright 2013 - 2018 Anton Tananaev (anton@traccar.org) + * Copyright 2013 - 2019 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. @@ -57,7 +57,7 @@ public class GlobalSatProtocolDecoder extends BaseProtocolDecoder { } String format; - if (sentence.startsWith("GSr")) { + if (sentence.startsWith("GSr") || sentence.startsWith("GSb")) { format = format0; } else if (sentence.startsWith("GSh")) { format = format1; diff --git a/src/test/java/org/traccar/protocol/GlobalSatProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/GlobalSatProtocolDecoderTest.java index 9746845a0..eac948cc4 100644 --- a/src/test/java/org/traccar/protocol/GlobalSatProtocolDecoderTest.java +++ b/src/test/java/org/traccar/protocol/GlobalSatProtocolDecoderTest.java @@ -13,6 +13,11 @@ public class GlobalSatProtocolDecoderTest extends ProtocolTest { verifyNull(decoder, text( "GSh,131826789036289,3,M,ea04*3d")); + decoder.setFormat0("TSPRXAB27GHKLMmnaictuvw*U!"); + + verifyPosition(decoder, text( + "GSb,GTR-388,358173053992353,0000,5,8080,3,270419,113326,E01020.6223,N6323.1937,129,0.01,154,10,0.8,12380mV,3128mV,0,0,11,242,02,10EB,120FC1B*5a!")); + decoder.setFormat0("SORPZAB27GHKLMN*U!"); verifyPosition(decoder, text( |