From f629297ceecfd6fb1ad64adf1549980d30e0343f Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Tue, 6 Nov 2012 00:05:17 +1300 Subject: Further gps103 pattern fix --- src/org/traccar/protocol/Gps103ProtocolDecoder.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'src/org/traccar/protocol/Gps103ProtocolDecoder.java') diff --git a/src/org/traccar/protocol/Gps103ProtocolDecoder.java b/src/org/traccar/protocol/Gps103ProtocolDecoder.java index a8d819cbc..020feb6f6 100644 --- a/src/org/traccar/protocol/Gps103ProtocolDecoder.java +++ b/src/org/traccar/protocol/Gps103ProtocolDecoder.java @@ -40,21 +40,20 @@ public class Gps103ProtocolDecoder extends GenericProtocolDecoder { /** * Regular expressions pattern */ - //imei:863070010423167,tracker,1211051840,,F,104000.000,A,2220.6483,N,11407.6377,,0,0, static private Pattern pattern = Pattern.compile( "imei:" + - "([\\d]+)," + // IMEI + "(\\d+)," + // IMEI "([^,]+)," + // Alarm - "(\\d{2})(\\d{2})(\\d{2})[\\d]+," + // Date + "(\\d{2})(\\d{2})(\\d{2})\\d+," + // Date "[^,]*," + "[FL]," + // F - full / L - low - "([\\d]{2})([\\d]{2})([\\d]{2}).([\\d]{3})," + // Time (HHMMSS.SSS) + "(\\d{2})(\\d{2})(\\d{2}).(\\d{3})," + // Time (HHMMSS.SSS) "([AV])," + // Validity - "([\\d]{2})([\\d]{2}.[\\d]{4})," + // Latitude (DDMM.MMMM) + "(\\d{2})(\\d{2}.\\d{4})," + // Latitude (DDMM.MMMM) "([NS])," + - "([\\d]{3})([\\d]{2}.[\\d]{4})," + // Longitude (DDDMM.MMMM) + "(\\d{3})(\\d{2}.\\d{4})," + // Longitude (DDDMM.MMMM) "([EW])?," + - "([\\d]+.[\\d]{2})," + // Speed + "(\\d+\\.?\\d*)," + // Speed ".*"); /** -- cgit v1.2.3