Modify T55 to support Maxon devices (fix #40)

5 files changed, 42 insertions, 189 deletions

diff --git a/debug.xml b/debug.xml
index 1abb97e07..843bc6736 100644
--- a/debug.xml
+++ b/debug.xml
@@ -251,7 +251,6 @@
     <entry key='totem.port'>5007</entry>
     <entry key='enfora.port'>5008</entry>
     <entry key='meiligao.port'>5009</entry>
-    <entry key='maxon.port'>5010</entry>
     <entry key='suntech.port'>5011</entry>
     <entry key='progress.port'>5012</entry>
     <entry key='h02.port'>5013</entry>
diff --git a/src/org/traccar/protocol/MaxonProtocol.java b/src/org/traccar/protocol/MaxonProtocol.java
deleted file mode 100644
index 587c3f014..000000000
--- a/src/org/traccar/protocol/MaxonProtocol.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright 2015 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 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;
-import org.traccar.TrackerServer;
-
-import java.util.List;
-
-public class MaxonProtocol extends BaseProtocol {
-
-    public MaxonProtocol() {
-        super("maxon");
-    }
-
-    @Override
-    public void initTrackerServers(List<TrackerServer> serverList) {
-        serverList.add(new TrackerServer(new ServerBootstrap(), this.getName()) {
-            @Override
-            protected void addSpecificHandlers(ChannelPipeline pipeline) {
-                pipeline.addLast("frameDecoder", new LineBasedFrameDecoder(1024));
-                pipeline.addLast("stringDecoder", new StringDecoder());
-                pipeline.addLast("stringEncoder", new StringEncoder());
-                pipeline.addLast("objectDecoder", new MaxonProtocolDecoder(MaxonProtocol.this));
-            }
-        });
-    }
-
-}
diff --git a/src/org/traccar/protocol/MaxonProtocolDecoder.java b/src/org/traccar/protocol/MaxonProtocolDecoder.java
deleted file mode 100644
index 14bf285fc..000000000
--- a/src/org/traccar/protocol/MaxonProtocolDecoder.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * Copyright 2012 Alex Wilson <alex@uq.edu.au>
- *
- * 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.net.SocketAddress;
-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.traccar.BaseProtocolDecoder;
-import org.traccar.model.Position;
-
-/**
- * Maxon Datamax GPS send protocol (NMEA + GPFID)
- * As seen in the MA100-1010 router
- *
- * It sends its identity after the GPRMC sentence, and with the type
- * GPFID.
- */
-public class MaxonProtocolDecoder extends BaseProtocolDecoder {
-
-    private Position position = null;
-
-    public MaxonProtocolDecoder(MaxonProtocol protocol) {
-        super(protocol);
-    }
-
-    private static final Pattern PATTERN = Pattern.compile(
-            "\\$GPRMC," +
-            "(\\d{2})(\\d{2})(\\d{2})\\.(\\d{2})," + // Time (HHMMSS.SSS)
-            "([AV])," +                    // Validity
-            "(\\d{2})(\\d{2}\\.\\d{5})," + // Latitude (DDMM.MMMMM)
-            "([NS])," +
-            "(\\d{3})(\\d{2}\\.\\d{5})," + // Longitude (DDDMM.MMMMM)
-            "([EW])," +
-            "(\\d+\\.\\d{3})?," +          // Speed
-            "(\\d+\\.\\d{2})?," +          // Course
-            "(\\d{2})(\\d{2})(\\d{2})" +   // Date (DDMMYY)
-            ".+");                         // Other (Checksumm)
-
-    private static final Pattern PATTERN_GPFID = Pattern.compile("\\$GPFID,(\\d+)$");
-
-    @Override
-    protected Object decode(Channel channel, SocketAddress remoteAddress, Object msg) throws Exception {
-
-        String sentence = (String) msg;
-
-        // Detect device ID
-        // Parse message
-        if (sentence.contains("$GPRMC")) {
-
-            // Parse message
-            Matcher parser = PATTERN.matcher(sentence);
-            if (!parser.matches()) {
-                return null;
-            }
-
-            // Create new position
-            position = new Position();
-
-            Integer index = 1;
-
-            // Time
-            Calendar time = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
-            time.clear();
-            time.set(Calendar.HOUR_OF_DAY, Integer.parseInt(parser.group(index++)));
-            time.set(Calendar.MINUTE, Integer.parseInt(parser.group(index++)));
-            time.set(Calendar.SECOND, Integer.parseInt(parser.group(index++)));
-            index += 1; // Skip milliseconds
-
-            // Validity
-            position.setValid(parser.group(index++).compareTo("A") == 0);
-
-            // Latitude
-            Double latitude = Double.parseDouble(parser.group(index++));
-            latitude += Double.parseDouble(parser.group(index++)) / 60;
-            if (parser.group(index++).compareTo("S") == 0) latitude = -latitude;
-            position.setLatitude(latitude);
-
-            // Longitude
-            Double longitude = Double.parseDouble(parser.group(index++));
-            longitude += Double.parseDouble(parser.group(index++)) / 60;
-            if (parser.group(index++).compareTo("W") == 0) longitude = -longitude;
-            position.setLongitude(longitude);
-
-            // Speed
-            String speed = parser.group(index++);
-            if (speed != null) {
-                position.setSpeed(Double.parseDouble(speed));
-            }
-
-            // Course
-            String course = parser.group(index++);
-            if (course != null) {
-                position.setCourse(Double.parseDouble(course));
-            }
-
-            // Date
-            time.set(Calendar.DAY_OF_MONTH, Integer.parseInt(parser.group(index++)));
-            time.set(Calendar.MONTH, Integer.parseInt(parser.group(index++)) - 1);
-            time.set(Calendar.YEAR, 2000 + Integer.parseInt(parser.group(index++)));
-            position.setTime(time.getTime());
-
-        } else if (sentence.contains("$GPFID") && position != null) {
-            Matcher parser = PATTERN_GPFID.matcher(sentence);
-
-            if (parser.matches()) {
-                if (!identify(parser.group(1), channel)) {
-                    return null;
-                }
-                position.setDeviceId(getDeviceId());
-                return position;
-            }
-        }
-
-        return null;
-    }
-
-}
diff --git a/src/org/traccar/protocol/T55ProtocolDecoder.java b/src/org/traccar/protocol/T55ProtocolDecoder.java
index 42db4c753..d8b3eefe8 100644
--- a/src/org/traccar/protocol/T55ProtocolDecoder.java
+++ b/src/org/traccar/protocol/T55ProtocolDecoder.java
@@ -82,6 +82,8 @@ public class T55ProtocolDecoder extends BaseProtocolDecoder {
             .any()
             .compile();
 
+    private Position position = null;
+
     private Position decodeGprmc(String sentence, Channel channel) {
 
         if (channel != null) {
@@ -95,7 +97,10 @@ public class T55ProtocolDecoder extends BaseProtocolDecoder {
 
         Position position = new Position();
         position.setProtocol(getProtocolName());
-        position.setDeviceId(getDeviceId());
+
+        if (hasDeviceId()) {
+            position.setDeviceId(getDeviceId());
+        }
 
         DateBuilder dateBuilder = new DateBuilder()
                 .setTime(parser.nextInt(), parser.nextInt(), parser.nextInt());
@@ -109,7 +114,12 @@ public class T55ProtocolDecoder extends BaseProtocolDecoder {
         dateBuilder.setDateReverse(parser.nextInt(), parser.nextInt(), parser.nextInt());
         position.setTime(dateBuilder.getDate());
 
-        return position;
+        if (hasDeviceId()) {
+            return position;
+        } else {
+            this.position = position; // save position
+            return null;
+        }
     }
 
     private Position decodeGpgga(String sentence) {
@@ -207,10 +217,15 @@ public class T55ProtocolDecoder extends BaseProtocolDecoder {
         } else if (sentence.startsWith("IMEI")) {
             identify(sentence.substring(5, sentence.length()), channel);
         } else if (sentence.startsWith("$GPFID")) {
-            identify(sentence.substring(6, sentence.length()), channel);
+            if (identify(sentence.substring(6, sentence.length()), channel) && position != null) {
+                Position position = this.position;
+                position.setDeviceId(getDeviceId());
+                this.position = null;
+                return position;
+            }
         } else if (Character.isDigit(sentence.charAt(0)) && sentence.length() == 15) {
             identify(sentence, channel);
-        } else if (sentence.startsWith("$GPRMC") && hasDeviceId()) {
+        } else if (sentence.startsWith("$GPRMC")) {
             return decodeGprmc(sentence, channel);
         } else if (sentence.startsWith("$GPGGA") && hasDeviceId()) {
             return decodeGpgga(sentence);
diff --git a/test/org/traccar/protocol/T55ProtocolDecoderTest.java b/test/org/traccar/protocol/T55ProtocolDecoderTest.java
index ddabc8ee4..b7adee89b 100644
--- a/test/org/traccar/protocol/T55ProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/T55ProtocolDecoderTest.java
@@ -10,13 +10,17 @@ public class T55ProtocolDecoderTest extends ProtocolDecoderTest {
 
         T55ProtocolDecoder decoder = new T55ProtocolDecoder(new T55Protocol());
 
-        verifyNothing(decoder, text( "$GPFID,ID123456ABC"));
+        verifyNothing(decoder, text(
+                "$GPFID,ID123456ABC"));
 
-        verifyNothing(decoder, text( "$PGID,359853000144328*0F"));
+        verifyNothing(decoder, text(
+                "$PGID,359853000144328*0F"));
 
-        verifyNothing(decoder, text( "$PCPTI,CradlePoint Test,184453,184453.0,6F*57"));
+        verifyNothing(decoder, text(
+                "$PCPTI,CradlePoint Test,184453,184453.0,6F*57"));
         
-        verifyNothing(decoder, text( "IMEI 351467108700000"));
+        verifyNothing(decoder, text(
+                "IMEI 351467108700000"));
         
         verifyPosition(decoder, text(
                 "$GPRMC,012006,A,4828.10,N,1353.52,E,0.00,0.00,180915,020.3,E*42"));
@@ -68,4 +72,19 @@ public class T55ProtocolDecoderTest extends ProtocolDecoderTest {
 
     }
 
+    @Test
+    public void testMaxonDecode() throws Exception {
+
+        // Maxon devices can send NMEA before identification
+
+        T55ProtocolDecoder decoder = new T55ProtocolDecoder(new T55Protocol());
+
+        verifyNothing(decoder, text(
+                "$GPRMC,012006,A,4828.10,N,1353.52,E,0.00,0.00,180915,020.3,E*42"));
+
+        verifyPosition(decoder, text(
+                "$GPFID,ID123456ABC"));
+
+    }
+
 }