Changeset 4241 in josm for trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java

Timestamp:

2011-07-14T17:00:22+02:00 (13 years ago)

Author:

bastiK

Message:

applied #5605 - Geotagged image viewer should rotate images according to EXIF orientation tag (patch by m.zdila, some modifications)

File:

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

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

@@ -63 +63 @@
 import com.drew.metadata.Directory;
 import com.drew.metadata.Metadata;
+import com.drew.metadata.MetadataException;
+import com.drew.metadata.exif.ExifDirectory;
 import com.drew.metadata.exif.GpsDirectory;
 
@@ -509 +511 @@
         double lon, lat;
         Metadata metadata = null;
-        Directory dir = null;
+        Directory dirExif = null, dirGps = null;
 
         try {
             metadata = JpegMetadataReader.readMetadata(e.getFile());
-            dir = metadata.getDirectory(GpsDirectory.class);
+            dirExif = metadata.getDirectory(ExifDirectory.class);
+            dirGps = metadata.getDirectory(GpsDirectory.class);
         } catch (CompoundException p) {
             e.setExifCoor(null);
@@ -521 +524 @@
 
         try {
+            int orientation = dirExif.getInt(ExifDirectory.TAG_ORIENTATION);
+            e.setExifOrientation(orientation);
+        } catch (MetadataException ex) {
+        }
+        
+        try {
             // longitude
 
-            Rational[] components = dir.getRationalArray(GpsDirectory.TAG_GPS_LONGITUDE);
+            Rational[] components = dirGps.getRationalArray(GpsDirectory.TAG_GPS_LONGITUDE);
 
             deg = components[0].doubleValue();
@@ -534 +543 @@
             lon = (Double.isNaN(deg) ? 0 : deg + (Double.isNaN(min) ? 0 : (min / 60)) + (Double.isNaN(sec) ? 0 : (sec / 3600)));
 
-            if (dir.getString(GpsDirectory.TAG_GPS_LONGITUDE_REF).charAt(0) == 'W') {
+            if (dirGps.getString(GpsDirectory.TAG_GPS_LONGITUDE_REF).charAt(0) == 'W') {
                 lon = -lon;
             }
@@ -540 +549 @@
             // latitude
 
-            components = dir.getRationalArray(GpsDirectory.TAG_GPS_LATITUDE);
+            components = dirGps.getRationalArray(GpsDirectory.TAG_GPS_LATITUDE);
 
             deg = components[0].doubleValue();
@@ -554 +563 @@
                 throw new IllegalArgumentException();
 
-            if (dir.getString(GpsDirectory.TAG_GPS_LATITUDE_REF).charAt(0) == 'S') {
+            if (dirGps.getString(GpsDirectory.TAG_GPS_LATITUDE_REF).charAt(0) == 'S') {
                 lat = -lat;
             }
@@ -566 +575 @@
             // Try to read lon/lat as double value (Nonstandard, created by some cameras -> #5220)
             try {
-                Double longitude = dir.getDouble(GpsDirectory.TAG_GPS_LONGITUDE);
-                Double latitude = dir.getDouble(GpsDirectory.TAG_GPS_LATITUDE);
+                Double longitude = dirGps.getDouble(GpsDirectory.TAG_GPS_LONGITUDE);
+                Double latitude = dirGps.getDouble(GpsDirectory.TAG_GPS_LATITUDE);
                 if (longitude == null || latitude == null)
                     throw new CompoundException("");
@@ -590 +599 @@
 
         try {
-            direction = dir.getRational(GpsDirectory.TAG_GPS_IMG_DIRECTION);
+            direction = dirGps.getRational(GpsDirectory.TAG_GPS_IMG_DIRECTION);
             if (direction != null) {
                 e.setExifImgDir(direction.doubleValue());