diff options
author | Leandro Silva Ferreira <leandrosilvaferreira@gmail.com> | 2012-08-15 12:07:46 -0400 |
---|---|---|
committer | Leandro Silva Ferreira <leandrosilvaferreira@gmail.com> | 2012-08-15 12:07:46 -0400 |
commit | ba78f64d458bf03a3ffbac87369def5f79cbc8ae (patch) | |
tree | 6a3c65612c6ae5a997e0a93c840e314ed03c0f72 | |
parent | 3a78e641bacccaca181bbd292f0f2f0d579b5caf (diff) | |
download | traccar-server-ba78f64d458bf03a3ffbac87369def5f79cbc8ae.tar.gz traccar-server-ba78f64d458bf03a3ffbac87369def5f79cbc8ae.tar.bz2 traccar-server-ba78f64d458bf03a3ffbac87369def5f79cbc8ae.zip |
Corrections of reamaing problems of CELL field.
-rw-r--r-- | src/org/traccar/protocol/ST210ProtocolDecoder.java | 2 | ||||
-rw-r--r-- | test/org/traccar/protocol/ST210ProtocolDecoderTest.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/org/traccar/protocol/ST210ProtocolDecoder.java b/src/org/traccar/protocol/ST210ProtocolDecoder.java index 61dcf8782..983e9c6f4 100644 --- a/src/org/traccar/protocol/ST210ProtocolDecoder.java +++ b/src/org/traccar/protocol/ST210ProtocolDecoder.java @@ -33,7 +33,7 @@ public class ST210ProtocolDecoder extends GenericProtocolDecoder { SW_VER("(\\d{3});", "Software Release Version"), DATE("(\\d+);","GPS date (yyyymmdd) Year + Month + Day"), TIME("(\\d{2}:\\d{2}:\\d{2});","GPS time (hh:mm:ss) Hour : Minute : Second"), - CELL("(\\w{3}\\d{2});","Location Code ID (3 digits hex) + Serving Cell BSIC(2 digits decimal)"), + CELL("(\\w+);","Location Code ID (3 digits hex) + Serving Cell BSIC(2 digits decimal)"), LAT("(-\\d{2}.\\d+);", "Latitude (+/-xx.xxxxxx)"), LON("(-\\d{3}.\\d+);", "Longitude (+/-xxx.xxxxxx)"), SPD("(\\d{3}.\\d{3});","Speed in km/h - This value returns to 0 when it is over than 200,000Km"), diff --git a/test/org/traccar/protocol/ST210ProtocolDecoderTest.java b/test/org/traccar/protocol/ST210ProtocolDecoderTest.java index 9fc6f9e28..bc2e6e21e 100644 --- a/test/org/traccar/protocol/ST210ProtocolDecoderTest.java +++ b/test/org/traccar/protocol/ST210ProtocolDecoderTest.java @@ -27,7 +27,7 @@ public class ST210ProtocolDecoderTest { assertNotNull(decoder .decode(null, null, - "SA200STT;315198;042;20120808;20:37:34;42948;-15.618731;-056.083216;000.007;000.00;12;1;48;0.00;000000;1;0127")); + "SA200STT;315198;042;20120808;20:37:34;3fac25;-15.618731;-056.083216;000.007;000.00;12;1;48;0.00;000000;1;0127")); assertNotNull(decoder .decode(null, null, |