diff options
| -rw-r--r-- | src/net/sourceforge/opentracking/protocol/gps103/Gps103ProtocolDecoder.java | 3 | ||||
| -rw-r--r-- | test/net/sourceforge/opentracking/protocol/gps103/Gps103ProtocolDecoderTest.java | 3 |
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)); |