Merge pull request #4 from traccar/master

upgrade to current master

1 files changed, 41 insertions, 3 deletions

diff --git a/src/org/traccar/protocol/Tlt2hProtocolDecoder.java b/src/org/traccar/protocol/Tlt2hProtocolDecoder.java
index cbc851de0..a5a195afa 100644
--- a/src/org/traccar/protocol/Tlt2hProtocolDecoder.java
+++ b/src/org/traccar/protocol/Tlt2hProtocolDecoder.java
@@ -57,6 +57,45 @@ public class Tlt2hProtocolDecoder extends BaseProtocolDecoder {
             .any()
             .compile();
 
+    private void decodeStatus(Position position, String status) {
+        switch (status) {
+            case "AUTOSTART":
+            case "AUTO":
+                position.set(Position.KEY_IGNITION, true);
+                break;
+            case "AUTOSTOP":
+            case "AUTOLOW":
+                position.set(Position.KEY_IGNITION, false);
+                break;
+            case "TOWED":
+                position.set(Position.KEY_ALARM, Position.ALARM_TOW);
+                break;
+            case "SOS":
+                position.set(Position.KEY_ALARM, Position.ALARM_SOS);
+                break;
+            case "DEF":
+                position.set(Position.KEY_ALARM, Position.ALARM_POWER_CUT);
+                break;
+            case "BLP":
+                position.set(Position.KEY_ALARM, Position.ALARM_LOW_BATTERY);
+                break;
+            case "CLP":
+                position.set(Position.KEY_ALARM, Position.ALARM_LOW_POWER);
+                break;
+            case "OS":
+                position.set(Position.KEY_ALARM, Position.ALARM_GEOFENCE_EXIT);
+                break;
+            case "RS":
+                position.set(Position.KEY_ALARM, Position.ALARM_GEOFENCE_ENTER);
+                break;
+            case "OVERSPEED":
+                position.set(Position.KEY_ALARM, Position.ALARM_OVERSPEED);
+                break;
+            default:
+                break;
+        }
+    }
+
     @Override
     protected Object decode(
             Channel channel, SocketAddress remoteAddress, Object msg) throws Exception {
@@ -84,8 +123,7 @@ public class Tlt2hProtocolDecoder extends BaseProtocolDecoder {
             parser = new Parser(PATTERN_POSITION, message);
             if (parser.matches()) {
 
-                Position position = new Position();
-                position.setProtocol(getProtocolName());
+                Position position = new Position(getProtocolName());
                 position.setDeviceId(deviceSession.getDeviceId());
 
                 parser.next(); // base station info
@@ -102,7 +140,7 @@ public class Tlt2hProtocolDecoder extends BaseProtocolDecoder {
                 dateBuilder.setDateReverse(parser.nextInt(0), parser.nextInt(0), parser.nextInt(0));
                 position.setTime(dateBuilder.getDate());
 
-                position.set(Position.KEY_STATUS, status);
+                decodeStatus(position, status);
 
                 positions.add(position);
             }