Combine Xexun decoders (fix #1282)

3 files changed, 57 insertions, 167 deletions

diff --git a/src/org/traccar/protocol/Xexun2ProtocolDecoder.java b/src/org/traccar/protocol/Xexun2ProtocolDecoder.java
deleted file mode 100644
index aba913ed3..000000000
--- a/src/org/traccar/protocol/Xexun2ProtocolDecoder.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * Copyright 2012 - 2014 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.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.traccar.protocol;
-
-import java.util.Calendar;
-import java.util.TimeZone;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelHandlerContext;
-
-import org.traccar.BaseProtocolDecoder;
-import org.traccar.model.Event;
-import org.traccar.model.Position;
-
-public class Xexun2ProtocolDecoder extends BaseProtocolDecoder {
-
-    public Xexun2ProtocolDecoder(XexunProtocol protocol) {
-        super(protocol);
-    }
-
-    static private Pattern pattern = Pattern.compile(
-            "[\r\n]*" +
-            "(\\d+)," +                         // Serial
-            "([^,]+)?," +                       // Number
-            "G[PN]RMC," +
-            "(\\d{2})(\\d{2})(\\d{2})\\.(\\d+)," + // Time (HHMMSS.SSS)
-            "([AV])," +                         // Validity
-            "(\\d{2})(\\d{2}\\.\\d+)," +        // Latitude (DDMM.MMMM)
-            "([NS])," +
-            "(\\d{3})(\\d{2}\\.\\d+)," +        // Longitude (DDDMM.MMMM)
-            "([EW])," +
-            "(\\d+\\.\\d+)," +                  // Speed
-            "(\\d+\\.\\d+)?," +                 // Course
-            "(\\d{2})(\\d{2})(\\d{2})," +       // Date (DDMMYY)
-            "[^\\*]*\\*..,"       +             // Checksum
-            "([FL])," +                         // Signal
-            "(?:([^,]*),)?" +                   // Alarm
-            ".*imei:" +
-            "(\\d+)," +                         // IMEI
-            "(\\d+)," +                         // Satellites
-            "(-?\\d+\\.\\d+)?," +               // Altitude
-            "[FL]:(\\d+\\.\\d+)V" +             // Power
-            ".*" +
-            "[\r\n]*");
-
-    @Override
-    protected Object decode(
-            ChannelHandlerContext ctx, Channel channel, Object msg)
-            throws Exception {
-
-        // Parse message
-        String sentence = (String) msg;
-        Matcher parser = pattern.matcher(sentence);
-        if (!parser.matches()) {
-            return null;
-        }
-
-        // Create new position
-        Position position = new Position();
-        position.setProtocol(getProtocolName());
-
-        Integer index = 1;
-
-        // Serial
-        position.set("serial", parser.group(index++));
-
-        // Number
-        position.set("number", parser.group(index++));
-
-        // Time
-        Calendar time = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
-        time.clear();
-        time.set(Calendar.HOUR_OF_DAY, Integer.valueOf(parser.group(index++)));
-        time.set(Calendar.MINUTE, Integer.valueOf(parser.group(index++)));
-        time.set(Calendar.SECOND, Integer.valueOf(parser.group(index++)));
-        time.set(Calendar.MILLISECOND, Integer.valueOf(parser.group(index++)));
-
-        // Validity
-        position.setValid(parser.group(index++).compareTo("A") == 0);
-
-        // Latitude
-        Double latitude = Double.valueOf(parser.group(index++));
-        latitude += Double.valueOf(parser.group(index++)) / 60;
-        if (parser.group(index++).compareTo("S") == 0) latitude = -latitude;
-        position.setLatitude(latitude);
-
-        // Longitude
-        Double longitude = Double.valueOf(parser.group(index++));
-        longitude += Double.valueOf(parser.group(index++)) / 60;
-        if (parser.group(index++).compareTo("W") == 0) longitude = -longitude;
-        position.setLongitude(longitude);
-
-        // Speed
-        position.setSpeed(Double.valueOf(parser.group(index++)));
-
-        // Course
-        String course = parser.group(index++);
-        if (course != null) {
-            position.setCourse(Double.valueOf(course));
-        }
-
-        // Date
-        time.set(Calendar.DAY_OF_MONTH, Integer.valueOf(parser.group(index++)));
-        time.set(Calendar.MONTH, Integer.valueOf(parser.group(index++)) - 1);
-        time.set(Calendar.YEAR, 2000 + Integer.valueOf(parser.group(index++)));
-        position.setTime(time.getTime());
-
-        // Signal
-        position.set("signal", parser.group(index++));
-
-        // Alarm
-        position.set(Event.KEY_ALARM, parser.group(index++));
-
-        // Get device by IMEI
-        if (!identify(parser.group(index++), channel)) {
-            return null;
-        }
-        position.setDeviceId(getDeviceId());
-
-        // Satellites
-        position.set(Event.KEY_SATELLITES, parser.group(index++).replaceFirst ("^0*(?![\\.$])", ""));
-
-        // Altitude
-        String altitude = parser.group(index++);
-        if (altitude != null) {
-            position.setAltitude(Double.valueOf(altitude));
-        }
-
-        // Power
-        position.set(Event.KEY_POWER, Double.valueOf(parser.group(index++)));
-
-        return position;
-    }
-
-}
diff --git a/src/org/traccar/protocol/XexunProtocol.java b/src/org/traccar/protocol/XexunProtocol.java
index 0d4502a3a..52d022b05 100644
--- a/src/org/traccar/protocol/XexunProtocol.java
+++ b/src/org/traccar/protocol/XexunProtocol.java
@@ -22,11 +22,8 @@ import org.jboss.netty.handler.codec.string.StringDecoder;
 import org.traccar.BaseProtocol;
 import org.traccar.Context;
 import org.traccar.TrackerServer;
-import org.traccar.protocol.commands.CommandTemplate;
-import org.traccar.http.commands.CommandType;
 
 import java.util.List;
-import java.util.Map;
 
 public class XexunProtocol extends BaseProtocol {
 
@@ -39,15 +36,14 @@ public class XexunProtocol extends BaseProtocol {
         serverList.add(new TrackerServer(new ServerBootstrap(), this.getName()) {
             @Override
             protected void addSpecificHandlers(ChannelPipeline pipeline) {
-                if (Boolean.valueOf(Context.getProps().getProperty(getName() + ".extended"))) {
+                boolean full = Boolean.valueOf(Context.getProps().getProperty(getName() + ".extended"));
+                if (full) {
                     pipeline.addLast("frameDecoder", new LineBasedFrameDecoder(1024)); // tracker bug \n\r
-                    pipeline.addLast("stringDecoder", new StringDecoder());
-                    pipeline.addLast("objectDecoder", new Xexun2ProtocolDecoder(XexunProtocol.this));
                 } else {
                     pipeline.addLast("frameDecoder", new XexunFrameDecoder());
-                    pipeline.addLast("stringDecoder", new StringDecoder());
-                    pipeline.addLast("objectDecoder", new XexunProtocolDecoder(XexunProtocol.this));
                 }
+                pipeline.addLast("stringDecoder", new StringDecoder());
+                pipeline.addLast("objectDecoder", new XexunProtocolDecoder(XexunProtocol.this, full));
             }
         });
     }
diff --git a/src/org/traccar/protocol/XexunProtocolDecoder.java b/src/org/traccar/protocol/XexunProtocolDecoder.java
index 4f01faa0c..2f5628a9d 100644
--- a/src/org/traccar/protocol/XexunProtocolDecoder.java
+++ b/src/org/traccar/protocol/XexunProtocolDecoder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 - 2013 Anton Tananaev (anton.tananaev@gmail.com)
+ * Copyright 2012 - 2014 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.
@@ -15,7 +15,6 @@
  */
 package org.traccar.protocol;
 
-import java.text.ParseException;
 import java.util.Calendar;
 import java.util.TimeZone;
 import java.util.regex.Matcher;
@@ -25,17 +24,21 @@ import org.jboss.netty.channel.Channel;
 import org.jboss.netty.channel.ChannelHandlerContext;
 
 import org.traccar.BaseProtocolDecoder;
+import org.traccar.model.Event;
 import org.traccar.model.Position;
 
 public class XexunProtocolDecoder extends BaseProtocolDecoder {
 
-    public XexunProtocolDecoder(XexunProtocol protocol) {
+    private boolean full;
+
+    public XexunProtocolDecoder(XexunProtocol protocol, boolean full) {
         super(protocol);
+        this.full = full;
     }
 
-    private static final Pattern pattern = Pattern.compile(
+    static private Pattern patternBasic = Pattern.compile(
             "G[PN]RMC," +
-            "(\\d{2})(\\d{2})(\\d{2}).(\\d+)," + // Time (HHMMSS.SSS)
+            "(\\d{2})(\\d{2})(\\d{2})\\.(\\d+)," + // Time (HHMMSS.SSS)
             "([AV])," +                         // Validity
             "(\\d+)(\\d{2}\\.\\d+)," +          // Latitude (DDMM.MMMM)
             "([NS])," +
@@ -44,19 +47,33 @@ public class XexunProtocolDecoder extends BaseProtocolDecoder {
             "(\\d+\\.?\\d*)," +                 // Speed
             "(\\d+\\.?\\d*)?," +                // Course
             "(\\d{2})(\\d{2})(\\d{2})," +       // Date (DDMMYY)
-            ".*\r?\n?.*imei:" +
+            "[^\\*]*\\*..,"       +             // Checksum
+            "([FL])," +                         // Signal
+            "(?:([^,]*),)?" +                   // Alarm
+            ".*imei:" +
             "(\\d+),");                         // IMEI
 
+    static private Pattern patternFull = Pattern.compile(
+            "[\r\n]*" +
+            "(\\d+)," +                         // Serial
+            "([^,]+)?," +                       // Number
+            patternBasic.pattern() +
+            "(\\d+)," +                         // Satellites
+            "(-?\\d+\\.\\d+)?," +               // Altitude
+            "[FL]:(\\d+\\.\\d+)V" +             // Power
+            ".*" +
+            "[\r\n]*");
+
     @Override
     protected Object decode(
             ChannelHandlerContext ctx, Channel channel, Object msg)
             throws Exception {
 
         // Parse message
-        String sentence = (String) msg;
-        Matcher parser = pattern.matcher(sentence);
+        Pattern pattern = full ? patternFull : patternBasic;
+        Matcher parser = pattern.matcher((String) msg);
         if (!parser.matches()) {
-            throw new ParseException(null, 0);
+            return null;
         }
 
         // Create new position
@@ -65,6 +82,11 @@ public class XexunProtocolDecoder extends BaseProtocolDecoder {
 
         Integer index = 1;
 
+        if (full) {
+            position.set("serial", parser.group(index++));
+            position.set("number", parser.group(index++));
+        }
+
         // Time
         Calendar time = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
         time.clear();
@@ -106,11 +128,33 @@ public class XexunProtocolDecoder extends BaseProtocolDecoder {
         time.set(Calendar.YEAR, 2000 + Integer.valueOf(parser.group(index++)));
         position.setTime(time.getTime());
 
+        // Signal
+        position.set("signal", parser.group(index++));
+
+        // Alarm
+        position.set(Event.KEY_ALARM, parser.group(index++));
+
         // Get device by IMEI
         if (!identify(parser.group(index++), channel)) {
             return null;
         }
         position.setDeviceId(getDeviceId());
+
+        if (full) {
+
+            // Satellites
+            position.set(Event.KEY_SATELLITES, parser.group(index++).replaceFirst ("^0*(?![\\.$])", ""));
+
+            // Altitude
+            String altitude = parser.group(index++);
+            if (altitude != null) {
+                position.setAltitude(Double.valueOf(altitude));
+            }
+
+            // Power
+            position.set(Event.KEY_POWER, Double.valueOf(parser.group(index++)));
+        }
+
         return position;
     }