aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/protocol/RaveonProtocolDecoder.java
diff options
context:
space:
mode:
authorjon-stumpf <jon.stumpf@gmail.com>2017-03-12 11:50:59 -0400
committerjon-stumpf <jon.stumpf@gmail.com>2017-03-12 11:58:08 -0400
commit2ba06b327a08432ebfc9e8a41a36bf124e087af6 (patch)
treef92d6aab1192a6f53eb2f43d50463159a164baa9 /src/org/traccar/protocol/RaveonProtocolDecoder.java
parent9c6706bc8ae37776689c61e237978b364fb392e8 (diff)
downloadtrackermap-server-2ba06b327a08432ebfc9e8a41a36bf124e087af6.tar.gz
trackermap-server-2ba06b327a08432ebfc9e8a41a36bf124e087af6.tar.bz2
trackermap-server-2ba06b327a08432ebfc9e8a41a36bf124e087af6.zip
Implemented Parser.nextDateTime();
Diffstat (limited to 'src/org/traccar/protocol/RaveonProtocolDecoder.java')
-rw-r--r--src/org/traccar/protocol/RaveonProtocolDecoder.java8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/org/traccar/protocol/RaveonProtocolDecoder.java b/src/org/traccar/protocol/RaveonProtocolDecoder.java
index 1fd3d4cd7..1fd5e6636 100644
--- a/src/org/traccar/protocol/RaveonProtocolDecoder.java
+++ b/src/org/traccar/protocol/RaveonProtocolDecoder.java
@@ -18,14 +18,12 @@ package org.traccar.protocol;
import org.jboss.netty.channel.Channel;
import org.traccar.BaseProtocolDecoder;
import org.traccar.DeviceSession;
-import org.traccar.helper.DateBuilder;
import org.traccar.helper.Parser;
import org.traccar.helper.PatternBuilder;
import org.traccar.helper.UnitsConverter;
import org.traccar.model.Position;
import java.net.SocketAddress;
-import java.util.Date;
import java.util.regex.Pattern;
public class RaveonProtocolDecoder extends BaseProtocolDecoder {
@@ -40,7 +38,7 @@ public class RaveonProtocolDecoder extends BaseProtocolDecoder {
.number("d+,")
.number("(-?)(d+)(dd.d+),") // latitude
.number("(-?)(d+)(dd.d+),") // longitude
- .number("(dd)(dd)(dd),") // time
+ .number("(dd)(dd)(dd),") // time (hhmmss)
.number("(d),") // validity
.number("(d+),") // satellites
.number("(-?d+),") // altitude
@@ -77,9 +75,7 @@ public class RaveonProtocolDecoder extends BaseProtocolDecoder {
position.setLatitude(parser.nextCoordinate(Parser.CoordinateFormat.HEM_DEG_MIN));
position.setLongitude(parser.nextCoordinate(Parser.CoordinateFormat.HEM_DEG_MIN));
- DateBuilder dateBuilder = new DateBuilder(new Date())
- .setTime(parser.nextInt(), parser.nextInt(), parser.nextInt());
- position.setTime(dateBuilder.getDate());
+ position.setTime(parser.nextDateTime(Parser.DateTimeFormat.HMS));
position.setValid(parser.nextInt() != 0);