Refactor TAIP protocol decoder

2 files changed, 18 insertions, 2 deletions

diff --git a/src/org/traccar/helper/DateBuilder.java b/src/org/traccar/helper/DateBuilder.java
index 77c6821aa..0ad7a4d7b 100644
--- a/src/org/traccar/helper/DateBuilder.java
+++ b/src/org/traccar/helper/DateBuilder.java
@@ -25,13 +25,20 @@ public class DateBuilder {
 
     public DateBuilder() {
         this(TimeZone.getTimeZone("UTC"));
+    }
 
+    public DateBuilder(Date time) {
+        this(time, TimeZone.getTimeZone("UTC"));
     }
 
     public DateBuilder(TimeZone timeZone) {
+        this(new Date(0), timeZone);
+    }
+
+    public DateBuilder(Date time, TimeZone timeZone) {
         calendar = Calendar.getInstance(timeZone);
         calendar.clear();
-        calendar.setTimeInMillis(0);
+        calendar.setTimeInMillis(time.getTime());
     }
 
     public DateBuilder setYear(int year) {
@@ -90,6 +97,11 @@ public class DateBuilder {
         return this;
     }
 
+    public DateBuilder addMillis(long millis) {
+        calendar.setTimeInMillis(calendar.getTimeInMillis() + millis);
+        return this;
+    }
+
     public DateBuilder setTime(int hour, int minute, int second) {
         return setHour(hour).setMinute(minute).setSecond(second);
     }
diff --git a/src/org/traccar/helper/Parser.java b/src/org/traccar/helper/Parser.java
index 8d6dd1a64..c5f5d2e37 100644
--- a/src/org/traccar/helper/Parser.java
+++ b/src/org/traccar/helper/Parser.java
@@ -87,6 +87,7 @@ public class Parser {
     }
 
     public enum CoordinateFormat {
+        DEG_DEG,
         DEG_HEM,
         DEG_MIN_HEM,
         DEG_MIN_MIN_HEM,
@@ -98,9 +99,12 @@ public class Parser {
 
     public double nextCoordinate(CoordinateFormat format) {
         double coordinate;
-        String hemisphere;
+        String hemisphere = null;
 
         switch (format) {
+            case DEG_DEG:
+                coordinate = Double.parseDouble(next() + '.' + next());
+                break;
             case DEG_HEM:
                 coordinate = nextDouble();
                 hemisphere = next();