Changeset 18635 in josm for trunk

Timestamp:

2023-01-17T14:13:17+01:00 (15 months ago)

Author:

taylor.smock

Message:

Fix #22626: Geotagged images from GPX files cannot be closed when rotated by exif data

This is due to the initial implementation of RemoteEntry#equals using the
width and height fields for calculating hashCode and equals. Since we may
set those two fields when showing the image, it does not make sense to use
them for hashCode or equals.

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/layer/geoimage/RemoteEntry.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/gui/layer/geoimage/RemoteEntryTest.java (modified) (1 diff)

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

@@ -334 +334 @@
     @Override
     public int hashCode() {
-        return Objects.hash(this.uri, this.width, this.height, this.pos,
+        return Objects.hash(this.uri, this.pos,
                 this.exifOrientation, this.elevation, this.speed, this.exifImgDir,
                 this.exifCoor, this.exifTime, this.exifGpsTime, this.gpsTime,
@@ -349 +349 @@
             RemoteEntry other = this.getClass().cast(obj);
             return Objects.equals(this.uri, other.uri)
-                    && this.height == other.height
-                    && this.width == other.width
                     && Objects.equals(this.elevation, other.elevation)
                     && Objects.equals(this.exifCoor, other.exifCoor)

trunk/test/unit/org/openstreetmap/josm/gui/layer/geoimage/RemoteEntryTest.java

@@ -20 +20 @@
                 () -> null, () -> null, () -> null, () -> null);
         EqualsVerifier.simple().forClass(RemoteEntry.class).usingGetClass()
-                .withIgnoredFields("firstImage", "lastImage", "nextImage", "previousImage")
+                .withIgnoredFields("firstImage", "lastImage", "nextImage", "previousImage" /* These suppliers don't have good == semantics */,
+                        "width", "height" /* Width and height can be corrected later, although it is originally from exif, see #22626 */)
                 .withNonnullFields("uri")
                 .withPrefabValues(RemoteEntry.class, remoteEntryA, remoteEntryB)