aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2013-01-23 19:53:22 +1300
committerAnton Tananaev <anton.tananaev@gmail.com>2013-01-23 19:53:22 +1300
commit93eb3766f477b16a8663eb63c2b276935f5945a9 (patch)
tree11e1d1106a91100959508f48955d4136705ccefc /src
parent3e809b9509b26e5446e1262c8d1dd5703b814f58 (diff)
downloadtrackermap-server-93eb3766f477b16a8663eb63c2b276935f5945a9.tar.gz
trackermap-server-93eb3766f477b16a8663eb63c2b276935f5945a9.tar.bz2
trackermap-server-93eb3766f477b16a8663eb63c2b276935f5945a9.zip
Fix megastek regular expression
Diffstat (limited to 'src')
-rw-r--r--src/org/traccar/protocol/MegastekProtocolDecoder.java8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/org/traccar/protocol/MegastekProtocolDecoder.java b/src/org/traccar/protocol/MegastekProtocolDecoder.java
index 77d24837a..0a25f0b4a 100644
--- a/src/org/traccar/protocol/MegastekProtocolDecoder.java
+++ b/src/org/traccar/protocol/MegastekProtocolDecoder.java
@@ -32,17 +32,15 @@ public class MegastekProtocolDecoder extends BaseProtocolDecoder {
super(serverManager);
}
- //STX,102110830074542,$GPRMC,114229.000,A,2238.2024,N,11401.9619,E,0.00,0.00,310811,,,A*64
- //,F,LowBattery,imei:012207005553885,03,113.1,Battery=24%,,1,460,01,2531,647E;57
static private Pattern pattern = Pattern.compile(
"STX," +
- "\\d+," + // Identifier (not IMEI)
+ "[^,]+," + // Identifier (not IMEI)
"\\$GPRMC," +
"(\\d{2})(\\d{2})(\\d{2})\\.\\d+," + // Time (HHMMSS.SSS)
"([AV])," + // Validity
- "(\\d{2})(\\d{2}\\.\\d+)," + // Latitude (DDMM.MMMM)
+ "(\\d+)(\\d{2}\\.\\d+)," + // Latitude (DDMM.MMMM)
"([NS])," +
- "(\\d{3})(\\d{2}\\.\\d+)," + // Longitude (DDDMM.MMMM)
+ "(\\d+)(\\d{2}\\.\\d+)," + // Longitude (DDDMM.MMMM)
"([EW])," +
"(\\d+\\.\\d{2})?," + // Speed
"(\\d+\\.\\d{2})?," + // Course