Decode missing attributes

1 files changed, 28 insertions, 17 deletions

diff --git a/src/main/java/org/traccar/protocol/SuntechProtocolDecoder.java b/src/main/java/org/traccar/protocol/SuntechProtocolDecoder.java
index 451b9ba32..fd4af847f 100644
--- a/src/main/java/org/traccar/protocol/SuntechProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/SuntechProtocolDecoder.java
@@ -479,20 +479,21 @@ public class SuntechProtocolDecoder extends BaseProtocolDecoder {
             position.setTime(dateFormat.parse(values[index++] + values[index++]));
         }
 
+        CellTower cellTower = new CellTower();
         if (BitUtil.check(mask, 6)) {
-            index += 1; // cell
+            cellTower.setCellId(Long.parseLong(values[index++], 16));
         }
-
         if (BitUtil.check(mask, 7)) {
-            index += 1; // mcc
+            cellTower.setMobileCountryCode(Integer.parseInt(values[index++]));
         }
-
         if (BitUtil.check(mask, 8)) {
-            index += 1; // mnc
+            cellTower.setMobileNetworkCode(Integer.parseInt(values[index++]));
         }
-
         if (BitUtil.check(mask, 9)) {
-            index += 1; // lac
+            cellTower.setLocationAreaCode(Integer.parseInt(values[index++], 16));
+        }
+        if (cellTower.getCellId() != null) {
+            position.setNetwork(new Network(cellTower));
         }
 
         if (BitUtil.check(mask, 10)) {
@@ -531,16 +532,26 @@ public class SuntechProtocolDecoder extends BaseProtocolDecoder {
             position.set(Position.KEY_OUTPUT, Integer.parseInt(values[index++]));
         }
 
-        if (BitUtil.check(mask, 19)) {
-            position.set("alertId", values[index++]);
-        }
-
-        if (BitUtil.check(mask, 20)) {
-            position.set("alertModifier", values[index++]);
-        }
-
-        if (BitUtil.check(mask, 21)) {
-            position.set("alertData", values[index++]);
+        if (type.equals("ALT")) {
+            if (BitUtil.check(mask, 19)) {
+                position.set("alertId", values[index++]);
+            }
+            if (BitUtil.check(mask, 20)) {
+                position.set("alertModifier", values[index++]);
+            }
+            if (BitUtil.check(mask, 21)) {
+                position.set("alertData", values[index++]);
+            }
+        } else {
+            if (BitUtil.check(mask, 19)) {
+                position.set("mode", Integer.parseInt(values[index++]));
+            }
+            if (BitUtil.check(mask, 20)) {
+                position.set("reason", Integer.parseInt(values[index++]));
+            }
+            if (BitUtil.check(mask, 21)) {
+                position.set(Position.KEY_INDEX, Integer.parseInt(values[index++]));
+            }
         }
 
         if (BitUtil.check(mask, 22)) {