Fix minor issues in LDPL protocol

3 files changed, 37 insertions, 39 deletions

diff --git a/src/org/traccar/protocol/LdplProtocol.java b/src/org/traccar/protocol/LdplProtocol.java
index 517055f2f..01780a645 100644
--- a/src/org/traccar/protocol/LdplProtocol.java
+++ b/src/org/traccar/protocol/LdplProtocol.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 - 2014 Anton Tananaev (anton.tananaev@gmail.com)
+ * Copyright 2016 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.
@@ -18,7 +18,9 @@ package org.traccar.protocol;
 import java.util.List;
 
 import org.jboss.netty.bootstrap.ConnectionlessBootstrap;
+import org.jboss.netty.bootstrap.ServerBootstrap;
 import org.jboss.netty.channel.ChannelPipeline;
+import org.jboss.netty.handler.codec.frame.LineBasedFrameDecoder;
 import org.jboss.netty.handler.codec.string.StringDecoder;
 import org.jboss.netty.handler.codec.string.StringEncoder;
 import org.traccar.BaseProtocol;
@@ -32,9 +34,10 @@ public class LdplProtocol extends BaseProtocol {
 
     @Override
     public void initTrackerServers(List<TrackerServer> serverList) {
-        serverList.add(new TrackerServer(new ConnectionlessBootstrap(), this.getName()) {
+        serverList.add(new TrackerServer(new ServerBootstrap(), this.getName()) {
             @Override
             protected void addSpecificHandlers(ChannelPipeline pipeline) {
+                pipeline.addLast("frameDecoder", new LineBasedFrameDecoder(1024));
                 pipeline.addLast("stringEncoder", new StringEncoder());
                 pipeline.addLast("stringDecoder", new StringDecoder());
                 pipeline.addLast("objectDecoder", new LdplProtocolDecoder(LdplProtocol.this));
diff --git a/src/org/traccar/protocol/LdplProtocolDecoder.java b/src/org/traccar/protocol/LdplProtocolDecoder.java
index 52d7cd020..5b14fc118 100644
--- a/src/org/traccar/protocol/LdplProtocolDecoder.java
+++ b/src/org/traccar/protocol/LdplProtocolDecoder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 - 2014 Anton Tananaev (anton.tananaev@gmail.com)
+ * Copyright 2016 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.
@@ -34,34 +34,35 @@ public class LdplProtocolDecoder extends BaseProtocolDecoder {
     }
 
     private static final Pattern PATTERN = new PatternBuilder()
-        .text("*ID")                       // start of frame
-        .number("(d+),")                     // command code
-        .number("(d+),")                     // imei
-        .number("(dd)(dd)(dd),")             // current date
-        .number("(dd)(dd)(dd),")             // current time
-        .expression("([A|V]),")              // gps fix
-        .number("(dd)(dd).?(d+),([NS]),")    // latitude
-        .number("(ddd)(dd).?(d+),([EW]),")   // longitude
-        .number("(d{1,3}.dd),")              // speed
-        .number("(d{1,3}.dd),")              // course
-        .number("(d{1,2}),")                 // sats
-        .number("(d{1,3}),")                 // gsm signal strength
-        .expression("([A|N|S]),")            // vehicle status
-        .expression("([0|1]),")              // main power status
-        .number("(d.dd),")                   // internal battery voltage
-        .expression("([0|1]),")              // sos alert
-        .expression("([0|1]),")              // body tamper
-        .expression("([0|1])([0|1]),")       // ac status + ign_status
-        .expression("([0|1|2]),")            // output1 status
-        .number("(d{1,3}),")                 // adc1
-        .number("(d{1,3}),")                 // adc2
-        .expression("([0-9A-Z]{3}),")        // software version
-        .expression("([L|R]),")              // message type
-        .expression("([0-9A-Z]{4})#")        // crc
-        .compile();
+            .text("*ID")                         // start of frame
+            .number("(d+),")                     // command code
+            .number("(d+),")                     // imei
+            .number("(dd)(dd)(dd),")             // current date
+            .number("(dd)(dd)(dd),")             // current time
+            .expression("([A|V]),")              // gps fix
+            .number("(dd)(dd).?(d+),([NS]),")    // latitude
+            .number("(ddd)(dd).?(d+),([EW]),")   // longitude
+            .number("(d{1,3}.dd),")              // speed
+            .number("(d{1,3}.dd),")              // course
+            .number("(d{1,2}),")                 // sats
+            .number("(d{1,3}),")                 // gsm signal strength
+            .expression("([A|N|S]),")            // vehicle status
+            .expression("([0|1]),")              // main power status
+            .number("(d.dd),")                   // internal battery voltage
+            .expression("([0|1]),")              // sos alert
+            .expression("([0|1]),")              // body tamper
+            .expression("([0|1])([0|1]),")       // ac status + ign status
+            .expression("([0|1|2]),")            // output1 status
+            .number("(d{1,3}),")                 // adc1
+            .number("(d{1,3}),")                 // adc2
+            .expression("([0-9A-Z]{3}),")        // software version
+            .expression("([L|R]),")              // message type
+            .number("(x{4})#")                   // crc
+            .compile();
 
     @Override
-    protected Object decode(Channel channel, SocketAddress remoteAddress, Object msg) throws Exception {
+    protected Object decode(
+            Channel channel, SocketAddress remoteAddress, Object msg) throws Exception {
 
         Parser parser = new Parser(PATTERN, (String) msg);
         if (!parser.matches()) {
@@ -70,6 +71,7 @@ public class LdplProtocolDecoder extends BaseProtocolDecoder {
 
         Position position = new Position();
         position.setProtocol(getProtocolName());
+
         position.set(Position.KEY_TYPE, parser.nextInt());
 
         if (!identify(parser.next(), channel, remoteAddress)) {
@@ -78,19 +80,13 @@ public class LdplProtocolDecoder extends BaseProtocolDecoder {
         position.setDeviceId(getDeviceId());
 
         DateBuilder dateBuilder = new DateBuilder()
-        .setDateReverse(parser.nextInt(), parser.nextInt(), parser.nextInt())
-        .setTime(parser.nextInt(), parser.nextInt(), parser.nextInt());
+                .setDateReverse(parser.nextInt(), parser.nextInt(), parser.nextInt())
+                .setTime(parser.nextInt(), parser.nextInt(), parser.nextInt());
         position.setTime(dateBuilder.getDate());
 
-        if ("A".equals(parser.next())) {
-            position.setValid(true);
-        } else {
-            position.setValid(false);
-        }
-        
+        position.setValid(parser.next().equals("A"));
         position.setLatitude(parser.nextCoordinate(CoordinateFormat.DEG_MIN_MIN_HEM));
         position.setLongitude(parser.nextCoordinate(CoordinateFormat.DEG_MIN_MIN_HEM));
-        
         position.setSpeed(parser.nextDouble());
         position.setCourse(parser.nextDouble());
         
diff --git a/test/org/traccar/protocol/LdplProtocolDecoderTest.java b/test/org/traccar/protocol/LdplProtocolDecoderTest.java
index 0900d8c42..bfe196b81 100644
--- a/test/org/traccar/protocol/LdplProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/LdplProtocolDecoderTest.java
@@ -17,7 +17,6 @@ public class LdplProtocolDecoderTest extends ProtocolTest {
         verifyPosition(decoder, text(
                 "*ID1,863071011086474,210314,162752,A,1831.4412,N,07351.0983,E,0.04,213.84,9,25,A,1,4.20,0,1,01,1,0,0,A01,L,EA01#"));
 
-
     }
 
 }