aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/protocol/TaipProtocolDecoder.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/TaipProtocolDecoder.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/TaipProtocolDecoder.java')
-rw-r--r--src/org/traccar/protocol/TaipProtocolDecoder.java22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/org/traccar/protocol/TaipProtocolDecoder.java b/src/org/traccar/protocol/TaipProtocolDecoder.java
index 2e37bbd57..280db0b31 100644
--- a/src/org/traccar/protocol/TaipProtocolDecoder.java
+++ b/src/org/traccar/protocol/TaipProtocolDecoder.java
@@ -105,14 +105,14 @@ public class TaipProtocolDecoder extends BaseProtocolDecoder {
position.setProtocol(getProtocolName());
if (parser.hasNext(3)) {
- position.set(Position.KEY_EVENT, parser.nextInt());
- position.setTime(getTime(parser.nextInt(), parser.nextInt(), parser.nextInt()));
+ position.set(Position.KEY_EVENT, parser.nextInt(0));
+ position.setTime(getTime(parser.nextInt(0), parser.nextInt(0), parser.nextInt(0)));
} else if (parser.hasNext()) {
- position.setTime(getTime(parser.nextInt()));
+ position.setTime(getTime(parser.nextInt(0)));
}
if (parser.hasNext()) {
- position.set(Position.KEY_EVENT, parser.nextInt());
+ position.set(Position.KEY_EVENT, parser.nextInt(0));
}
if (parser.hasNext(6)) {
@@ -128,17 +128,17 @@ public class TaipProtocolDecoder extends BaseProtocolDecoder {
position.setLongitude(parser.nextCoordinate(Parser.CoordinateFormat.HEM_DEG_MIN));
}
- position.setSpeed(UnitsConverter.knotsFromMph(parser.nextDouble()));
- position.setCourse(parser.nextDouble());
+ position.setSpeed(UnitsConverter.knotsFromMph(parser.nextDouble(0)));
+ position.setCourse(parser.nextDouble(0));
if (parser.hasNext(4)) {
- position.set(Position.KEY_INPUT, parser.nextInt(16));
- position.set(Position.KEY_SATELLITES, parser.nextInt(16));
- position.set(Position.KEY_BATTERY, parser.nextInt());
- position.set(Position.KEY_ODOMETER, parser.nextLong(16));
+ position.set(Position.KEY_INPUT, parser.nextHexInt(0));
+ position.set(Position.KEY_SATELLITES, parser.nextHexInt(0));
+ position.set(Position.KEY_BATTERY, parser.nextInt(0));
+ position.set(Position.KEY_ODOMETER, parser.nextLong(16, 0));
}
- position.setValid(parser.nextInt() != 0);
+ position.setValid(parser.nextInt(0) != 0);
String[] attributes = null;
beginIndex = sentence.indexOf(';');