diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2016-12-20 08:42:20 +1300 |
|---|---|---|
| committer | Anton Tananaev <anton.tananaev@gmail.com> | 2016-12-20 08:42:20 +1300 |
| commit | 13c1b5a0f68cf3f9a6a8fee43a4e5c1406dac32a (patch) | |
| tree | a7d3450db8ccb6698ed4e7794f27ceaf939807c9 /src/org/traccar/protocol/L100ProtocolDecoder.java | |
| parent | 301b44775fb4ed66fae5c801da3c52f7b88b9697 (diff) | |
| download | trackermap-server-13c1b5a0f68cf3f9a6a8fee43a4e5c1406dac32a.tar.gz trackermap-server-13c1b5a0f68cf3f9a6a8fee43a4e5c1406dac32a.tar.bz2 trackermap-server-13c1b5a0f68cf3f9a6a8fee43a4e5c1406dac32a.zip | |
Refactor protocols for network location
Diffstat (limited to 'src/org/traccar/protocol/L100ProtocolDecoder.java')
| -rw-r--r-- | src/org/traccar/protocol/L100ProtocolDecoder.java | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/org/traccar/protocol/L100ProtocolDecoder.java b/src/org/traccar/protocol/L100ProtocolDecoder.java index 7eed7df9a..bdf4ba29b 100644 --- a/src/org/traccar/protocol/L100ProtocolDecoder.java +++ b/src/org/traccar/protocol/L100ProtocolDecoder.java @@ -22,6 +22,8 @@ import org.traccar.DeviceSession; import org.traccar.helper.DateBuilder; import org.traccar.helper.Parser; import org.traccar.helper.PatternBuilder; +import org.traccar.model.CellTower; +import org.traccar.model.Network; import org.traccar.model.Position; import java.net.SocketAddress; @@ -106,11 +108,10 @@ public class L100ProtocolDecoder extends BaseProtocolDecoder { position.set(Position.KEY_ODOMETER, parser.nextDouble()); position.set(Position.PREFIX_TEMP + 1, parser.nextDouble()); position.set(Position.KEY_BATTERY, parser.nextDouble()); - position.set(Position.KEY_GSM, parser.nextInt()); - position.set(Position.KEY_MCC, parser.nextInt()); - position.set(Position.KEY_MNC, parser.nextInt()); - position.set(Position.KEY_LAC, parser.nextInt()); - position.set(Position.KEY_CID, parser.nextInt()); + + int rssi = parser.nextInt(); + position.setNetwork(new Network(CellTower.from( + parser.nextInt(), parser.nextInt(), parser.nextInt(), parser.nextInt(), rssi))); return position; } |