Ticket #20598: 20598.1.patch

src/org/openstreetmap/josm/data/ImageData.java

@@ -63 +63 @@
             this.data = new ArrayList<>();
         }
         this.geoImages.addAll(this.data);
+        data.forEach(image -> image.setDataSet(this));
         selectedImagesIndex.add(-1);
     }
 
@@ -217 +218 @@
     }
 
     /**
+     * Indicate that a entry has changed
+     * @param gpxImageEntry The entry to update
+     * @since xxx
+     */
+    public void fireNodeMoved(ImageEntry gpxImageEntry) {
+        this.geoImages.remove(gpxImageEntry);
+        this.geoImages.add(gpxImageEntry);
+    }
+
+    /**
      * Remove the image from the list of selected images
      * @param image {@link ImageEntry} the image to remove
      * @since 15333

src/org/openstreetmap/josm/data/gpx/GpxImageEntry.java

@@ -551 +551 @@
     @Override
     public BBox getBBox() {
         // new BBox(LatLon) is null safe.
-        // Use `getPos` instead of `getExifCoor` since the image may be coorelated against a GPX track
+        // Use `getPos` instead of `getExifCoor` since the image may be correlated against a GPX track
         return new BBox(this.getPos());
     }
 

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

@@ -6 +6 @@
 import java.util.Collections;
 import java.util.Objects;
 
+import org.openstreetmap.josm.data.ImageData;
 import org.openstreetmap.josm.data.gpx.GpxImageEntry;
 
 /**
@@ -15 +16 @@
 public final class ImageEntry extends GpxImageEntry {
 
     private Image thumbnail;
+    private ImageData dataSet;
 
     /**
      * Constructs a new {@code ImageEntry}.
@@ -75 +77 @@
     }
 
     @Override
+    public void applyTmp() {
+        super.applyTmp();
+        if (this.dataSet != null) {
+            this.dataSet.fireNodeMoved(this);
+        }
+    }
+
+    @Override
+    public void discardTmp() {
+        super.discardTmp();
+        if (this.dataSet != null) {
+            this.dataSet.fireNodeMoved(this);
+        }
+    }
+
+    /**
+     * Set the dataset for this image
+     * @param imageData The dataset
+     * @since xxx
+     */
+    public void setDataSet(ImageData imageData) {
+        this.dataSet = imageData;
+    }
+
+    /**
+     * Get the dataset for this image
+     * @return The dataset
+     * @since xxx
+     */
+    public ImageData getDataSet() {
+        return this.dataSet;
+    }
+
+
+    @Override
     public int hashCode() {
         return Objects.hash(super.hashCode(), thumbnail);
     }