aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/protocol/FlextrackProtocolDecoder.java
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2017-04-17 16:32:02 +1200
committerAnton Tananaev <anton.tananaev@gmail.com>2017-04-17 16:32:02 +1200
commit1c756c57653b72a656407da9c53ac292c5551cdb (patch)
tree69e88e24aae184508ab51932ef2692ae9515eef2 /src/org/traccar/protocol/FlextrackProtocolDecoder.java
parent4ab007201bd177a2fbf46a90b7b73262c5792caf (diff)
downloadtrackermap-server-1c756c57653b72a656407da9c53ac292c5551cdb.tar.gz
trackermap-server-1c756c57653b72a656407da9c53ac292c5551cdb.tar.bz2
trackermap-server-1c756c57653b72a656407da9c53ac292c5551cdb.zip
Allow optional primitives
Diffstat (limited to 'src/org/traccar/protocol/FlextrackProtocolDecoder.java')
-rw-r--r--src/org/traccar/protocol/FlextrackProtocolDecoder.java25
1 files changed, 13 insertions, 12 deletions
diff --git a/src/org/traccar/protocol/FlextrackProtocolDecoder.java b/src/org/traccar/protocol/FlextrackProtocolDecoder.java
index 2d7414f82..ab2e4d24c 100644
--- a/src/org/traccar/protocol/FlextrackProtocolDecoder.java
+++ b/src/org/traccar/protocol/FlextrackProtocolDecoder.java
@@ -114,24 +114,25 @@ public class FlextrackProtocolDecoder extends BaseProtocolDecoder {
position.setValid(true);
position.setLatitude(parser.nextCoordinate(Parser.CoordinateFormat.HEM_DEG_MIN));
position.setLongitude(parser.nextCoordinate(Parser.CoordinateFormat.HEM_DEG_MIN));
- position.setSpeed(UnitsConverter.knotsFromKph(parser.nextInt()));
- position.setCourse(parser.nextInt());
+ position.setSpeed(UnitsConverter.knotsFromKph(parser.nextInt(0)));
+ position.setCourse(parser.nextInt(0));
- position.set(Position.KEY_SATELLITES, parser.nextInt());
- position.set(Position.KEY_BATTERY, parser.nextInt());
- int rssi = parser.nextInt();
- position.set(Position.KEY_STATUS, parser.nextInt(16));
+ position.set(Position.KEY_SATELLITES, parser.nextInt(0));
+ position.set(Position.KEY_BATTERY, parser.nextInt(0));
+ int rssi = parser.nextInt(0);
+ position.set(Position.KEY_STATUS, parser.nextHexInt(0));
- int mcc = parser.nextInt();
- int mnc = parser.nextInt();
+ int mcc = parser.nextInt(0);
+ int mnc = parser.nextInt(0);
- position.setAltitude(parser.nextInt());
+ position.setAltitude(parser.nextInt(0));
- position.set(Position.KEY_HDOP, parser.nextInt() * 0.1);
+ position.set(Position.KEY_HDOP, parser.nextInt(0) * 0.1);
- position.setNetwork(new Network(CellTower.from(mcc, mnc, parser.nextInt(16), parser.nextInt(16), rssi)));
+ position.setNetwork(new Network(CellTower.from(
+ mcc, mnc, parser.nextHexInt(0), parser.nextHexInt(0), rssi)));
- position.set(Position.KEY_ODOMETER, parser.nextInt());
+ position.set(Position.KEY_ODOMETER, parser.nextInt(0));
return position;
}