From 5538a83ac7eda6ad5775e582688dd0199e6c538c Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Sat, 24 Oct 2015 22:57:38 +1300 Subject: Refactor pattern builder class --- .../traccar/protocol/GlobalSatProtocolDecoder.java | 30 +++++++++++----------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'src/org/traccar/protocol/GlobalSatProtocolDecoder.java') diff --git a/src/org/traccar/protocol/GlobalSatProtocolDecoder.java b/src/org/traccar/protocol/GlobalSatProtocolDecoder.java index 05c4dec47..049bb2f7f 100644 --- a/src/org/traccar/protocol/GlobalSatProtocolDecoder.java +++ b/src/org/traccar/protocol/GlobalSatProtocolDecoder.java @@ -177,21 +177,21 @@ public class GlobalSatProtocolDecoder extends BaseProtocolDecoder { } private static final Pattern PATTERN = new PatternBuilder() - .txt("$") - .num("(d+),") // imei - .num("d+,") // mode - .num("(d),") // fix - .num("(dd)(dd)(dd),") // date (ddmmyy) - .num("(dd)(dd)(dd),") // time (hhmmss) - .xpr("([EW])") - .num("(ddd)(dd.d+),") // longitude (dddmm.mmmm) - .xpr("([NS])") - .num("(dd)(dd.d+),") // latitude (ddmm.mmmm) - .num("(d+.?d*),") // altitude - .num("(d+.?d*),") // speed - .num("(d+.?d*),") // course - .num("(d+),") // satellites - .num("(d+.?d*)") // hdop + .text("$") + .number("(d+),") // imei + .number("d+,") // mode + .number("(d),") // fix + .number("(dd)(dd)(dd),") // date (ddmmyy) + .number("(dd)(dd)(dd),") // time (hhmmss) + .expression("([EW])") + .number("(ddd)(dd.d+),") // longitude (dddmm.mmmm) + .expression("([NS])") + .number("(dd)(dd.d+),") // latitude (ddmm.mmmm) + .number("(d+.?d*),") // altitude + .number("(d+.?d*),") // speed + .number("(d+.?d*),") // course + .number("(d+),") // satellites + .number("(d+.?d*)") // hdop .compile(); private Position decodeAlternative(Channel channel, String sentence) { -- cgit v1.2.3