aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/org/traccar/protocol/FreedomProtocolDecoder.java14
1 files changed, 8 insertions, 6 deletions
diff --git a/src/org/traccar/protocol/FreedomProtocolDecoder.java b/src/org/traccar/protocol/FreedomProtocolDecoder.java
index 40abe1b8d..c5ef5a146 100644
--- a/src/org/traccar/protocol/FreedomProtocolDecoder.java
+++ b/src/org/traccar/protocol/FreedomProtocolDecoder.java
@@ -32,12 +32,14 @@ public class FreedomProtocolDecoder extends BaseProtocolDecoder {
private static final Pattern PATTERN = new PatternBuilder()
.text("IMEI,")
- .number("(d+),") // IMEI
- .number("(dddd)/(dd)/(dd), ") // Date
- .number("(dd):(dd):(dd), ") // Time
- .number("([NS]), Lat:(dd)(d+.d+), ") // Latitude
- .number("([EW]), Lon:(ddd)(d+.d+), ") // Longitude
- .text("Spd:").number("(d+.d+)") // Speed
+ .number("(d+),") // imei
+ .number("(dddd)/(dd)/(dd), ") // date
+ .number("(dd):(dd):(dd), ") // time
+ .expression("([NS]), ")
+ .number("Lat:(dd)(d+.d+), ") // latitude
+ .expression("([EW]), ")
+ .number("Lon:(ddd)(d+.d+), ") // longitude
+ .text("Spd:").number("(d+.d+)") // speed
.any()
.compile();