Changeset 3261 in josm for trunk

Timestamp:

2010-05-17T18:13:34+02:00 (14 years ago)

Author:

bastiK

Message:

applied patch by flo: Add support for direction tag in photo EXIF header (got permission to put his test photo in the repository)

Location:

trunk

Files:

• data_nodist/README (added)
• data_nodist/exif-direction-example.jpg (added)
• src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java (modified) (2 diffs)
• src/org/openstreetmap/josm/gui/layer/geoimage/ImageEntry.java (modified) (3 diffs)
• src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java (modified) (1 diff)

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

@@ -468 +468 @@
                     g.fillRect(p.x - d.width / 2, p.y - d.height / 2, d.width, d.height);
                 } else {
+                    if (e.getExifImgDir() != null) {
+                        double arrowlength = 25;
+                        double arrowwidth = 18;
+
+                        double dir = e.getExifImgDir();
+                        // Rotate 90° CCW 
+                        double headdir = ( dir < 90 ) ? dir + 270 : dir - 90;
+                        double leftdir = ( headdir < 90 ) ? headdir + 270 : headdir - 90;
+                        double rightdir = ( headdir > 270 ) ? headdir - 270 : headdir + 90;
+
+                        double ptx = p.x + Math.cos(Math.toRadians(headdir)) * arrowlength;
+                        double pty = p.y + Math.sin(Math.toRadians(headdir)) * arrowlength;
+
+                        double ltx = p.x + Math.cos(Math.toRadians(leftdir)) * arrowwidth/2;
+                        double lty = p.y + Math.sin(Math.toRadians(leftdir)) * arrowwidth/2;
+
+                        double rtx = p.x + Math.cos(Math.toRadians(rightdir)) * arrowwidth/2;
+                        double rty = p.y + Math.sin(Math.toRadians(rightdir)) * arrowwidth/2;
+
+                        g.setColor(Color.white);
+                        int[] xar = {(int) ltx, (int) ptx, (int) rtx, (int) ltx};
+                        int[] yar = {(int) lty, (int) pty, (int) rty, (int) lty};
+                        g.fillPolygon(xar, yar, 4);
+                    }
+
                     selectedIcon.paintIcon(mv, g,
                             p.x - selectedIcon.getIconWidth() / 2,
                             p.y - selectedIcon.getIconHeight() / 2);
+
                 }
             }
@@ -528 +554 @@
             }
 
+
+            // 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) {

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

@@ -20 +20 @@
     private File file;
     private LatLon exifCoor;
+    private Double exifImgDir;
     private Date exifTime;
     Image thumbnail;
@@ -78 +79 @@
         return exifCoor;
     }
+    public Double getExifImgDir() {
+        return exifImgDir;
+    }
+
     /**
      * setter methods
@@ -105 +110 @@
         this.exifCoor = exifCoor;
     }
+    void setExifImgDir(double exifDir) {
+        this.exifImgDir = exifDir;
+    } 
 
     @Override

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

@@ -239 +239 @@
                 osd.append(tr("\n{0} km/h", Math.round(entry.getSpeed())));
             }
+            if (entry.getExifImgDir() != null) {
+                osd.append(tr("\nDirection {0}°", Math.round(entry.getExifImgDir())));
+            }
             //if (entry.getPos()  != null) {
             //    osd.append(tr("\nlat: {0}, lon: {1}", Double.toString(entry.getPos().lat()), Double.toString(entry.getPos().lon())));