Changeset 9672 in josm

Timestamp:

2016-01-29T19:53:36+01:00 (9 years ago)

Author:

Don-vip

Message:

fix #11685 - parse subsecond exif information correctly

Location:

trunk

Files:

• src/org/openstreetmap/josm/tools/ExifReader.java (modified) (3 diffs)
• test/data/regress/11685 (added)
• test/data/regress/11685/2015-11-08_15-33-27-Xiaomi_YI-Y0030832.jpg (added)
• test/unit/org/openstreetmap/josm/tools/ExifReaderTest.java (modified) (5 diffs)

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

@@ -7 +7 @@
 import java.util.Date;
 
-import com.drew.metadata.exif.ExifDirectoryBase;
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.coor.LatLon;
@@ -19 +18 @@
 import com.drew.metadata.MetadataException;
 import com.drew.metadata.Tag;
+import com.drew.metadata.exif.ExifDirectoryBase;
 import com.drew.metadata.exif.ExifIFD0Directory;
 import com.drew.metadata.exif.ExifSubIFDDirectory;
@@ -70 +70 @@
                 if (subSeconds != null) {
                     try {
-                        date.setTime(date.getTime() + Integer.parseInt(subSeconds));
+                        date.setTime(date.getTime() + (long) (1000L * Double.parseDouble("0." + subSeconds)));
                     } catch (NumberFormatException e) {
                         Main.warn("Failed parsing sub seconds from [{0}]", subSeconds);

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

@@ -6 +6 @@
 
 import java.io.File;
+import java.io.IOException;
 import java.text.DecimalFormat;
 import java.text.ParseException;
@@ -16 +17 @@
 import org.junit.Before;
 import org.junit.Test;
+import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.tools.date.DateUtilsTest;
@@ -49 +51 @@
     /**
      * Tests reading sub-seconds from the EXIF header
-     * @throws ParseException  if {@link ExifReader#readTime} fails to parse date/time of sample file
+     * @throws ParseException if {@link ExifReader#readTime} fails to parse date/time of sample file
      */
     @Test
@@ -80 +82 @@
 
     /**
-     * Test coordinates extraction
+     * Test direction extraction
      */
     @Test
@@ -87 +89 @@
         assertEquals(new Double(46.5), direction);
     }
+
+    /**
+     * Non-regression test for ticket <a href="https://josm.openstreetmap.de/ticket/11685">#11685</a>
+     * @throws IOException if an error occurs during reading
+     */
+    @Test
+    public void testTicket11685() throws IOException {
+        File file = new File(TestUtils.getRegressionDataFile(11685, "2015-11-08_15-33-27-Xiaomi_YI-Y0030832.jpg"));
+        String dateStr = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS").format(ExifReader.readTime(file));
+        assertEquals("2015-11-08T15:33:27.500", dateStr);
+    }
 }