Merge pull request #3018 from jon-stumpf/jss-parse-nextDateTime

Date and time decoding improvements

1 files changed, 3 insertions, 7 deletions

diff --git a/src/org/traccar/protocol/JpKorjarProtocolDecoder.java b/src/org/traccar/protocol/JpKorjarProtocolDecoder.java
index 60aadd025..9a23a95fe 100644
--- a/src/org/traccar/protocol/JpKorjarProtocolDecoder.java
+++ b/src/org/traccar/protocol/JpKorjarProtocolDecoder.java
@@ -19,7 +19,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.model.CellTower;

@@ -38,8 +37,8 @@ public class JpKorjarProtocolDecoder extends BaseProtocolDecoder {
     private static final Pattern PATTERN = new PatternBuilder()

             .text("KORJAR.PL,")

             .number("(d+),")                     // imei

-            .number("(dd)(dd)(dd)")              // date

-            .number("(dd)(dd)(dd),")             // time

+            .number("(dd)(dd)(dd)")              // date (yymmdd)

+            .number("(dd)(dd)(dd),")             // time (hhmmss)

             .number("(d+.d+)([NS]),")            // latitude

             .number("(d+.d+)([EW]),")            // longitude

             .number("(d+.d+),")                  // speed

@@ -70,10 +69,7 @@ public class JpKorjarProtocolDecoder extends BaseProtocolDecoder {
         }

         position.setDeviceId(deviceSession.getDeviceId());

 

-        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());

 

         position.setLatitude(parser.nextCoordinate(Parser.CoordinateFormat.DEG_HEM));

         position.setLongitude(parser.nextCoordinate(Parser.CoordinateFormat.DEG_HEM));