Updated protocols to record CellTower information where appropriate; Removed KEY_RSSI when reported in CellTower;

1 files changed, 8 insertions, 4 deletions

diff --git a/src/org/traccar/protocol/TeltonikaProtocolDecoder.java b/src/org/traccar/protocol/TeltonikaProtocolDecoder.java
index 9c1e0a2ff..87cc72814 100644
--- a/src/org/traccar/protocol/TeltonikaProtocolDecoder.java
+++ b/src/org/traccar/protocol/TeltonikaProtocolDecoder.java
@@ -166,11 +166,15 @@ public class TeltonikaProtocolDecoder extends BaseProtocolDecoder {
                 }
 
                 if (BitUtil.check(locationMask, 5)) {
-                    position.setNetwork(new Network(
-                            CellTower.fromLacCid(buf.readUnsignedShort(), buf.readUnsignedShort())));
-                }
+                    CellTower cellTower = CellTower.fromLacCid(buf.readUnsignedShort(), buf.readUnsignedShort());
+
+                    if (BitUtil.check(locationMask, 6)) {
+                        cellTower.setSignalStrength((int) buf.readUnsignedByte());
+                    }
+
+                    position.setNetwork(new Network(cellTower));
 
-                if (BitUtil.check(locationMask, 6)) {
+                } else if (BitUtil.check(locationMask, 6)) {
                     position.set(Position.KEY_RSSI, buf.readUnsignedByte());
                 }