diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2017-04-17 16:32:02 +1200 |
|---|---|---|
| committer | Anton Tananaev <anton.tananaev@gmail.com> | 2017-04-17 16:32:02 +1200 |
| commit | 1c756c57653b72a656407da9c53ac292c5551cdb (patch) | |
| tree | 69e88e24aae184508ab51932ef2692ae9515eef2 /src/org/traccar/protocol/TrakMateProtocolDecoder.java | |
| parent | 4ab007201bd177a2fbf46a90b7b73262c5792caf (diff) | |
| download | trackermap-server-1c756c57653b72a656407da9c53ac292c5551cdb.tar.gz trackermap-server-1c756c57653b72a656407da9c53ac292c5551cdb.tar.bz2 trackermap-server-1c756c57653b72a656407da9c53ac292c5551cdb.zip | |
Allow optional primitives
Diffstat (limited to 'src/org/traccar/protocol/TrakMateProtocolDecoder.java')
| -rw-r--r-- | src/org/traccar/protocol/TrakMateProtocolDecoder.java | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/src/org/traccar/protocol/TrakMateProtocolDecoder.java b/src/org/traccar/protocol/TrakMateProtocolDecoder.java index 03ec6cc67..18718cda0 100644 --- a/src/org/traccar/protocol/TrakMateProtocolDecoder.java +++ b/src/org/traccar/protocol/TrakMateProtocolDecoder.java @@ -116,8 +116,8 @@ public class TrakMateProtocolDecoder extends BaseProtocolDecoder { position.setProtocol(getProtocolName()); position.setDeviceId(deviceSession.getDeviceId()); - position.setLatitude(parser.nextDouble()); - position.setLongitude(parser.nextDouble()); + position.setLatitude(parser.nextDouble(0)); + position.setLongitude(parser.nextDouble(0)); position.setTime(parser.nextDateTime(Parser.DateTimeFormat.HMS_DMY)); @@ -144,16 +144,16 @@ public class TrakMateProtocolDecoder extends BaseProtocolDecoder { position.setDeviceId(deviceSession.getDeviceId()); parser.next(); // seq - position.set(Position.KEY_ALARM, decodeAlarm(parser.nextInt())); + position.set(Position.KEY_ALARM, decodeAlarm(parser.nextInt(0))); parser.next(); // alert status or data - position.setLatitude(parser.nextDouble()); - position.setLongitude(parser.nextDouble()); + position.setLatitude(parser.nextDouble(0)); + position.setLongitude(parser.nextDouble(0)); position.setTime(parser.nextDateTime(Parser.DateTimeFormat.HMS_DMY)); - position.setSpeed(parser.nextDouble()); - position.setCourse(parser.nextDouble()); + position.setSpeed(parser.nextDouble(0)); + position.setCourse(parser.nextDouble(0)); return position; } @@ -176,27 +176,27 @@ public class TrakMateProtocolDecoder extends BaseProtocolDecoder { parser.next(); // seq - position.setLatitude(parser.nextDouble()); - position.setLongitude(parser.nextDouble()); + position.setLatitude(parser.nextDouble(0)); + position.setLongitude(parser.nextDouble(0)); position.setTime(parser.nextDateTime(Parser.DateTimeFormat.HMS_DMY)); - position.setSpeed(parser.nextDouble()); - position.setCourse(parser.nextDouble()); + position.setSpeed(parser.nextDouble(0)); + position.setCourse(parser.nextDouble(0)); - position.set(Position.KEY_IGNITION, parser.nextInt() == 1); + position.set(Position.KEY_IGNITION, parser.nextInt(0) == 1); position.set("dop1", parser.next()); position.set("dop2", parser.next()); position.set(Position.KEY_INPUT, parser.next()); - position.set(Position.KEY_BATTERY, parser.nextDouble()); + position.set(Position.KEY_BATTERY, parser.nextDouble(0)); position.set(Position.KEY_POWER, parser.next()); - position.set(Position.KEY_ODOMETER, parser.nextDouble()); + position.set(Position.KEY_ODOMETER, parser.nextDouble(0)); position.set("pulseOdometer", parser.next()); - position.set(Position.KEY_STATUS, parser.nextInt()); + position.set(Position.KEY_STATUS, parser.nextInt(0)); - position.setValid(parser.nextInt() != 0); + position.setValid(parser.nextInt(0) != 0); - position.set(Position.KEY_ARCHIVE, parser.nextInt() == 1); + position.set(Position.KEY_ARCHIVE, parser.nextInt(0) == 1); return position; } |