Merge AVL08 and Totem protocols

6 files changed, 45 insertions, 267 deletions

diff --git a/default.cfg b/default.cfg
index cb5b907fe..76c680d35 100644
--- a/default.cfg
+++ b/default.cfg
@@ -90,9 +90,9 @@
     <entry key='xexun2.enable'>true</entry>
     <entry key='xexun2.port'>5006</entry>
 
-    <!-- AVL-08 server configuration -->
-    <entry key='avl08.enable'>true</entry>
-    <entry key='avl08.port'>5007</entry>
+    <!-- Totem server configuration -->
+    <entry key='totem.enable'>true</entry>
+    <entry key='totem.port'>5007</entry>
 
     <!-- Enfora server configuration -->
     <entry key='enfora.enable'>true</entry>
@@ -266,9 +266,9 @@
     <entry key='gotop.enable'>true</entry>
     <entry key='gotop.port'>5050</entry>
 
-    <!-- Totem server configuration -->
-    <entry key='totem.enable'>true</entry>
-    <entry key='totem.port'>5051</entry>
+    <!-- Sanav server configuration -->
+    <entry key='sanav.enable'>true</entry>
+    <entry key='sanav.port'>5051</entry>
 
     <!-- Gator server configuration -->
     <entry key='gator.enable'>true</entry>
@@ -290,8 +290,4 @@
     <entry key='easytrack.enable'>true</entry>
     <entry key='easytrack.port'>5056</entry>
 
-    <!-- Sanav server configuration -->
-    <entry key='sanav.enable'>true</entry>
-    <entry key='sanav.port'>5057</entry>
-
 </properties>
