6 files changed, 106 insertions, 46 deletions

diff --git a/src/net/sourceforge/opentracking/Position.java b/src/net/sourceforge/opentracking/Position.java
index 0e20c22c1..0c4117448 100644
--- a/src/net/sourceforge/opentracking/Position.java
+++ b/src/net/sourceforge/opentracking/Position.java
@@ -99,6 +99,19 @@ public class Position {
     public void setLongitude(Double newLongitude) {
         longitude = newLongitude;
     }
+    
+    /**
+     * Altitude
+     */
+    private Double altitude;
+    
+    public Double getAltitude() {
+        return altitude;
+    }
+
+    public void setAltitude(Double newAltitude) {
+        altitude = newAltitude;
+    }
 
     /**
      * Speed (knots)
diff --git a/src/net/sourceforge/opentracking/Server.java b/src/net/sourceforge/opentracking/Server.java
index b34e4cf46..5d1332f38 100644
--- a/src/net/sourceforge/opentracking/Server.java
+++ b/src/net/sourceforge/opentracking/Server.java
@@ -44,6 +44,7 @@ import net.sourceforge.opentracking.protocol.xexun.XexunFrameDecoder;
 import net.sourceforge.opentracking.protocol.xexun.XexunProtocolDecoder;
 import net.sourceforge.opentracking.protocol.gps103.Gps103ProtocolDecoder;
 import net.sourceforge.opentracking.protocol.tk103.Tk103ProtocolDecoder;
+import net.sourceforge.opentracking.protocol.gl200.Gl200ProtocolDecoder;
 import org.jboss.netty.channel.ChannelHandlerContext;
 import org.jboss.netty.channel.ChannelPipeline;
 import org.jboss.netty.channel.ChannelPipelineFactory;
@@ -90,6 +91,7 @@ public class Server implements DataManager {
         initXexunServer(properties);
         initGps103Server(properties);
         initTk103Server(properties);
+        initGl200Server(properties);
     }
 
     /**
@@ -177,6 +179,7 @@ public class Server implements DataManager {
         insertPosition.setLong("device_id", position.getDeviceId());
         insertPosition.setTimestamp("time", position.getTime());
         insertPosition.setBoolean("valid", position.getValid());
+        insertPosition.setDouble("altitude", position.getAltitude());
         insertPosition.setDouble("latitude", position.getLatitude());
         insertPosition.setDouble("longitude", position.getLongitude());
         insertPosition.setDouble("speed", position.getSpeed());
@@ -393,6 +396,58 @@ public class Server implements DataManager {
     }
 
     /**
+     * Gl200 pipeline factory
+     */
+    protected class Gl200PipelineFactory implements ChannelPipelineFactory {
+
+        private TrackerServer server;
+        private Server serverCreator;
+        private Integer resetDelay;
+        
+        public Gl200PipelineFactory(
+                TrackerServer server, Server serverCreator, Integer resetDelay) {
+            this.server = server;
+            this.serverCreator = serverCreator;
+            this.resetDelay = resetDelay;
+        }
+        
+         if (serverCreator.isLoggerEnabled()) {
+                pipeline.addLast("logger", new LoggingHandler("logger"));
+            }
+            byte delimiter[] = { (byte) '$' };
+            pipeline.addLast("frameDecoder",
+                    new DelimiterBasedFrameDecoder(1024, ChannelBuffers.wrappedBuffer(delimiter)));
+            pipeline.addLast("stringDecoder", new StringDecoder());
+            pipeline.addLast("stringEncoder", new StringEncoder());
+            pipeline.addLast("objectDecoder", new Gl200ProtocolDecoder(serverCreator, resetDelay));
+     * Init Gl200 server+     */+    public void initGl200Server(Properties properties) throws SQLException {++        boolean enable = BueOf(properties.getProperty("gl200.port")));++            String resetDelay = properties.getProperty("gl200.resetDelay");+            server.setPipelineFactory(new Gl200PipelineFactory(+                    server, this, (resetDelay == null) ? 0 : Integer.valueOf(resetDelay)));++            serverList.add(server);+        }+    }    ++    /**      * Start      */     public void start() {diff --git a/src/net/sourceforge/opentracking/protocol/gl200/Gl200ProtocolDecoder.java b/src/net/sourceforge/opentracking/protocol/gl200/Gl200ProtocolDecoder.javaindex 0b7166ab2..6d0e0a8d9 100644--- a/src/net/sourceforge/opentracking/protocol/gl200/Gl200ProtocolDecoder.java+++ b/src/net/sourceforge/opentracking/protocol/gl200/Gl200ProtocolDecoder.java@@ -58,19 +58,22 @@ public class Gl200ProtocolDecoder extends OneToOneDecoder {      * Regular expressions pattern      */     static private Pattern pattern = Pattern.compile(-            "imei:" +-            "([\\d]+)," +                       // IMEI-            "[^,]+," +-            "(\\d{2})(\\d{2})(\\d{2})[\\d]+," + // Date-            "[+]?[\\d]*," +-            "[FL]," +                           // F - full / L - low-            "([\\d]{2})([\\d]{2})([\\d]{2}).([\\d]{3})," + // Time (HHMMSS.SSS)-            "([AV])," +                         // Validity-            "([\\d]{2})([\\d]{2}.[\\d]{4})," +  // Latitude (DDMM.MMMM)-            "([NS])," +-            "([\\d]{3})([\\d]{2}.[\\d]{4})," +  // Longitude (DDDMM.MMMM)-            "([EW])," +-            "([\\d]+.[\\d]{2}),");              // Speed+            "\\+RESP:GT...," ++            "\\d{6}," +                         // Protocol version+            "(\\d{15})," +                      // IMEI+            "[^,]*," +                          // Device name+            "\\d," +                            // Report ID+            "\\d," +                            // Report type+            "\\d*," +                           // Number+            "(\\d*)," +                         // GPS accuracy+            "(\\d+.\\d)," +                     // Speed+            "(\\d+)," +                         // Course+            "(-?\\d+.\\d)," +                   // Altitude+            "(-?\\d+.\\d+)," +                  // Longitude+            "(-?\\d+.\\d+)," +                  // Latitude+            "(\\d{4})(\\d{2})(\\d{2})" +        // Date (YYYYMMDD)+            "(\\d{2})(\\d{2})(\\d{2})," +       // Time (HHMMSS)+            "[^$]*");      /**
+     * Init Gl200 server
+     */
+    public void initGl200Server(Properties properties) throws SQLException {
+
+        boolean enable = BueOf(properties.getProperty("gl200.port")));
+
+            String resetDelay = properties.getProperty("gl200.resetDelay");
+            server.setPipelineFactory(new Gl200PipelineFactory(
+                    server, this, (resetDelay == null) ? 0 : Integer.valueOf(resetDelay)));
+
+            serverList.add(server);
+        }
+    }    
+
+    /**
      * Start
      */
     public void start() {
diff --git a/src/net/sourceforge/opentracking/protocol/gl200/Gl200ProtocolDecoder.java b/src/net/sourceforge/opentracking/protocol/gl200/Gl200ProtocolDecoder.java
index 0b7166ab2..6d0e0a8d9 100644
--- a/src/net/sourceforge/opentracking/protocol/gl200/Gl200ProtocolDecoder.java
+++ b/src/net/sourceforge/opentracking/protocol/gl200/Gl200ProtocolDecoder.java
@@ -58,19 +58,22 @@ public class Gl200ProtocolDecoder extends OneToOneDecoder {
      * Regular expressions pattern
      */
     static private Pattern pattern = Pattern.compile(
-            "imei:" +
-            "([\\d]+)," +                       // IMEI
-            "[^,]+," +
-            "(\\d{2})(\\d{2})(\\d{2})[\\d]+," + // Date
-            "[+]?[\\d]*," +
-            "[FL]," +                           // F - full / L - low
-            "([\\d]{2})([\\d]{2})([\\d]{2}).([\\d]{3})," + // Time (HHMMSS.SSS)
-            "([AV])," +                         // Validity
-            "([\\d]{2})([\\d]{2}.[\\d]{4})," +  // Latitude (DDMM.MMMM)
-            "([NS])," +
-            "([\\d]{3})([\\d]{2}.[\\d]{4})," +  // Longitude (DDDMM.MMMM)
-            "([EW])," +
-            "([\\d]+.[\\d]{2}),");              // Speed
+            "\\+RESP:GT...," +
+            "\\d{6}," +                         // Protocol version
+            "(\\d{15})," +                      // IMEI
+            "[^,]*," +                          // Device name
+            "\\d," +                            // Report ID
+            "\\d," +                            // Report type
+            "\\d*," +                           // Number
+            "(\\d*)," +                         // GPS accuracy
+            "(\\d+.\\d)," +                     // Speed
+            "(\\d+)," +                         // Course
+            "(-?\\d+.\\d)," +                   // Altitude
+            "(-?\\d+.\\d+)," +                  // Longitude
+            "(-?\\d+.\\d+)," +                  // Latitude
+            "(\\d{4})(\\d{2})(\\d{2})" +        // Date (YYYYMMDD)
+            "(\\d{2})(\\d{2})(\\d{2})," +       // Time (HHMMSS)
+            "[^$]*");
 
     /**