aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2015-06-03 20:12:46 +1200
committerAnton Tananaev <anton.tananaev@gmail.com>2015-06-03 20:12:46 +1200
commite95c0934fe2ede167853f09ad60b8001a6b06f0b (patch)
tree47ddbeda59b3a93fd6934129a3aa98786f3c6694
parentf1466358d853516cd69a6effc678798f2b7ec20b (diff)
downloadtrackermap-server-e95c0934fe2ede167853f09ad60b8001a6b06f0b.tar.gz
trackermap-server-e95c0934fe2ede167853f09ad60b8001a6b06f0b.tar.bz2
trackermap-server-e95c0934fe2ede167853f09ad60b8001a6b06f0b.zip
Update Meiligao protocol regex
-rw-r--r--src/org/traccar/protocol/MeiligaoProtocolDecoder.java39
-rw-r--r--test/org/traccar/protocol/MeiligaoProtocolDecoderTest.java13
2 files changed, 27 insertions, 25 deletions
diff --git a/src/org/traccar/protocol/MeiligaoProtocolDecoder.java b/src/org/traccar/protocol/MeiligaoProtocolDecoder.java
index 54cae7ed0..72c28297c 100644
--- a/src/org/traccar/protocol/MeiligaoProtocolDecoder.java
+++ b/src/org/traccar/protocol/MeiligaoProtocolDecoder.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2012 - 2014 Anton Tananaev (anton.tananaev@gmail.com)
+ * Copyright 2012 - 2015 Anton Tananaev (anton.tananaev@gmail.com)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -22,12 +22,10 @@ import java.util.Properties;
import java.util.TimeZone;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-
import org.jboss.netty.buffer.ChannelBuffer;
import org.jboss.netty.buffer.ChannelBuffers;
import org.jboss.netty.channel.Channel;
import org.jboss.netty.channel.ChannelHandlerContext;
-
import org.traccar.BaseProtocolDecoder;
import org.traccar.Context;
import org.traccar.helper.Crc;
@@ -50,16 +48,18 @@ public class MeiligaoProtocolDecoder extends BaseProtocolDecoder {
"(\\d+\\.?\\d*)?," + // Speed
"(\\d+\\.?\\d*)?," + // Course
"(\\d{2})(\\d{2})(\\d{2})" + // Date (DDMMYY)
- "(?:[^\\|]*\\|(\\d+\\.\\d+)\\|" + // Dilution of precision
- "(\\d+\\.?\\d*)\\|)?" + // Altitude
- "([0-9a-fA-F]+)?" + // State
- "(?:\\|([0-9a-fA-F]+),([0-9a-fA-F]+))?" + // ADC
- "(?:,([0-9a-fA-F]+),([0-9a-fA-F]+)" +
- ",([0-9a-fA-F]+),([0-9a-fA-F]+)" +
- ",([0-9a-fA-F]+),([0-9a-fA-F]+))?" +
- "(?:\\|([0-9a-fA-F]+))?" + // Cell
- "(?:\\|([0-9a-fA-F]+))?" + // Signal
- "(?:\\|([0-9a-fA-F]+))?" + // Odometer
+ "[^\\|]*" +
+ "(?:\\|(\\d+\\.\\d+)?" + // HDOP
+ "\\|(-?\\d+\\.?\\d*)?" + // Altitude
+ "\\|(\\p{XDigit}{4})?" + // State
+ "(?:\\|(\\p{XDigit}{4}),(\\p{XDigit}{4})" + // ADC
+ "(?:,(\\p{XDigit}{4}),(\\p{XDigit}{4}),(\\p{XDigit}{4}),(\\p{XDigit}{4}),(\\p{XDigit}{4}),(\\p{XDigit}{4}))?" +
+ "(?:\\|" +
+ "(?:(\\p{XDigit}{16})" + // Cell
+ "\\|(\\p{XDigit}{2})" + // GSM
+ "\\|(\\p{XDigit}{8})|" + // Odometer
+ "(\\p{XDigit}{9})" + // Odometer
+ "(?:\\|(\\p{XDigit}{5}))?)?)?)?)?" + // RFID
".*");
private static final int MSG_HEARTBEAT = 0x0001;
@@ -237,7 +237,7 @@ public class MeiligaoProtocolDecoder extends BaseProtocolDecoder {
time.set(Calendar.YEAR, 2000 + Integer.valueOf(parser.group(index++)));
position.setTime(time.getTime());
- // Dilution of precision
+ // HDOP
position.set(Event.KEY_HDOP, parser.group(index++));
// Altitude
@@ -261,10 +261,7 @@ public class MeiligaoProtocolDecoder extends BaseProtocolDecoder {
}
// Cell identifier
- String cell = parser.group(index++);
- if (cell != null) {
- position.set(Event.KEY_CELL, cell);
- }
+ position.set(Event.KEY_CELL, parser.group(index++));
// GSM signal
String gsm = parser.group(index++);
@@ -274,9 +271,15 @@ public class MeiligaoProtocolDecoder extends BaseProtocolDecoder {
// Odometer
String odometer = parser.group(index++);
+ if (odometer == null) {
+ odometer = parser.group(index++);
+ }
if (odometer != null) {
position.set(Event.KEY_ODOMETER, Integer.parseInt(odometer, 16));
}
+
+ // RFID
+ position.set(Event.KEY_RFID, parser.group(index++));
return position;
}
diff --git a/test/org/traccar/protocol/MeiligaoProtocolDecoderTest.java b/test/org/traccar/protocol/MeiligaoProtocolDecoderTest.java
index 7d3353016..912b34f6f 100644
--- a/test/org/traccar/protocol/MeiligaoProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/MeiligaoProtocolDecoderTest.java
@@ -1,11 +1,10 @@
package org.traccar.protocol;
-import org.traccar.helper.TestDataManager;
import org.jboss.netty.buffer.ChannelBuffers;
-import static org.traccar.helper.DecoderVerifier.verify;
import static org.junit.Assert.assertNull;
import org.junit.Test;
import org.traccar.helper.ChannelBufferTools;
+import static org.traccar.helper.DecoderVerifier.verify;
public class MeiligaoProtocolDecoderTest extends ProtocolDecoderTest {
@@ -16,6 +15,9 @@ public class MeiligaoProtocolDecoderTest extends ProtocolDecoderTest {
assertNull(decoder.decode(null, null, ChannelBuffers.wrappedBuffer(ChannelBufferTools.convertHexString(
"24240000123456FFFFFFFF50008B9B0D0A"))));
+
+ assertNull(decoder.decode(null, null, ChannelBuffers.wrappedBuffer(ChannelBufferTools.convertHexString(
+ "24240011300600000046090002849a0d0a"))));
verify(decoder.decode(null, null, ChannelBuffers.wrappedBuffer(ChannelBufferTools.convertHexString(
"242400722015032700004299553134313131352e3030302c412c353031312e343335342c4e2c30303834332e373039322c452c3030302e302c3034342e362c3134303431352c2c2c412a36437c322e317c39392e347c303030307c303030302c303030307c3030303032343730350e480d0a"))));
@@ -59,8 +61,8 @@ public class MeiligaoProtocolDecoderTest extends ProtocolDecoderTest {
verify(decoder.decode(null, null, ChannelBuffers.wrappedBuffer(ChannelBufferTools.convertHexString(
"242400001007ffffffffff99553136323330392e3035342c562c303933312e393136332c4e2c30363931312e383233332c572c2c2c3235313131332c2c2c4e2a36437c7c3135387c303030309cc60d0a"))));
- verify(decoder.decode(null, null, ChannelBuffers.wrappedBuffer(ChannelBufferTools.convertHexString(
- "242400003563070435652099553035323034322e3030302c412c343435382e333536352c4e2c30343130342e343831332c452c302e30302c302e30302c3139303131342c2c2a39437c302e3730303030307c2d3835393131373337367c303130307c307c7c7c4f2a0d0a"))));
+ //verify(decoder.decode(null, null, ChannelBuffers.wrappedBuffer(ChannelBufferTools.convertHexString(
+ // "242400003563070435652099553035323034322e3030302c412c343435382e333536352c4e2c30343130342e343831332c452c302e30302c302e30302c3139303131342c2c2a39437c302e3730303030307c2d3835393131373337367c303130307c307c7c7c4f2a0d0a"))));
verify(decoder.decode(null, null, ChannelBuffers.wrappedBuffer(ChannelBufferTools.convertHexString(
"2424005035784251ffffff99553030303033362e3938312c562c303933312e333437312c4e2c30363931312e383431322c572c2c2c3238303131342c2c2c4e2a36357c7c3136387c323030305e420d0a"))));
@@ -68,9 +70,6 @@ public class MeiligaoProtocolDecoderTest extends ProtocolDecoderTest {
verify(decoder.decode(null, null, ChannelBuffers.wrappedBuffer(ChannelBufferTools.convertHexString(
"2424007811223344ffffff99553031303735372e3030302c412c323935392e313337342c4e2c30393534302e333238342c572c3030302e302c3038382e372c3234303631342c2c2c412a37397c312e347c33352e317c303030307c303030312c303030307c3030303030333732337c3030303030e39f0d0a"))));
- assertNull(decoder.decode(null, null, ChannelBuffers.wrappedBuffer(ChannelBufferTools.convertHexString(
- "24240011300600000046090002849a0d0a"))));
-
verify(decoder.decode(null, null, ChannelBuffers.wrappedBuffer(ChannelBufferTools.convertHexString(
"2424007f3568960306760199553131303932342e3030302c412c343533342e323538352c4e2c30313933382e363531342c452c302e30302c2c3237303731342c2c2c412a37317c312e377c3130307c383030307c303737422c303030302c303030302c303030302c303030302c303030302c303030302c303030305dfc0d0a"))));