1 files changed, 6 insertions, 6 deletions
diff --git a/src/org/traccar/protocol/TrvProtocolDecoder.java b/src/org/traccar/protocol/TrvProtocolDecoder.java
index 0afe065c2..3d8b6c66b 100644
--- a/src/org/traccar/protocol/TrvProtocolDecoder.java
+++ b/src/org/traccar/protocol/TrvProtocolDecoder.java
@@ -22,6 +22,8 @@ import org.traccar.helper.DateBuilder;
 import org.traccar.helper.Parser;
 import org.traccar.helper.PatternBuilder;
 import org.traccar.helper.UnitsConverter;
+import org.traccar.model.CellTower;
+import org.traccar.model.Network;
 import org.traccar.model.Position;
 
 import java.net.SocketAddress;
@@ -104,7 +106,7 @@ public class TrvProtocolDecoder extends BaseProtocolDecoder {
 
             getLastLocation(position, null);
 
-            position.set(Position.KEY_GSM, parser.nextInt());
+            position.set(Position.KEY_RSSI, parser.nextInt());
             position.set(Position.KEY_SATELLITES, parser.nextInt());
             position.set(Position.KEY_BATTERY, parser.nextInt());
             position.set(Position.KEY_IGNITION, parser.nextInt() != 0);
@@ -138,7 +140,7 @@ public class TrvProtocolDecoder extends BaseProtocolDecoder {
 
             position.setCourse(parser.nextDouble());
 
-            position.set(Position.KEY_GSM, parser.nextInt());
+            position.set(Position.KEY_RSSI, parser.nextInt());
             position.set(Position.KEY_SATELLITES, parser.nextInt());
             position.set(Position.KEY_BATTERY, parser.nextInt());
 
@@ -147,10 +149,8 @@ public class TrvProtocolDecoder extends BaseProtocolDecoder {
                 position.set(Position.KEY_IGNITION, acc == 1);
             }
 
-            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());
+            position.setNetwork(new Network(CellTower.from(
+                    parser.nextInt(), parser.nextInt(), parser.nextInt(), parser.nextInt())));
 
             return position;
         }