aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2015-05-20 11:53:28 +1200
committerAnton Tananaev <anton.tananaev@gmail.com>2015-05-20 11:53:28 +1200
commiteb586ea7e074c87444663aa71e9da6f538429ae5 (patch)
treed914487804a1f2645bef58c175b57f7a2c12a22c
parente2f954ca7347e5df74e32fced79cceee6408d8c4 (diff)
downloadtraccar-server-eb586ea7e074c87444663aa71e9da6f538429ae5.tar.gz
traccar-server-eb586ea7e074c87444663aa71e9da6f538429ae5.tar.bz2
traccar-server-eb586ea7e074c87444663aa71e9da6f538429ae5.zip
Fix Xirgo regex pattern
-rw-r--r--src/org/traccar/protocol/XirgoProtocolDecoder.java2
-rw-r--r--test/org/traccar/protocol/XirgoProtocolDecoderTest.java6
2 files changed, 7 insertions, 1 deletions
diff --git a/src/org/traccar/protocol/XirgoProtocolDecoder.java b/src/org/traccar/protocol/XirgoProtocolDecoder.java
index 7ff82a5aa..397924791 100644
--- a/src/org/traccar/protocol/XirgoProtocolDecoder.java
+++ b/src/org/traccar/protocol/XirgoProtocolDecoder.java
@@ -47,7 +47,7 @@ public class XirgoProtocolDecoder extends BaseProtocolDecoder {
"(\\d+\\.?\\d*)," + // Speed
"(\\d+\\.?\\d*)," + // Course
"(\\d+)," + // Satellites
- "(\\d+)," + // HDOP
+ "(\\d+\\.?\\d*)," + // HDOP
"(\\d+\\.\\d+)," + // Battery
"(\\d+)," + // GSM
"(\\d+\\.?\\d*)," + // Odometer
diff --git a/test/org/traccar/protocol/XirgoProtocolDecoderTest.java b/test/org/traccar/protocol/XirgoProtocolDecoderTest.java
index 99e5f95ec..4e6670837 100644
--- a/test/org/traccar/protocol/XirgoProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/XirgoProtocolDecoderTest.java
@@ -12,8 +12,14 @@ public class XirgoProtocolDecoderTest extends ProtocolDecoderTest {
XirgoProtocolDecoder decoder = new XirgoProtocolDecoder(null);
verify(decoder.decode(null, null, null,
+ "$$357207059646786,4003,2015/05/19,15:54:56,-20.21422,-70.14927,37.5,1.8,0.0,11,0.8,12.9,31,297,1,0,0.0,0.0,0,1,1,1##"));
+
+ verify(decoder.decode(null, null, null,
"$$354898045650537,6031,2015/02/26,15:47:26,33.42552,-112.30308,287.8,0,0,0,0,0.0,7,1.2,2,0.0,12.2,22,1,0,82.3"));
+ verify(decoder.decode(null, null, null,
+ "$$357207059646786,4003,2015/05/19,15:55:27,-20.21421,-70.14920,33.6,0.4,0.0,11,0.8,12.9,31,297,1,0,0.0,0.0,0,1,1,1##"));
+
}
}