Changeset 15250 in josm

Timestamp:

2019-07-14T17:04:28+02:00 (6 years ago)

Author:

Don-vip

Message:

see #17829 - use UTC timezone instead of local one

Location:

trunk

Files:

• src/org/openstreetmap/josm/io/rtklib/RtkLibPosReader.java (modified) (2 diffs)
• src/org/openstreetmap/josm/tools/date/DateUtils.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/io/rtklib/RtkLibPosReaderTest.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/io/rtklib/RtkLibPosReader.java

@@ -22 +22 @@
 import org.openstreetmap.josm.io.IGpxReader;
 import org.openstreetmap.josm.tools.Logging;
+import org.openstreetmap.josm.tools.date.DateUtils;
 import org.xml.sax.SAXException;
 
@@ -61 +62 @@
     public RtkLibPosReader(InputStream source) throws IOException {
         this.source = Objects.requireNonNull(source);
+        dateTimeFmt.setTimeZone(DateUtils.UTC);
     }
 

trunk/src/org/openstreetmap/josm/tools/date/DateUtils.java

@@ -36 +36 @@
      * The UTC time zone.
      */
-    public static final TimeZone UTC = TimeZone.getTimeZone("UTC");
+    public static final TimeZone UTC = TimeZone.getTimeZone(ZoneOffset.UTC);
 
     /**

trunk/test/unit/org/openstreetmap/josm/io/rtklib/RtkLibPosReaderTest.java

@@ -55 +55 @@
 
         List<WayPoint> wayPoints = new ArrayList<>(in.getGpxData().tracks.iterator().next().getSegments().iterator().next().getWayPoints());
-        assertEquals(DateUtils.fromString("2019-06-08T06:23:12.000Z"), wayPoints.get(0).get(GpxConstants.PT_TIME));
-        assertEquals(DateUtils.fromString("2019-06-08T06:23:12.300Z"), wayPoints.get(1).get(GpxConstants.PT_TIME));
-        assertEquals(DateUtils.fromString("2019-06-08T06:23:12.600Z"), wayPoints.get(2).get(GpxConstants.PT_TIME));
+        assertEquals(DateUtils.fromString("2019-06-08T08:23:12.000Z"), wayPoints.get(0).get(GpxConstants.PT_TIME));
+        assertEquals(DateUtils.fromString("2019-06-08T08:23:12.300Z"), wayPoints.get(1).get(GpxConstants.PT_TIME));
+        assertEquals(DateUtils.fromString("2019-06-08T08:23:12.600Z"), wayPoints.get(2).get(GpxConstants.PT_TIME));
         assertEquals(wayPoints.get(0).getDate(), wayPoints.get(0).get(GpxConstants.PT_TIME));
 
-        assertEquals("2019-06-08T06:23:12.000Z", iso8601.format(wayPoints.get(0).getDate()));
-        assertEquals("2019-06-08T06:23:12.300Z", iso8601.format(wayPoints.get(1).getDate()));
-        assertEquals("2019-06-08T06:23:12.600Z", iso8601.format(wayPoints.get(2).getDate()));
+        assertEquals("2019-06-08T08:23:12.000Z", iso8601.format(wayPoints.get(0).getDate()));
+        assertEquals("2019-06-08T08:23:12.300Z", iso8601.format(wayPoints.get(1).getDate()));
+        assertEquals("2019-06-08T08:23:12.600Z", iso8601.format(wayPoints.get(2).getDate()));
 
         assertEquals(new LatLon(46.948881673, -1.484757046), wayPoints.get(0).getCoor());