Changeset 8132 in josm for trunk/src/org/openstreetmap/josm/tools/ExifReader.java

Timestamp:

2015-03-10T01:17:39+01:00 (9 years ago)

Author:

Don-vip

Message:

fix #11162 - update to metadata-extractor 2.7.2

File:

• trunk/src/org/openstreetmap/josm/tools/ExifReader.java (modified) (4 diffs)

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

@@ -2 +2 @@
 package org.openstreetmap.josm.tools;
 
+import java.awt.geom.AffineTransform;
 import java.io.File;
 import java.io.IOException;
@@ -21 +22 @@
 import com.drew.metadata.exif.ExifSubIFDDirectory;
 import com.drew.metadata.exif.GpsDirectory;
-import java.awt.geom.AffineTransform;
 
 /**
@@ -125 +125 @@
     public static LatLon readLatLon(GpsDirectory dirGps) throws MetadataException {
         if (dirGps != null) {
-            double lat = readAxis(dirGps, GpsDirectory.TAG_GPS_LATITUDE, GpsDirectory.TAG_GPS_LATITUDE_REF, 'S');
-            double lon = readAxis(dirGps, GpsDirectory.TAG_GPS_LONGITUDE, GpsDirectory.TAG_GPS_LONGITUDE_REF, 'W');
+            double lat = readAxis(dirGps, GpsDirectory.TAG_LATITUDE, GpsDirectory.TAG_LATITUDE_REF, 'S');
+            double lon = readAxis(dirGps, GpsDirectory.TAG_LONGITUDE, GpsDirectory.TAG_LONGITUDE_REF, 'W');
             return new LatLon(lat, lon);
         }
@@ -159 +159 @@
     public static Double readDirection(GpsDirectory dirGps) {
         if (dirGps != null) {
-            Rational direction = dirGps.getRational(GpsDirectory.TAG_GPS_IMG_DIRECTION);
+            Rational direction = dirGps.getRational(GpsDirectory.TAG_IMG_DIRECTION);
             if (direction != null) {
                 return direction.doubleValue();