From 15079797152451e6d04af6527ab4a38209dce1d7 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Tue, 3 Nov 2015 12:41:03 +1300 Subject: Refactor TR900 protocol decoder --- .../traccar/protocol/TrackboxProtocolDecoder.java | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'src/org/traccar/protocol/TrackboxProtocolDecoder.java') diff --git a/src/org/traccar/protocol/TrackboxProtocolDecoder.java b/src/org/traccar/protocol/TrackboxProtocolDecoder.java index 2cd2b98c2..bf4c4f34d 100644 --- a/src/org/traccar/protocol/TrackboxProtocolDecoder.java +++ b/src/org/traccar/protocol/TrackboxProtocolDecoder.java @@ -32,17 +32,17 @@ public class TrackboxProtocolDecoder extends BaseProtocolDecoder { } private static final Pattern PATTERN = new PatternBuilder() - .number("(dd)(dd)(dd).(ddd),") // Time - .number("(dd)(dd.dddd)([NS]),") // Latitude (DDMM.MMMM) - .number("(ddd)(dd.dddd)([EW]),") // Longitude (DDDMM.MMMM) - .number("(d+.d),") // HDOP - .number("(-?d+.?d*),") // Altitude - .number("(d),") // Fix Type - .number("(d+.d+),") // Course - .number("d+.d+,") // Speed (kph) - .number("(d+.d+),") // Speed (knots) - .number("(dd)(dd)(dd),") // Date - .number("(d+)") // Satellites + .number("(dd)(dd)(dd).(ddd),") // time + .number("(dd)(dd.dddd)([NS]),") // latitude + .number("(ddd)(dd.dddd)([EW]),") // longitude + .number("(d+.d),") // hdop + .number("(-?d+.?d*),") // altitude + .number("(d),") // fix type + .number("(d+.d+),") // course + .number("d+.d+,") // speed (kph) + .number("(d+.d+),") // speed (knots) + .number("(dd)(dd)(dd),") // date + .number("(d+)") // satellites .compile(); private void sendResponse(Channel channel) { -- cgit v1.2.3