From 9c9370f72c51d7466d3b25a59264ee98f4319b3a Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Thu, 8 Nov 2018 13:37:38 +1300 Subject: Fix time formatting issues --- src/org/traccar/web/CsvBuilder.java | 3 ++- src/org/traccar/web/GpxBuilder.java | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'src/org/traccar/web') diff --git a/src/org/traccar/web/CsvBuilder.java b/src/org/traccar/web/CsvBuilder.java index cd4efea9f..3fe7e408f 100644 --- a/src/org/traccar/web/CsvBuilder.java +++ b/src/org/traccar/web/CsvBuilder.java @@ -31,6 +31,7 @@ import com.fasterxml.jackson.core.JsonProcessingException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.traccar.Context; +import org.traccar.helper.DateUtil; public class CsvBuilder { @@ -90,7 +91,7 @@ public class CsvBuilder { addSeparator(); } else if (method.getReturnType().equals(Date.class)) { Date value = (Date) method.invoke(object); - builder.append(Context.DATE_FORMATTER.format(value.toInstant())); + builder.append(DateUtil.formatDate(value)); addSeparator(); } else if (method.getReturnType().equals(Map.class)) { Map value = (Map) method.invoke(object); diff --git a/src/org/traccar/web/GpxBuilder.java b/src/org/traccar/web/GpxBuilder.java index 41f406eb7..638d100e5 100644 --- a/src/org/traccar/web/GpxBuilder.java +++ b/src/org/traccar/web/GpxBuilder.java @@ -18,7 +18,7 @@ package org.traccar.web; import java.util.Collection; -import org.traccar.Context; +import org.traccar.helper.DateUtil; import org.traccar.helper.UnitsConverter; import org.traccar.model.Position; @@ -51,7 +51,7 @@ public class GpxBuilder { public void addPosition(Position position) { builder.append(String.format(POINT, position.getLatitude(), position.getLongitude(), - Context.DATE_FORMATTER.format(position.getFixTime().toInstant()), position.getAltitude(), + DateUtil.formatDate(position.getFixTime()), position.getAltitude(), position.getCourse(), UnitsConverter.mpsFromKnots(position.getSpeed()))); } -- cgit v1.2.3