Changeset 3365 in josm for trunk/src

Timestamp:

2010-07-07T19:18:19+02:00 (14 years ago)

Author:

bastiK

Message:

see #5220 - Timestamp and GPS tags fail to load from HTC Tattoo images

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/layer/geoimage/GeoImageLayer.java (modified) (3 diffs)
• io/OsmApi.java (modified) (1 diff)
• io/OsmChangeBuilder.java (modified) (1 diff)
• tools/ImageProvider.java (modified) (2 diffs)

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

@@ -517 +517 @@
     private static void extractExif(ImageEntry e) {
 
+        int deg;
+        double min, sec;
+        double lon, lat;
+        Metadata metadata = null;
+        Directory dir = null;
+        
         try {
-            int deg;
-            double min, sec;
-            double lon, lat;
-
-            Metadata metadata = JpegMetadataReader.readMetadata(e.getFile());
-            Directory dir = metadata.getDirectory(GpsDirectory.class);
-
+            metadata = JpegMetadataReader.readMetadata(e.getFile());
+            dir = metadata.getDirectory(GpsDirectory.class);
+        } catch (CompoundException p) {
+            e.setExifCoor(null);
+            e.setPos(null);
+            return;
+        }
+        
+        try {
             // longitude
 
@@ -553 +561 @@
             }
 
-
-            // compass direction value
-
-            Rational direction = null;
-            
-            try {
-                direction = dir.getRational(GpsDirectory.TAG_GPS_IMG_DIRECTION);
-            } catch (CompoundException p) {
-                direction = null;
-            }
-
             // Store values
 
             e.setExifCoor(new LatLon(lat, lon));
             e.setPos(e.getExifCoor());
-            if (direction != null) {
-                e.setExifImgDir(direction.doubleValue());
-            }
 
         } catch (CompoundException p) {
-            e.setExifCoor(null);
-            e.setPos(null);
-        }
+            // 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);
+                if (longitude == null || latitude == null)
+                    throw new CompoundException("");
+
+                // Store values
+
+                e.setExifCoor(new LatLon(latitude, longitude));
+                e.setPos(e.getExifCoor());
+            } catch (CompoundException ex) {
+                e.setExifCoor(null);
+                e.setPos(null);
+            }
+        }
+
+        // compass direction value
+
+        Rational direction = null;
+        
+        try {
+            direction = dir.getRational(GpsDirectory.TAG_GPS_IMG_DIRECTION);
+        } catch (CompoundException p) {
+            direction = null;
+        }
+        if (direction != null) {
+            e.setExifImgDir(direction.doubleValue());
+        }
+
     }
 
@@ -605 +626 @@
 
     public void checkPreviousNextButtons() {
-        //        System.err.println("showing image " + currentPhoto);
         ImageViewerDialog.setNextEnabled(currentPhoto < data.size() - 1);
         ImageViewerDialog.setPreviousEnabled(currentPhoto > 0);

trunk/src/org/openstreetmap/josm/io/OsmApi.java

@@ -204 +204 @@
         osmWriter.footer();
         osmWriter.out.flush();
-        return swriter.toString();
+        String s = swriter.toString();
+        System.err.println("OsmApi/toXml:\n"+s+"_|");
+        return s;
     }
 

trunk/src/org/openstreetmap/josm/io/OsmChangeBuilder.java

@@ -130 +130 @@
 
     public String getDocument() {
-        return swriter.toString();
+        String s = swriter.toString();
+        System.err.println("OsmChangeBuilder/getDocument:\n"+s+"_|");
+        return s;
     }
 }

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

@@ -88 +88 @@
     /**
      * Like {@link #get(String)}, but does not throw and return <code>null</code> in case of nothing
-     * is found. Use this, if the image to retrieve is optional.
+     * is found. Use this, if the image to retrieve is optional. Nevertheless a warning will
+     * be printed on the console if the image could not be found.
      */
     public static ImageIcon getIfAvailable(Collection<String> dirs, String id, String subdir, String name) {
@@ -94 +95 @@
     }
 
+    /**
+     * The full path of the image is either a url (starting with http://)
+     * or something like
+     *   dirs.get(i)+"/"+subdir+"/"+name+".png".
+     * @param dirs      Directories to look.
+     * @param id        An id used for caching. Id is not used for cache if name starts with http://. (URL is unique anyway.)
+     * @param subdir    Subdirectory the image lies in.
+     * @param name      The name of the image. If it contains no '.', a png extension is added.
+     * @param archive   A zip file where the image is located.
+     */
     public static ImageIcon getIfAvailable(Collection<String> dirs, String id, String subdir, String name, File archive) {
         if (name == null)