Changeset 15664 in josm for trunk/src/org/openstreetmap

Timestamp:

2020-01-08T23:35:58+01:00 (5 years ago)

Author:

simon04

Message:

fix #18015 - Fix timezone in ImageViewerDialog

File:

• trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java

@@ -471 +471 @@
                 osd.append(tr("\nDirection {0}\u00b0", Math.round(entry.getExifImgDir())));
             }
+
             DateFormat dtf = DateUtils.getDateTimeFormat(DateFormat.SHORT, DateFormat.MEDIUM);
             // Make sure date/time format includes milliseconds
@@ -479 +480 @@
                 }
             }
+            // Set timezone to UTC since UTC is assumed when parsing the EXIF timestamp,
+            // see see org.openstreetmap.josm.tools.ExifReader.readTime(com.drew.metadata.Metadata)
+            dtf.setTimeZone(DateUtils.UTC);
+
             if (entry.hasExifTime()) {
                 osd.append(tr("\nEXIF time: {0}", dtf.format(entry.getExifTime())));