aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/protocol/Jt600ProtocolDecoder.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/Jt600ProtocolDecoder.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/Jt600ProtocolDecoder.java')
-rw-r--r--src/org/traccar/protocol/Jt600ProtocolDecoder.java28
1 files changed, 14 insertions, 14 deletions
diff --git a/src/org/traccar/protocol/Jt600ProtocolDecoder.java b/src/org/traccar/protocol/Jt600ProtocolDecoder.java
index 05b4abbb0..ef20a9534 100644
--- a/src/org/traccar/protocol/Jt600ProtocolDecoder.java
+++ b/src/org/traccar/protocol/Jt600ProtocolDecoder.java
@@ -194,13 +194,13 @@ public class Jt600ProtocolDecoder extends BaseProtocolDecoder {
position.setTime(parser.nextDateTime(Parser.DateTimeFormat.DMY_HMS));
- position.setSpeed(UnitsConverter.knotsFromKph(parser.nextDouble()));
- position.setCourse(parser.nextDouble());
+ position.setSpeed(UnitsConverter.knotsFromKph(parser.nextDouble(0)));
+ position.setCourse(parser.nextDouble(0));
- position.set(Position.KEY_POWER, parser.nextDouble());
- position.set(Position.KEY_GPS, parser.nextInt());
- position.set(Position.KEY_RSSI, parser.nextInt());
- position.set("alertType", parser.nextInt());
+ position.set(Position.KEY_POWER, parser.nextDouble(0));
+ position.set(Position.KEY_GPS, parser.nextInt(0));
+ position.set(Position.KEY_RSSI, parser.nextInt(0));
+ position.set("alertType", parser.nextInt(0));
return position;
}
@@ -253,19 +253,19 @@ public class Jt600ProtocolDecoder extends BaseProtocolDecoder {
position.setLatitude(parser.nextCoordinate(Parser.CoordinateFormat.DEG_HEM));
position.setLongitude(parser.nextCoordinate(Parser.CoordinateFormat.DEG_HEM));
- position.setSpeed(UnitsConverter.knotsFromMph(parser.nextDouble()));
- position.setCourse(parser.nextDouble());
+ position.setSpeed(UnitsConverter.knotsFromMph(parser.nextDouble(0)));
+ position.setCourse(parser.nextDouble(0));
- position.set(Position.KEY_SATELLITES, parser.nextInt());
+ position.set(Position.KEY_SATELLITES, parser.nextInt(0));
position.set(Position.KEY_BATTERY, parser.next());
- position.set(Position.KEY_STATUS, parser.nextInt(2));
+ position.set(Position.KEY_STATUS, parser.nextBinInt(0));
- CellTower cellTower = CellTower.fromCidLac(parser.nextInt(), parser.nextInt());
- cellTower.setSignalStrength(parser.nextInt());
+ CellTower cellTower = CellTower.fromCidLac(parser.nextInt(0), parser.nextInt(0));
+ cellTower.setSignalStrength(parser.nextInt(0));
position.setNetwork(new Network(cellTower));
- position.set(Position.KEY_ODOMETER, parser.nextLong() * 1000);
- position.set(Position.KEY_INDEX, parser.nextInt());
+ position.set(Position.KEY_ODOMETER, parser.nextLong(0) * 1000);
+ position.set(Position.KEY_INDEX, parser.nextInt(0));
if (channel != null) {
if (type.equals("U01") || type.equals("U02") || type.equals("U03")) {