Changeset 11745 in josm for trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageEntry.java

Timestamp:

2017-03-19T01:16:39+01:00 (7 years ago)

Author:

Don-vip

Message:

fix #14536 - Improved ExifReader.readTime(), Refactored ImageEntry.extractExif() (patch by holgermappt)

File:

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

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

@@ -9 +9 @@
 
 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;
@@ -432 +431 @@
 
         Metadata metadata;
-        Directory dirExif;
-        GpsDirectory dirGps;
 
         if (file == null) {
+            return;
+        }
+
+        try {
+            metadata = JpegMetadataReader.readMetadata(file);
+        } catch (CompoundException | IOException ex) {
+            Main.error(ex);
+            setExifTime(null);
+            setExifCoor(null);
+            setPos(null);
             return;
         }
@@ -442 +449 @@
         // of person having time that couldn't be parsed, but valid GPS info
         try {
-            setExifTime(ExifReader.readTime(file));
+            setExifTime(ExifReader.readTime(metadata));
         } catch (RuntimeException ex) {
             Main.warn(ex);
@@ -448 +455 @@
         }
 
-        try {
-            metadata = JpegMetadataReader.readMetadata(file);
-            dirExif = metadata.getFirstDirectoryOfType(ExifIFD0Directory.class);
-            dirGps = metadata.getFirstDirectoryOfType(GpsDirectory.class);
-        } catch (CompoundException | IOException ex) {
-            Main.warn(ex);
-            setExifCoor(null);
-            setPos(null);
-            return;
-        }
+        final Directory dirExif = metadata.getFirstDirectoryOfType(ExifIFD0Directory.class);
+        final GpsDirectory dirGps = metadata.getFirstDirectoryOfType(GpsDirectory.class);
 
         try {
@@ -474 +473 @@
         }
 
+        final Double speed = ExifReader.readSpeed(dirGps);
+        if (speed != null) {
+            setSpeed(speed);
+        }
+
+        final Double ele = ExifReader.readElevation(dirGps);
+        if (ele != null) {
+            setElevation(ele);
+        }
+
         try {
-            double speed = dirGps.getDouble(GpsDirectory.TAG_SPEED);
-            String speedRef = dirGps.getString(GpsDirectory.TAG_SPEED_REF);
-            if ("M".equalsIgnoreCase(speedRef)) {
-                // miles per hour
-                speed *= SystemOfMeasurement.IMPERIAL.bValue / 1000;
-            } else if ("N".equalsIgnoreCase(speedRef)) {
-                // knots == nautical miles per hour
-                speed *= SystemOfMeasurement.NAUTICAL_MILE.bValue / 1000;
-            }
-            // default is K (km/h)
-            setSpeed(speed);
-        } catch (MetadataException ex) {
-            Main.debug(ex);
-        }
-
-        try {
-            double ele = dirGps.getDouble(GpsDirectory.TAG_ALTITUDE);
-            int d = dirGps.getInt(GpsDirectory.TAG_ALTITUDE_REF);
-            if (d == 1) {
-                ele *= -1;
-            }
-            setElevation(ele);
-        } catch (MetadataException ex) {
-            Main.debug(ex);
-        }
-
-        try {
-            LatLon latlon = ExifReader.readLatLon(dirGps);
+            final LatLon latlon = ExifReader.readLatLon(dirGps);
             setExifCoor(latlon);
             setPos(getExifCoor());
-
         } catch (MetadataException | IndexOutOfBoundsException ex) { // (other exceptions, e.g. #5271)
             Main.error("Error reading EXIF from file: " + ex);
@@ -513 +494 @@
 
         try {
-            Double direction = ExifReader.readDirection(dirGps);
+            final Double direction = ExifReader.readDirection(dirGps);
             if (direction != null) {
                 setExifImgDir(direction);