diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2017-04-09 21:47:16 +1200 |
|---|---|---|
| committer | Anton Tananaev <anton.tananaev@gmail.com> | 2017-04-09 21:47:16 +1200 |
| commit | 1f4dc7e4413aae6f8e927d7d5a9c40a8bd0ae082 (patch) | |
| tree | a3f7a1445d30d3e08a61b3b0075d2d98a9dd640d /src/org/traccar | |
| parent | e104f5636d53311dfd91cafaa2cdea65260ae7dc (diff) | |
| download | traccar-server-1f4dc7e4413aae6f8e927d7d5a9c40a8bd0ae082.tar.gz traccar-server-1f4dc7e4413aae6f8e927d7d5a9c40a8bd0ae082.tar.bz2 traccar-server-1f4dc7e4413aae6f8e927d7d5a9c40a8bd0ae082.zip | |
Import cGuard protocol decoder (fix #3080)
Diffstat (limited to 'src/org/traccar')
| -rw-r--r-- | src/org/traccar/protocol/CguardProtocolDecoder.java | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/org/traccar/protocol/CguardProtocolDecoder.java b/src/org/traccar/protocol/CguardProtocolDecoder.java index 19144017a..f1d593944 100644 --- a/src/org/traccar/protocol/CguardProtocolDecoder.java +++ b/src/org/traccar/protocol/CguardProtocolDecoder.java @@ -35,13 +35,13 @@ public class CguardProtocolDecoder extends BaseProtocolDecoder { private static final Pattern PATTERN_NV = new PatternBuilder() .text("NV:") .number("(dd)(dd)(dd) ") // date (yymmdd) - .number("(dd)(dd)(dd):") // time (hhmmss) - .number("(-?d+.d+):") // longitude - .number("(-?d+.d+):") // latitude - .number("(d+.?d*):") // speed - .number("(?:NAN|(d+.?d*)):") // accuracy - .number("(?:NAN|(d+.?d*)):") // course - .number("(?:NAN|(d+.?d*))") // altitude + .number("(dd)(dd)(dd)") // time (hhmmss) + .number(":(-?d+.d+)") // longitude + .number(":(-?d+.d+)") // latitude + .number(":(d+.?d*)") // speed + .number(":(?:NAN|(d+.?d*))") // accuracy + .number(":(?:NAN|(d+.?d*))") // course + .number(":(?:NAN|(d+.?d*))").optional() // altitude .compile(); private static final Pattern PATTERN_BC = new PatternBuilder() |