aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/protocol/V680ProtocolDecoder.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/V680ProtocolDecoder.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/V680ProtocolDecoder.java')
-rw-r--r--src/org/traccar/protocol/V680ProtocolDecoder.java18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/org/traccar/protocol/V680ProtocolDecoder.java b/src/org/traccar/protocol/V680ProtocolDecoder.java
index caa0e5e23..a7853133b 100644
--- a/src/org/traccar/protocol/V680ProtocolDecoder.java
+++ b/src/org/traccar/protocol/V680ProtocolDecoder.java
@@ -85,15 +85,15 @@ public class V680ProtocolDecoder extends BaseProtocolDecoder {
position.setDeviceId(deviceSession.getDeviceId());
position.set("user", parser.next());
- position.setValid(parser.nextInt() > 0);
+ position.setValid(parser.nextInt(0) > 0);
position.set("password", parser.next());
position.set(Position.KEY_EVENT, parser.next());
position.set("packet", parser.next());
position.set(Position.KEY_RSSI, parser.next());
- double lon = parser.nextDouble();
+ double lon = parser.nextDouble(0);
boolean west = parser.next().equals("W");
- double lat = parser.nextDouble();
+ double lat = parser.nextDouble(0);
boolean south = parser.next().equals("S");
if (lat > 90 || lon > 180) {
@@ -109,18 +109,18 @@ public class V680ProtocolDecoder extends BaseProtocolDecoder {
position.setLongitude(west ? -lon : lon);
position.setLatitude(south ? -lat : lat);
- position.setSpeed(parser.nextDouble());
- position.setCourse(parser.nextDouble());
+ position.setSpeed(parser.nextDouble(0));
+ position.setCourse(parser.nextDouble(0));
- int day = parser.nextInt();
- int month = parser.nextInt();
+ int day = parser.nextInt(0);
+ int month = parser.nextInt(0);
if (day == 0 && month == 0) {
return null; // invalid date
}
DateBuilder dateBuilder = new DateBuilder()
- .setDate(parser.nextInt(), month, day)
- .setTime(parser.nextInt(), parser.nextInt(), parser.nextInt());
+ .setDate(parser.nextInt(0), month, day)
+ .setTime(parser.nextInt(0), parser.nextInt(0), parser.nextInt(0));
position.setTime(dateBuilder.getDate());
return position;