diff --git a/src/org/traccar/ServerManager.java b/src/org/traccar/ServerManager.java
index 771ea6480..32afc29fc 100644
--- a/src/org/traccar/ServerManager.java
+++ b/src/org/traccar/ServerManager.java
@@ -108,7 +108,7 @@ public class ServerManager {
         initGl200Server("gl200");
         initT55Server("t55");
         initXexun2Server("xexun2");
-        initAvl08Server("avl08");
+        initTotemServer("totem");
         initEnforaServer("enfora");
         initMeiligaoServer("meiligao");
         initMaxonServer("maxon");
@@ -152,7 +152,6 @@ public class ServerManager {
         initLaipacServer("laipac");
         initAplicomServer("aplicom");
         initGotopServer("gotop");
-        initTotemServer("totem");
         initGatorServer("gator");
         initNoranServer("noran");
         initM2mServer("m2m");
@@ -322,16 +321,14 @@ public class ServerManager {
         }
     }
 
-    private void initAvl08Server(String protocol) throws SQLException {
+    private void initTotemServer(String protocol) throws SQLException {
         if (isProtocolEnabled(properties, protocol)) {
             serverList.add(new TrackerServer(this, new ServerBootstrap(), protocol) {
                 @Override
                 protected void addSpecificHandlers(ChannelPipeline pipeline) {
-                    byte delimiter[] = { (byte) '\r', (byte) '\n' };
-                    pipeline.addLast("frameDecoder",
-                            new DelimiterBasedFrameDecoder(1024, ChannelBuffers.wrappedBuffer(delimiter)));
+                    pipeline.addLast("frameDecoder", new TotemFrameDecoder());
                     pipeline.addLast("stringDecoder", new StringDecoder());
-                    pipeline.addLast("objectDecoder", new Avl08ProtocolDecoder(ServerManager.this));
+                    pipeline.addLast("objectDecoder", new TotemProtocolDecoder(ServerManager.this));
                 }
             });
         }
@@ -944,19 +941,6 @@ public class ServerManager {
         }
     }
 
-    private void initTotemServer(String protocol) throws SQLException {
-        if (isProtocolEnabled(properties, protocol)) {
-            serverList.add(new TrackerServer(this, new ServerBootstrap(), protocol) {
-                @Override
-                protected void addSpecificHandlers(ChannelPipeline pipeline) {
-                    pipeline.addLast("frameDecoder", new TotemFrameDecoder());
-                    pipeline.addLast("stringDecoder", new StringDecoder());
-                    pipeline.addLast("objectDecoder", new TotemProtocolDecoder(ServerManager.this));
-                }
-            });
-        }
-    }
-
     private void initGatorServer(String protocol) throws SQLException {
         if (isProtocolEnabled(properties, protocol)) {
             serverList.add(new TrackerServer(this, new ConnectionlessBootstrap(), protocol) {
diff --git a/src/org/traccar/protocol/Avl08ProtocolDecoder.java b/src/org/traccar/protocol/Avl08ProtocolDecoder.java
deleted file mode 100644
index 825e84cf6..000000000
--- a/src/org/traccar/protocol/Avl08ProtocolDecoder.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/*
- * Copyright 2012 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.ServerManager;
-import org.traccar.helper.Log;
-import org.traccar.model.ExtendedInfoFormatter;
-import org.traccar.model.Position;
-
-/**
- * AVL-08 tracker protocol decoder
- */
-public class Avl08ProtocolDecoder extends BaseProtocolDecoder {
-
-    /**
-     * Initialize
-     */
-    public Avl08ProtocolDecoder(ServerManager serverManager) {
-        super(serverManager);
-    }
-
-    /**
-     * Regular expressions pattern
-     */
-    static private Pattern pattern = Pattern.compile(
-            "\\$\\$.{2}" +               // Length
-            "(\\d+)\\|" +                // IMEI
-            "(.{2})" +                   // Alarm Type
-            "\\$GPRMC," +
-            "(\\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)
-            "(\\d+\\.?\\d+)\\|(\\d+\\.?\\d+)\\|(\\d+\\.?\\d+)\\|" + // Dilution of precision
-            "(\\d{12})\\|" +             // Status
-            "(\\d{14})\\|" +             // Clock
-            "(\\d{8})\\|" +              // Voltage
-            "(\\d{8})\\|" +              // ADC
-            "([0-9a-fA-F]{8})\\|" +      // Cell
-            "(.\\d{3})\\|" +             // Temperature
-            "(\\d+.\\d{4})\\|" +         // Mileage
-            "(\\d{4})\\|" +              // Serial
-            "(.{10})?\\|?" +             // RFID
-            ".+"); // TODO: Use non-capturing group
-
-    /**
-     * Decode message
-     */
-    @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();
-        ExtendedInfoFormatter extendedInfo = new ExtendedInfoFormatter("avl08");
-
-        Integer index = 1;
-
-        // Get device by IMEI
-        String imei = parser.group(index++);
-        try {
-            position.setDeviceId(getDataManager().getDeviceByImei(imei).getId());
-        } catch(Exception error) {
-            Log.warning("Unknown device - " + imei);
-            return null;
-        }
-
-        // Alarm type
-        extendedInfo.set("alarm", parser.group(index++));
-
-        // Time
-        Calendar time = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
-        time.clear();
-        time.set(Calendar.HOUR, 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 ? true : false);
-
-        // 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);
-
-        // Altitude
-        position.setAltitude(0.0);
-
-        // Speed
-        position.setSpeed(Double.valueOf(parser.group(index++)));
-
-        // Course
-        String course = parser.group(index++);
-        if (course != null) {
-            position.setCourse(Double.valueOf(course));
-        } else {
-            position.setCourse(0.0);
-        }
-
-        // 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());
-
-        // Dilution of precision
-        extendedInfo.set("pdop", parser.group(index++).replaceFirst ("^0*(?![\\.$])", ""));
-        extendedInfo.set("hdop", parser.group(index++).replaceFirst ("^0*(?![\\.$])", ""));
-        extendedInfo.set("vdop", parser.group(index++).replaceFirst ("^0*(?![\\.$])", ""));
-
-        // Status
-        extendedInfo.set("status", parser.group(index++));
-
-        // Real time clock
-        extendedInfo.set("clock", parser.group(index++));
-
-        // Voltage
-        String voltage = parser.group(index++);
-        extendedInfo.set("power", Double.valueOf(voltage.substring(1, 4)) / 100);
-        extendedInfo.set("voltage", voltage);
-
-        // ADC
-        extendedInfo.set("adc", parser.group(index++));
-
-        // Cell
-        extendedInfo.set("cell", parser.group(index++));
-
-        // Temperature
-        extendedInfo.set("temperature", parser.group(index++));
-
-        // Mileage
-        extendedInfo.set("mileage", parser.group(index++));
-
-        // Serial
-        extendedInfo.set("serial", parser.group(index++).replaceFirst ("^0*", ""));
-
-        // RFID
-        extendedInfo.set("rfid", parser.group(index++));
-
-        // Extended info
-        position.setExtendedInfo(extendedInfo.toString());
-
-        return position;
-    }
-
-}
diff --git a/src/org/traccar/protocol/TotemProtocolDecoder.java b/src/org/traccar/protocol/TotemProtocolDecoder.java
index 5b9aeff84..1a0f22d80 100644
--- a/src/org/traccar/protocol/TotemProtocolDecoder.java
+++ b/src/org/traccar/protocol/TotemProtocolDecoder.java
@@ -33,7 +33,7 @@ public class TotemProtocolDecoder extends BaseProtocolDecoder {
         super(serverManager);
     }
 
-    static private Pattern patternFirst = Pattern.compile(
+    private static final Pattern patternFirst = Pattern.compile(
             "\\$\\$" +                          // Header
             "\\p{XDigit}{2}" +                  // Length
             "(\\d+)\\|" +                       // IMEI
@@ -62,9 +62,10 @@ public class TotemProtocolDecoder extends BaseProtocolDecoder {
             "(\\d+)\\|" +                       // Temperature
             "(\\d+.\\d+)\\|" +                  // Milage
             "\\d+\\|" +                         // Serial Number
+            ".*\\|?" +
             "\\p{XDigit}{4}");                  // Checksum
             
-    static private Pattern patternSecond = Pattern.compile(
+    private static final Pattern patternSecond = Pattern.compile(
             "\\$\\$" +                          // Header
             "\\p{XDigit}{2}" +                  // Length
             "(\\d+)\\|" +                       // IMEI
@@ -90,7 +91,7 @@ public class TotemProtocolDecoder extends BaseProtocolDecoder {
             "\\d+\\|" +                         // Serial Number
             "\\p{XDigit}{4}");                  // Checksum
 
-    static private Pattern patternThird = Pattern.compile(
+    private static final Pattern patternThird = Pattern.compile(
             "\\$\\$" +                          // Header
             "\\p{XDigit}{2}" +                  // Length
             "(\\d+)\\|" +                       // IMEI
@@ -188,7 +189,7 @@ public class TotemProtocolDecoder extends BaseProtocolDecoder {
             time.set(Calendar.SECOND, Integer.valueOf(parser.group(index++)));
 
             // Validity
-            position.setValid(parser.group(index++).compareTo("A") == 0 ? true : false);
+            position.setValid(parser.group(index++).compareTo("A") == 0);
 
             // Latitude
             Double latitude = Double.valueOf(parser.group(index++));
diff --git a/test/org/traccar/protocol/Avl08ProtocolDecoderTest.java b/test/org/traccar/protocol/Avl08ProtocolDecoderTest.java
deleted file mode 100644
index 802b3f949..000000000
--- a/test/org/traccar/protocol/Avl08ProtocolDecoderTest.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package org.traccar.protocol;
-
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import org.junit.Test;
-
-public class Avl08ProtocolDecoderTest {
-
-    @Test
-    public void testDecode() throws Exception {
-
-        Avl08ProtocolDecoder decoder = new Avl08ProtocolDecoder(null);
-        decoder.setDataManager(new TestDataManager());
-
-        assertNotNull(decoder.decode(null, null,
-                "$$B0456123|61$GPRMC,114725.00,A,1258.68276,N,07730.60237,E,0.410,,080113,,,A*79|1.44|0.66|1.27|000000000000|20130108114425|03600000|00000000|053C2BFE|0000|0.3325|0063|2005"));
-
-        assertNull(decoder.decode(null, null,
-                "$$AE359772033395899|AA000000000000000000000000000000000000000000000000000000000000|00.0|00.0|00.0|000000000000|20090215000153|13601435|00000000|00000000|0000|0.0000|0007|2DAA"));
-
-        assertNull(decoder.decode(null, null,
-                "$$AE359772033395899|AA000000000000000000000000000000000000000000000000000000000000|00.0|00.0|00.0|00000000|20090215001204|14182037|00000000|0012D888|0000|0.0000|0016|5B51"));
-
-        assertNull(decoder.decode(null, null,
-                "$$AE359772033395899|AA00000000000000000000000000000000000000000000000000000000000|00.0|00.0|00.0|00000000000|20090215001337|14182013|00000000|0012D888|0000|0.0000|0017|346E"));
-
-        assertNotNull(decoder.decode(null, null,
-                "$$B3359772032399074|60$GPRMC,094859.000,A,3648.2229,N,01008.0976,E,0.00,,221211,,,A*79|02.3|01.3|02.0|000000000000|20111222094858|13360808|00000000|00000000|0000|0.0000|0001||A977"));
-
-        assertNotNull(decoder.decode(null, null,
-                "$$B3359772032399074|09$GPRMC,094905.000,A,3648.2229,N,01008.0976,E,0.00,,221211,,,A*71|02.1|01.3|01.7|000000000000|20111222094905|03210533|00000000|00000000|0000|0.0000|0002||FA58"));
-
-        assertNotNull(decoder.decode(null, null,
-                "$$B3359772032399074|AA$GPRMC,093911.000,A,3648.2146,N,01008.0977,E,0.00,,140312,,,A*7E|02.1|01.1|01.8|000000000000|20120314093910|04100057|00000000|0012D887|0000|0.0000|1128||C50E"));
-
-        assertNotNull(decoder.decode(null, null,
-                "$$B3359772032399074|AA$GPRMC,094258.000,A,3648.2146,N,01008.0977,E,0.00,,140312,,,A*7F|02.1|01.1|01.8|000000000000|20120314094257|04120057|00000000|0012D887|0000|0.0000|1136||CA32"));
-
-        assertNotNull(decoder.decode(null, null,
-                "$$B3359772032399074|AA$GPRMC,234603.000,A,3648.2179,N,01008.0962,E,0.00,,030412,,,A*74|01.8|01.0|01.5|000000000000|20120403234603|14251914|00000000|0012D888|0000|0.0000|3674||940B"));
-
-        assertNotNull(decoder.decode(null, null,
-                "$$B3359772032399074|AA$GPRMC,234603.000,A,3648.2179,N,01008.0962,E,0.00,,030412,,,A*74|01.8|01.0|01.5|000000000000|20120403234603|14251914|00000000|0012D888|0000|0.0000|3674|940B"));
-    }
-
-}
diff --git a/test/org/traccar/protocol/TotemProtocolDecoderTest.java b/test/org/traccar/protocol/TotemProtocolDecoderTest.java
index 9b5a1d349..7317af419 100644
--- a/test/org/traccar/protocol/TotemProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/TotemProtocolDecoderTest.java
@@ -27,6 +27,36 @@ public class TotemProtocolDecoderTest {
         assertNotNull(decoder.decode(null, null,
                 "$$72862170017856731|3913090911165280000370000000000000000019BD508A0400000003.400000093644.9817N01012.9944E00506F2E"));
 
+        assertNotNull(decoder.decode(null, null,
+                "$$B0456123|61$GPRMC,114725.00,A,1258.68276,N,07730.60237,E,0.410,,080113,,,A*79|1.44|0.66|1.27|000000000000|20130108114425|03600000|00000000|053C2BFE|0000|0.3325|0063|2005"));
+
+        assertNull(decoder.decode(null, null,
+                "$$AE359772033395899|AA000000000000000000000000000000000000000000000000000000000000|00.0|00.0|00.0|000000000000|20090215000153|13601435|00000000|00000000|0000|0.0000|0007|2DAA"));
+
+        assertNull(decoder.decode(null, null,
+                "$$AE359772033395899|AA000000000000000000000000000000000000000000000000000000000000|00.0|00.0|00.0|00000000|20090215001204|14182037|00000000|0012D888|0000|0.0000|0016|5B51"));
+
+        assertNull(decoder.decode(null, null,
+                "$$AE359772033395899|AA00000000000000000000000000000000000000000000000000000000000|00.0|00.0|00.0|00000000000|20090215001337|14182013|00000000|0012D888|0000|0.0000|0017|346E"));
+
+        assertNotNull(decoder.decode(null, null,
+                "$$B3359772032399074|60$GPRMC,094859.000,A,3648.2229,N,01008.0976,E,0.00,,221211,,,A*79|02.3|01.3|02.0|000000000000|20111222094858|13360808|00000000|00000000|0000|0.0000|0001||A977"));
+
+        assertNotNull(decoder.decode(null, null,
+                "$$B3359772032399074|09$GPRMC,094905.000,A,3648.2229,N,01008.0976,E,0.00,,221211,,,A*71|02.1|01.3|01.7|000000000000|20111222094905|03210533|00000000|00000000|0000|0.0000|0002||FA58"));
+
+        assertNotNull(decoder.decode(null, null,
+                "$$B3359772032399074|AA$GPRMC,093911.000,A,3648.2146,N,01008.0977,E,0.00,,140312,,,A*7E|02.1|01.1|01.8|000000000000|20120314093910|04100057|00000000|0012D887|0000|0.0000|1128||C50E"));
+
+        assertNotNull(decoder.decode(null, null,
+                "$$B3359772032399074|AA$GPRMC,094258.000,A,3648.2146,N,01008.0977,E,0.00,,140312,,,A*7F|02.1|01.1|01.8|000000000000|20120314094257|04120057|00000000|0012D887|0000|0.0000|1136||CA32"));
+
+        assertNotNull(decoder.decode(null, null,
+                "$$B3359772032399074|AA$GPRMC,234603.000,A,3648.2179,N,01008.0962,E,0.00,,030412,,,A*74|01.8|01.0|01.5|000000000000|20120403234603|14251914|00000000|0012D888|0000|0.0000|3674||940B"));
+
+        assertNotNull(decoder.decode(null, null,
+                "$$B3359772032399074|AA$GPRMC,234603.000,A,3648.2179,N,01008.0962,E,0.00,,030412,,,A*74|01.8|01.0|01.5|000000000000|20120403234603|14251914|00000000|0012D888|0000|0.0000|3674|940B"));
+
     }
 
 }