Changeset 5242 in josm

Timestamp:

May 24, 2012 8:27:56 PM (12 months ago)

Author:

bastiK

Message:

fixed #7711 - Extract altitude from photos and GPX track

Location:

trunk/src/org/openstreetmap/josm/gui/layer/geoimage

Files:

• CorrelateGpxWithImages.java (modified) (1 diff)
• GeoImageLayer.java (modified) (2 diffs)

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

@@ -1250 +1250 @@
                 curImg.tmp.setSpeed(speed);
                 if (curElevation != null && prevElevation != null) {
-                    curImg.setElevation(prevElevation + (curElevation - prevElevation) * timeDiff);
+                    curImg.tmp.setElevation(prevElevation + (curElevation - prevElevation) * timeDiff);
                 }
                 curImg.tmp.setGpsTime(new Date(curImg.getExifTime().getTime() - offset));

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

@@ -537 +537 @@
 
         try {
+            double ele=dirGps.getDouble(GpsDirectory.TAG_GPS_ALTITUDE);
+            int d = dirGps.getInt(GpsDirectory.TAG_GPS_ALTITUDE_REF);
+            if (d == 1) {
+                ele *= -1;
+            }
+            e.setElevation(ele);
+        } catch (MetadataException ex) {
+        }
+
+        try {
             // longitude
 
@@ -596 +606 @@
             }
         } catch (Exception ex) { // (other exceptions, e.g. #5271)
-            System.err.println("Error when reading EXIF from file: "+ex);
+            System.err.println("Error reading EXIF from file: "+ex);
             e.setExifCoor(null);
             e.setPos(null);