Changeset 18621 in josm for trunk/src/org/openstreetmap

Timestamp:

2022-12-28T19:38:17+01:00 (23 months ago)

Author:

taylor.smock

Message:

Fix #22606: Images with no exif position or no set position were treated as if they had no position

This is incorrect behavior, since the paint code only cares about the return
value of IImageEntry#getPos, and invalid geoimages should be those that can
not be shown in the mapview.

This also fixes an issue where, when the layer has no images with positions, the
first image would be displayed, but not selected in the data.

File:

• trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java (modified) (2 diffs)

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

@@ -199 +199 @@
         }
         if (getInvalidGeoImages().size() == data.size()) {
-            ImageViewerDialog.getInstance().displayImages(Collections.singletonList(this.data.getFirstImage()));
+            this.data.setSelectedImage(this.data.getFirstImage());
+            // We do have to wrap the EDT call in a worker call, since layers may be created in the EDT.
+            // And the layer must be added to the layer list in order for the dialog to work properly.
+            MainApplication.worker.execute(() -> GuiHelper.runInEDT(() -> {
+                ImageViewerDialog.getInstance().displayImages(this.getSelection());
+            }));
         }
     }
@@ -302 +307 @@
     @Override
     public List<IImageEntry<?>> getInvalidGeoImages() {
-        return this.getImageData().getImages().stream().filter(entry -> entry.getPos() == null || entry.getExifCoor() == null
-              || !entry.getExifCoor().isValid() || !entry.getPos().isValid()).collect(toList());
+        return this.getImageData().getImages().stream().filter(entry -> entry.getPos() == null || !entry.getPos().isValid()).collect(toList());
     }