Index: trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java	(revision 8131)
+++ trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java	(revision 8132)
@@ -627,6 +627,6 @@
 
         try {
-            double speed = dirGps.getDouble(GpsDirectory.TAG_GPS_SPEED);
-            String speedRef = dirGps.getString(GpsDirectory.TAG_GPS_SPEED_REF);
+            double speed = dirGps.getDouble(GpsDirectory.TAG_SPEED);
+            String speedRef = dirGps.getString(GpsDirectory.TAG_SPEED_REF);
             if (speedRef != null) {
                 if (speedRef.equalsIgnoreCase("M")) {
@@ -645,6 +645,6 @@
 
         try {
-            double ele = dirGps.getDouble(GpsDirectory.TAG_GPS_ALTITUDE);
-            int d = dirGps.getInt(GpsDirectory.TAG_GPS_ALTITUDE_REF);
+            double ele = dirGps.getDouble(GpsDirectory.TAG_ALTITUDE);
+            int d = dirGps.getInt(GpsDirectory.TAG_ALTITUDE_REF);
             if (d == 1) {
                 ele *= -1;
@@ -679,5 +679,5 @@
         // 2) GPS_DATE_STAMP not set -> use EXIF date or set to default
         // 3) GPS_TIME_STAMP and GPS_DATE_STAMP are set
-        int[] timeStampComps = dirGps.getIntArray(GpsDirectory.TAG_GPS_TIME_STAMP);
+        int[] timeStampComps = dirGps.getIntArray(GpsDirectory.TAG_TIME_STAMP);
         if (timeStampComps != null) {
             int gpsHour = timeStampComps[0];
@@ -688,5 +688,5 @@
             // We have the time. Next step is to check if the GPS date stamp is set.
             // dirGps.getString() always succeeds, but the return value might be null.
-            String dateStampStr = dirGps.getString(GpsDirectory.TAG_GPS_DATE_STAMP);
+            String dateStampStr = dirGps.getString(GpsDirectory.TAG_DATE_STAMP);
             if (dateStampStr != null && dateStampStr.matches("^\\d+:\\d+:\\d+$")) {
                 String[] dateStampComps = dateStampStr.split(":");
Index: trunk/src/org/openstreetmap/josm/tools/ExifReader.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/ExifReader.java	(revision 8131)
+++ trunk/src/org/openstreetmap/josm/tools/ExifReader.java	(revision 8132)
@@ -2,4 +2,5 @@
 package org.openstreetmap.josm.tools;
 
+import java.awt.geom.AffineTransform;
 import java.io.File;
 import java.io.IOException;
@@ -21,5 +22,4 @@
 import com.drew.metadata.exif.ExifSubIFDDirectory;
 import com.drew.metadata.exif.GpsDirectory;
-import java.awt.geom.AffineTransform;
 
 /**
@@ -125,6 +125,6 @@
     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,5 +159,5 @@
     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();