aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2011-09-12 08:03:27 +0000
committerAnton Tananaev <anton.tananaev@gmail.com>2011-09-12 08:03:27 +0000
commitf8e340887d64b3d767e6d655d15a555c480d36a1 (patch)
treeec074bb18f2c9ec2e60c043d8bcba88d415918cc
parenteb4ee3a39352d5b3c2bd46ab9604fe3caf92de44 (diff)
downloadtrackermap-server-f8e340887d64b3d767e6d655d15a555c480d36a1.tar.gz
trackermap-server-f8e340887d64b3d767e6d655d15a555c480d36a1.tar.bz2
trackermap-server-f8e340887d64b3d767e6d655d15a555c480d36a1.zip
-rw-r--r--src/net/sourceforge/opentracking/protocol/gps103/Gps103ProtocolDecoder.java3
-rw-r--r--test/net/sourceforge/opentracking/protocol/gps103/Gps103ProtocolDecoderTest.java3
2 files changed, 4 insertions, 2 deletions
diff --git a/src/net/sourceforge/opentracking/protocol/gps103/Gps103ProtocolDecoder.java b/src/net/sourceforge/opentracking/protocol/gps103/Gps103ProtocolDecoder.java
index c9d8e2da1..85e29cc0e 100644
--- a/src/net/sourceforge/opentracking/protocol/gps103/Gps103ProtocolDecoder.java
+++ b/src/net/sourceforge/opentracking/protocol/gps103/Gps103ProtocolDecoder.java
@@ -70,7 +70,8 @@ public class Gps103ProtocolDecoder extends OneToOneDecoder {
"([NS])," +
"([\\d]{3})([\\d]{2}.[\\d]{4})," + // Longitude (DDDMM.MMMM)
"([EW])," +
- "([\\d]+.[\\d]{2}),"); // Speed
+ "([\\d]+.[\\d]{2})," + // Speed
+ ".*");
/**
* Decode message
diff --git a/test/net/sourceforge/opentracking/protocol/gps103/Gps103ProtocolDecoderTest.java b/test/net/sourceforge/opentracking/protocol/gps103/Gps103ProtocolDecoderTest.java
index 9e958b23a..0e99a8637 100644
--- a/test/net/sourceforge/opentracking/protocol/gps103/Gps103ProtocolDecoderTest.java
+++ b/test/net/sourceforge/opentracking/protocol/gps103/Gps103ProtocolDecoderTest.java
@@ -43,7 +43,8 @@ public class Gps103ProtocolDecoderTest {
String testMsg2 = //"imei:10000000000000,help me,1004171910,,F,010203.000,A,0102.0003,N,00102.0003,E,1.02,";
//"imei:353451040164707,tracker,1105182344,+36304665439,F,214418.000,A,4804.2222,N,01916.7593,E,0.37,";
- "imei:353451042861763,tracker,1106132241,,F,144114.000,A,2301.9052,S,04909.3676,W,0.13,";
+ //"imei:353451042861763,tracker,1106132241,, F,144114.000,A,2301.9052,S,04909.3676,W,0.13,";
+ "imei:359587010124900,tracker,0809231929,13554900601,F,112909.397,A,2234.4669,N,11354.3287,E,0.11,321.53,;";
Gps103ProtocolDecoder decoder = new Gps103ProtocolDecoder(new TestDataManager(), 0);
//assertNull(decoder.decode(null, null, testMsg1));