2 files changed, 73 insertions, 0 deletions
diff --git a/src/org/traccar/helper/DateBuilder.java b/src/org/traccar/helper/DateBuilder.java
index 17936a329..6e3fbc460 100644
--- a/src/org/traccar/helper/DateBuilder.java
+++ b/src/org/traccar/helper/DateBuilder.java
@@ -59,10 +59,12 @@ public class DateBuilder {
         return setDate(year, month, day);
     }
 
+    @Deprecated
     public DateBuilder setDate(String year, String month, String day) {
         return setDate(Integer.parseInt(year), Integer.parseInt(month), Integer.parseInt(day));
     }
 
+    @Deprecated
     public DateBuilder setDateReverse(String day, String month, String year) {
         return setDate(year, month, day);
     }
@@ -91,6 +93,7 @@ public class DateBuilder {
         return setHour(hour).setMinute(minute).setSecond(second);
     }
 
+    @Deprecated
     public DateBuilder setTime(String hour, String minute, String second) {
         return setTime(Integer.parseInt(hour), Integer.parseInt(minute), Integer.parseInt(second));
     }
diff --git a/src/org/traccar/helper/Parser.java b/src/org/traccar/helper/Parser.java
new file mode 100644
index 000000000..9b346d810
--- /dev/null
+++ b/src/org/traccar/helper/Parser.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2015 Anton Tananaev (anton.tananaev@gmail.com)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.traccar.helper;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class Parser {
+
+    private int position = 1;
+    private Matcher matcher;
+
+    public Parser(Pattern pattern, String input) {
+        matcher = pattern.matcher(input);
+    }
+
+    public boolean matches() {
+        return matcher.matches();
+    }
+
+    public boolean hasNext() {
+        if (matcher.group(position) != null) {
+            return true;
+        } else {
+            position++;
+            return false;
+        }
+    }
+
+    public String next() {
+        return matcher.group(position++);
+    }
+
+    public int nextInt() {
+        return Integer.parseInt(next());
+    }
+
+    public int nextInt(int radix) {
+        return Integer.parseInt(next(), radix);
+    }
+
+    public double nextDouble() {
+        return Double.parseDouble(next());
+    }
+
+    // Format: (degrees)(minutes)(hemisphere)
+    public double nextCoordinate() {
+        double coordinate = nextDouble();
+        coordinate += nextDouble() / 60;
+        String hemisphere = next();
+        if (hemisphere.equals("S") || hemisphere.equals("W")) {
+            coordinate = -coordinate;
+        }
+        return coordinate;
+    }
+
+}