aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/protocol/GotopProtocolDecoder.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/GotopProtocolDecoder.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/GotopProtocolDecoder.java')
-rw-r--r--src/org/traccar/protocol/GotopProtocolDecoder.java8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/org/traccar/protocol/GotopProtocolDecoder.java b/src/org/traccar/protocol/GotopProtocolDecoder.java
index 0c613eb2d..4a2f15ddc 100644
--- a/src/org/traccar/protocol/GotopProtocolDecoder.java
+++ b/src/org/traccar/protocol/GotopProtocolDecoder.java
@@ -18,7 +18,6 @@ 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;
@@ -38,7 +37,7 @@ public class GotopProtocolDecoder extends BaseProtocolDecoder {
.expression("[^,]+,") // type
.expression("([AV]),") // validity
.number("DATE:(dd)(dd)(dd),") // date (yyddmm)
- .number("TIME:(dd)(dd)(dd),") // time
+ .number("TIME:(dd)(dd)(dd),") // time (hhmmss)
.number("LAT:(d+.d+)([NS]),") // latitude
.number("LOT:(d+.d+)([EW]),") // longitude
.text("Speed:").number("(d+.d+),") // speed
@@ -67,10 +66,7 @@ public class GotopProtocolDecoder extends BaseProtocolDecoder {
position.setValid(parser.next().equals("A"));
- DateBuilder dateBuilder = new DateBuilder()
- .setDate(parser.nextInt(), parser.nextInt(), parser.nextInt())
- .setTime(parser.nextInt(), parser.nextInt(), parser.nextInt());
- position.setTime(dateBuilder.getDate());
+ position.setTime(parser.nextDateTime(Parser.DateTimeFormat.Y2MD_HMS));
position.setLatitude(parser.nextCoordinate(Parser.CoordinateFormat.DEG_HEM));
position.setLongitude(parser.nextCoordinate(Parser.CoordinateFormat.DEG_HEM));