Changeset 9329 in josm

Timestamp:

2016-01-06T17:30:31+01:00 (8 years ago)

Author:

Don-vip

Message:

fix #12255 - fix EXIF time parsing regression

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/layer/geoimage/ImageEntry.java (modified) (8 diffs)
• test/data/regress/12255 (added)
• test/data/regress/12255/G0016941.JPG (added)
• test/unit/org/openstreetmap/josm/gui/layer (added)
• test/unit/org/openstreetmap/josm/gui/layer/geoimage (added)
• test/unit/org/openstreetmap/josm/gui/layer/geoimage/ImageEntryTest.java (added)

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

@@ -12 +12 @@
 import java.util.TimeZone;
 
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.SystemOfMeasurement;
+import org.openstreetmap.josm.data.coor.CachedLatLon;
+import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.tools.ExifReader;
+
 import com.drew.imaging.jpeg.JpegMetadataReader;
 import com.drew.lang.CompoundException;
@@ -19 +25 @@
 import com.drew.metadata.exif.ExifIFD0Directory;
 import com.drew.metadata.exif.GpsDirectory;
-import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.SystemOfMeasurement;
-import org.openstreetmap.josm.data.coor.CachedLatLon;
-import org.openstreetmap.josm.data.coor.LatLon;
-import org.openstreetmap.josm.tools.ExifReader;
 
 /**
@@ -432 +433 @@
      *
      * If successful, fills in the LatLon, speed, elevation, image direction, and other attributes
+     * @since 9270
      */
     public void extractExif() {
@@ -448 +450 @@
             dirGps = metadata.getFirstDirectoryOfType(GpsDirectory.class);
         } catch (CompoundException | IOException p) {
+            Main.warn(p);
             setExifCoor(null);
             setPos(null);
@@ -459 +462 @@
             }
         } catch (MetadataException ex) {
-            Main.debug(ex.getMessage());
+            if (Main.isDebugEnabled()) {
+                Main.debug(ex.getMessage());
+            }
+        }
+
+        // Changed to silently cope with no time info in exif. One case
+        // of person having time that couldn't be parsed, but valid GPS info
+        try {
+            setExifTime(ExifReader.readTime(file));
+        } catch (ParseException ex) {
+            setExifTime(null);
         }
 
@@ -481 +494 @@
             setSpeed(speed);
         } catch (Exception ex) {
-            Main.debug(ex.getMessage());
+            if (Main.isDebugEnabled()) {
+                Main.debug(ex.getMessage());
+            }
         }
 
@@ -492 +507 @@
             setElevation(ele);
         } catch (MetadataException ex) {
-            Main.debug(ex.getMessage());
+            if (Main.isDebugEnabled()) {
+                Main.debug(ex.getMessage());
+            }
         }
 
@@ -512 +529 @@
             }
         } catch (Exception ex) { // (CompoundException and other exceptions, e.g. #5271)
-            Main.debug(ex.getMessage());
-        }
-
-        // Changed to silently cope with no time info in exif. One case
-        // of person having time that couldn't be parsed, but valid GPS info
-        try {
-            setExifTime(ExifReader.readTime(file));
-        } catch (ParseException ex) {
-            setExifTime(null);
+            if (Main.isDebugEnabled()) {
+                Main.debug(ex.getMessage());
+            }
         }