aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2015-11-25 09:49:54 +1300
committerAnton Tananaev <anton.tananaev@gmail.com>2015-11-25 09:49:54 +1300
commit2c399889e9b61c8e3580c046a70b556e1ab628e3 (patch)
tree01ccaadeb85be2c71f971986e5d290caaab54917 /src
parent9e5de36d24d477bddc7addc29f4b504314b644cf (diff)
downloadtraccar-server-2c399889e9b61c8e3580c046a70b556e1ab628e3.tar.gz
traccar-server-2c399889e9b61c8e3580c046a70b556e1ab628e3.tar.bz2
traccar-server-2c399889e9b61c8e3580c046a70b556e1ab628e3.zip
Improve H02 protocol decoder regex
Diffstat (limited to 'src')
-rw-r--r--src/org/traccar/protocol/H02ProtocolDecoder.java31
1 files changed, 27 insertions, 4 deletions
diff --git a/src/org/traccar/protocol/H02ProtocolDecoder.java b/src/org/traccar/protocol/H02ProtocolDecoder.java
index d245fbdc8..ff3ee169e 100644
--- a/src/org/traccar/protocol/H02ProtocolDecoder.java
+++ b/src/org/traccar/protocol/H02ProtocolDecoder.java
@@ -27,6 +27,7 @@ import org.traccar.helper.ChannelBufferTools;
import org.traccar.helper.DateBuilder;
import org.traccar.helper.Parser;
import org.traccar.helper.PatternBuilder;
+import org.traccar.helper.PatternUtil;
import org.traccar.model.Event;
import org.traccar.model.Position;
@@ -122,9 +123,17 @@ public class H02ProtocolDecoder extends BaseProtocolDecoder {
.any()
.number("(dd)(dd)(dd),") // time
.expression("([AV])?,") // validity
- .number("-?(d+)-?(dd.d+),") // latitude
+ .groupBegin()
+ .number("(d+)(dd.d+),") // latitude
+ .or()
+ .number("-(d+)-(d+.d+),") // latitude
+ .groupEnd()
.expression("([NS]),")
- .number("-?(d+)-?(dd.d+),") // longitude
+ .groupBegin()
+ .number("(d+)(dd.d+),") // longitude
+ .or()
+ .number("-(d+)-(d+.d+),") // longitude
+ .groupEnd()
.expression("([EW]),")
.number("(d+.?d*),") // speed
.number("(d+.?d*)?,") // course
@@ -135,6 +144,8 @@ public class H02ProtocolDecoder extends BaseProtocolDecoder {
private Position decodeText(String sentence, Channel channel) {
+ String x = PatternUtil.checkPattern(PATTERN.pattern(), sentence);
+
Parser parser = new Parser(PATTERN, sentence);
if (!parser.matches()) {
return null;
@@ -155,8 +166,20 @@ public class H02ProtocolDecoder extends BaseProtocolDecoder {
position.setValid(parser.next().equals("A"));
}
- position.setLatitude(parser.nextCoordinate());
- position.setLongitude(parser.nextCoordinate());
+ if (parser.hasNext(2)) {
+ position.setLatitude(parser.nextCoordinate());
+ }
+ if (parser.hasNext(2)) {
+ position.setLatitude(parser.nextCoordinate());
+ }
+
+ if (parser.hasNext(2)) {
+ position.setLongitude(parser.nextCoordinate());
+ }
+ if (parser.hasNext(2)) {
+ position.setLongitude(parser.nextCoordinate());
+ }
+
position.setSpeed(parser.nextDouble());
position.setCourse(parser.nextDouble());