Release 1.4

opengts.cfg

@@ -98,4 +98,28 @@
     <entry key="st210.enable">true</entry>
     <entry key="st210.port">5011</entry>
 
+    <!-- Progress server configuration -->
+    <entry key="progress.enable">true</entry>
+    <entry key="progress.port">5012</entry>
+
+    <!-- H02 server configuration -->
+    <entry key="h02.enable">true</entry>
+    <entry key="h02.port">5013</entry>
+
+    <!-- JT600 server configuration -->
+    <entry key="jt600.enable">true</entry>
+    <entry key="jt600.port">5014</entry>
+
+    <!-- EV603 server configuration -->
+    <entry key="ev603.enable">true</entry>
+    <entry key="ev603.port">5015</entry>
+
+    <!-- V680 server configuration -->
+    <entry key="v680.enable">true</entry>
+    <entry key="v680.port">5016</entry>
+
+    <!-- PT502 server configuration -->
+    <entry key="pt502.enable">true</entry>
+    <entry key="pt502.port">5017</entry>
+    
 </properties>

pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.traccar</groupId>
     <artifactId>traccar</artifactId>
-    <version>1.3-SNAPSHOT</version>
+    <version>1.4-SNAPSHOT</version>
 
     <name>traccar</name>
     <url>http://www.traccar.org</url>

setup/linux/linux.cfg

@@ -155,5 +155,9 @@
     <!-- V680 server configuration -->
     <entry key="v680.enable">true</entry>
     <entry key="v680.port">5016</entry>
+
+    <!-- PT502 server configuration -->
+    <entry key="pt502.enable">true</entry>
+    <entry key="pt502.port">5017</entry>
     
 </properties>

setup/universal/README.txt

@@ -0,0 +1,11 @@
+Web page - http://www.traccar.org
+
+This package contains only main Java application (tracker-server.jar).
+
+1) To start application you need libraries to lib folder (check manifest file)
+
+2) Create configuration file (more information on web page)
+
+3) To start application run following command:
+
+java -jar tracker-server.jar "configuration.xml"

setup/universal/traccar.sh

@@ -0,0 +1,5 @@
+#!/bin/sh
+
+cp ../../target/tracker-server.jar ./
+zip tracker-server.zip tracker-server.jar README.txt
+rm tracker-server.jar

setup/windows/traccar.iss

@@ -1,6 +1,6 @@
 [Setup]
 AppName=Traccar
-AppVersion=1.3
+AppVersion=1.4
 DefaultDirName={pf}\Traccar
 AlwaysRestart=yes
 

setup/windows/windows.cfg

@@ -155,5 +155,9 @@
     <!-- V680 server configuration -->
     <entry key="v680.enable">true</entry>
     <entry key="v680.port">5016</entry>
+
+    <!-- PT502 server configuration -->
+    <entry key="pt502.enable">true</entry>
+    <entry key="pt502.port">5017</entry>
     
 </properties>

src/org/traccar/protocol/Pt502ProtocolDecoder.java

@@ -0,0 +1,130 @@
+/*
+ * Copyright 2012 Anton Tananaev (anton.tananaev@gmail.com)
+ *                Luis Parada (luis.parada@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.GenericProtocolDecoder;
+import org.traccar.helper.Log;
+import org.traccar.model.DataManager;
+import org.traccar.model.Position;
+
+/**
+ * PT502 tracker protocol decoder
+ */
+public class Pt502ProtocolDecoder extends GenericProtocolDecoder {
+
+    /**
+     * Initialize
+     */
+    public Pt502ProtocolDecoder(DataManager dataManager) {
+        super(dataManager);
+    }
+    /**
+     * Regular expressions pattern
+     */
+    //$POS,6094,205523.000,A,1013.6223,N,06728.4248,W,0.0,99.3,011112,,,A/00000,00000/0/23895000//
+    static private Pattern pattern = Pattern.compile(
+            "\\$POS," +                         // Data Frame start
+            "(\\d+)," +                         // Id
+            "(\\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+)," +                  // Speed
+            "(\\d+\\.\\d+)," +                  // Course (or Distance???)
+            "(\\d{2})(\\d{2})(\\d{2})," +       // Date
+            ".*");
+
+    /*
+     * Decode message
+     */
+    protected Object decode(
+            ChannelHandlerContext ctx, Channel channel, Object msg)
+            throws Exception {
+
+        String sentence = (String) msg;
+
+        // Parse message
+        Matcher parser = pattern.matcher(sentence);
+        if (!parser.matches()) {
+            Log.getLogger().info("Parsing error");
+            return null;
+        }
+
+        // Create new position
+        Position position = new Position();
+        StringBuilder extendedInfo = new StringBuilder("<protocol>pt502</protocol>");
+
+        Integer index = 1;
+
+        // Get device by IMEI
+        String id = parser.group(index++);
+        position.setDeviceId(getDataManager().getDeviceByImei(id).getId());
+
+        // 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 lonlitude = Double.valueOf(parser.group(index++));
+        lonlitude += Double.valueOf(parser.group(index++)) / 60;
+        if (parser.group(index++).compareTo("W") == 0) {
+            lonlitude = -lonlitude;
+        }
+        position.setLongitude(lonlitude);
+
+        // Altitude
+        position.setAltitude(0.0);
+
+        // Speed
+        position.setSpeed(Double.valueOf(parser.group(index++)));
+        position.setCourse(Double.valueOf(parser.group(index++)));
+
+        // 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());
+
+        // Extended info
+        position.setExtendedInfo(extendedInfo.toString());
+
+        return position;
+    }
+}