Changeset 11484 in josm for trunk

Timestamp:

2017-01-19T23:34:17+01:00 (8 years ago)

Author:

Don-vip

Message:

fix #14209 - prefer TAG_DATETIME_ORIGINAL (patch by holgermappt, regression from r9499) + add non-regression unit test

Location:

trunk

Files:

• src/org/openstreetmap/josm/tools/ExifReader.java (modified) (1 diff)
• test/data/regress/14209 (added)
• test/data/regress/14209/0MbEfj1S--.1.jpg (added)
• test/unit/org/openstreetmap/josm/tools/ExifReaderTest.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/tools/ExifReader.java

@@ -56 +56 @@
                     if (tag.getTagType() == ExifIFD0Directory.TAG_DATETIME /* 0x0132 */ ||
                         tag.getTagType() == ExifSubIFDDirectory.TAG_DATETIME_DIGITIZED /* 0x9004 */) {
-                        if (dateStr != null) {
+                        if (dateStr == null) {
                             // prefer TAG_DATETIME_ORIGINAL
                             dateStr = tag.getDescription();

trunk/test/unit/org/openstreetmap/josm/tools/ExifReaderTest.java

@@ -119 +119 @@
         assertEquals("2015-11-08T15:33:27.500", dateStr);
     }
+
+    /**
+     * Non-regression test for ticket <a href="https://josm.openstreetmap.de/ticket/14209">#14209</a>
+     * @throws IOException if an error occurs during reading
+     */
+    @Test
+    public void testTicket14209() throws IOException {
+        File file = new File(TestUtils.getRegressionDataFile(14209, "0MbEfj1S--.1.jpg"));
+        String dateStr = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS").format(ExifReader.readTime(file));
+        assertEquals("2017-01-16T18:27:00.000", dateStr);
+    }
 }