aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/protocol/TeltonikaProtocolDecoder.java
diff options
context:
space:
mode:
authorjon-stumpf <jon.stumpf@gmail.com>2017-02-20 19:47:07 -0500
committerjon-stumpf <jon.stumpf@gmail.com>2017-02-20 19:47:07 -0500
commit21d8146fc216df827c156b446221c2bc01f05a6f (patch)
tree63972b4df6d5d9180c5c65610bb8ea375d01b984 /src/org/traccar/protocol/TeltonikaProtocolDecoder.java
parentb67f1e828ce5bc8fe215d377cd2ae81f23152abd (diff)
downloadtrackermap-server-21d8146fc216df827c156b446221c2bc01f05a6f.tar.gz
trackermap-server-21d8146fc216df827c156b446221c2bc01f05a6f.tar.bz2
trackermap-server-21d8146fc216df827c156b446221c2bc01f05a6f.zip
Updated protocols to record CellTower information where appropriate; Removed KEY_RSSI when reported in CellTower;
Diffstat (limited to 'src/org/traccar/protocol/TeltonikaProtocolDecoder.java')
-rw-r--r--src/org/traccar/protocol/TeltonikaProtocolDecoder.java12
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());
}