Fix date and time formatting issues

2 files changed, 12 insertions, 7 deletions

diff --git a/src/org/traccar/database/DataManager.java b/src/org/traccar/database/DataManager.java
index 3cfeadae4..0b8cff03a 100644
--- a/src/org/traccar/database/DataManager.java
+++ b/src/org/traccar/database/DataManager.java
@@ -210,17 +210,17 @@ public class DataManager implements IdentityManager {
                 Position position = new Position();
                 position.setDeviceId(device.getId());
 
-                position.setTime(JsonConverter.parseDate("2015-05-22T12:00:01"));
+                position.setTime(JsonConverter.parseDate("2015-05-22T12:00:01.000Z"));
                 position.setLatitude(-36.8785803);
                 position.setLongitude(174.7281713);
                 addPosition(position);
 
-                position.setTime(JsonConverter.parseDate("2015-05-22T12:00:02"));
+                position.setTime(JsonConverter.parseDate("2015-05-22T12:00:02.000Z"));
                 position.setLatitude(-36.8870932);
                 position.setLongitude(174.7473116);
                 addPosition(position);
 
-                position.setTime(JsonConverter.parseDate("2015-05-22T12:00:03"));
+                position.setTime(JsonConverter.parseDate("2015-05-22T12:00:03.000Z"));
                 position.setLatitude(-36.8932371);
                 position.setLongitude(174.7743053);
                 addPosition(position);
diff --git a/src/org/traccar/web/JsonConverter.java b/src/org/traccar/web/JsonConverter.java
index cdcd492b8..a78821d1f 100644
--- a/src/org/traccar/web/JsonConverter.java
+++ b/src/org/traccar/web/JsonConverter.java
@@ -32,15 +32,20 @@ import javax.json.JsonObject;
 import javax.json.JsonObjectBuilder;
 import javax.json.JsonReader;
 import javax.json.JsonValue;
+
+import org.apache.log4j.helpers.ISO8601DateFormat;
+import org.joda.time.DateTime;
+import org.joda.time.format.DateTimeFormatter;
+import org.joda.time.format.ISODateTimeFormat;
 import org.traccar.model.Factory;
 import org.traccar.model.MiscFormatter;
 
 public class JsonConverter {
 
-    private static final DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ");
+    private static final DateTimeFormatter dateFormat = ISODateTimeFormat.dateTime();
 
     public static Date parseDate(String value) throws ParseException {
-        return dateFormat.parse(value);
+        return dateFormat.parseDateTime(value).toDate();
     }
 
     public static <T extends Factory> T objectFromJson(Reader reader, T prototype) throws ParseException {
@@ -74,7 +79,7 @@ public class JsonConverter {
                     } else if (parameterType.equals(String.class)) {
                         method.invoke(object, json.getString(name));
                     } else if (parameterType.equals(Date.class)) {
-                        method.invoke(object, dateFormat.parse(json.getString(name)));
+                        method.invoke(object, dateFormat.parseDateTime(json.getString(name)).toDate());
                     } else if (parameterType.equals(Map.class)) {
                         method.invoke(object, MiscFormatter.fromJson(json.getJsonObject(name)));
                     }
@@ -115,7 +120,7 @@ public class JsonConverter {
                     } else if (method.getReturnType().equals(Date.class)) {
                         Date value = (Date) method.invoke(object);
                         if (value != null) {
-                            json.add(name, dateFormat.format(value));
+                            json.add(name, dateFormat.print(new DateTime(value)));
                         }
                     } else if (method.getReturnType().equals(Map.class)) {
                         json.add(name, MiscFormatter.toJson((Map) method.invoke(object)));