aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2013-03-13 20:34:11 +1300
committerAnton Tananaev <anton.tananaev@gmail.com>2013-03-13 20:34:11 +1300
commit7c8a732d577d6748b9223f720d2dde70f5ebfc41 (patch)
tree54ae40d804b8d214531bf53b9c8dcaf78dd2a194 /src/org/traccar
parenta353cbf806f21767f6a173255141dd7db8314fe8 (diff)
downloadtrackermap-server-7c8a732d577d6748b9223f720d2dde70f5ebfc41.tar.gz
trackermap-server-7c8a732d577d6748b9223f720d2dde70f5ebfc41.tar.bz2
trackermap-server-7c8a732d577d6748b9223f720d2dde70f5ebfc41.zip
Fix T55 regular expression
Diffstat (limited to 'src/org/traccar')
-rw-r--r--src/org/traccar/protocol/T55ProtocolDecoder.java16
1 files changed, 2 insertions, 14 deletions
diff --git a/src/org/traccar/protocol/T55ProtocolDecoder.java b/src/org/traccar/protocol/T55ProtocolDecoder.java
index 57810be3b..b95b9fc5a 100644
--- a/src/org/traccar/protocol/T55ProtocolDecoder.java
+++ b/src/org/traccar/protocol/T55ProtocolDecoder.java
@@ -26,19 +26,10 @@ import org.traccar.ServerManager;
import org.traccar.helper.Log;
import org.traccar.model.Position;
-/**
- * T55 tracker protocol decoder
- */
public class T55ProtocolDecoder extends BaseProtocolDecoder {
- /**
- * Device ID
- */
private Long deviceId;
- /**
- * Initialize
- */
public T55ProtocolDecoder(ServerManager serverManager) {
super(serverManager);
}
@@ -54,14 +45,11 @@ public class T55ProtocolDecoder extends BaseProtocolDecoder {
"([NS])," +
"(\\d{3})(\\d{2}\\.\\d+)," + // Longitude (DDDMM.MMMM)
"([EW])," +
- "(\\d+\\.\\d{2})?," + // Speed
- "(\\d+\\.\\d{2})?," + // Course
+ "(\\d+\\.?\\d*)?," + // Speed
+ "(\\d+\\.?\\d*)?," + // Course
"(\\d{2})(\\d{2})(\\d{2})" + // Date (DDMMYY)
".+"); // Other (Checksumm)
- /**
- * Decode message
- */
@Override
protected Object decode(
ChannelHandlerContext ctx, Channel channel, Object msg)