Changeset 17574 in josm

Timestamp:

2021-03-16T23:57:41+01:00 (3 years ago)

Author:

Don-vip

Message:

fix #20598 - Update the bucket with the new bbox (patch by taylor.smock)

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/ImageData.java (modified) (2 diffs)
• data/gpx/GpxImageEntry.java (modified) (1 diff)
• gui/layer/geoimage/ImageEntry.java (modified) (3 diffs)

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

@@ -64 +64 @@
         }
         this.geoImages.addAll(this.data);
+        data.forEach(image -> image.setDataSet(this));
         selectedImagesIndex.add(-1);
     }
@@ -218 +219 @@
 
     /**
+     * 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

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

@@ -552 +552 @@
     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());
     }

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

@@ -7 +7 @@
 import java.util.Objects;
 
+import org.openstreetmap.josm.data.ImageData;
 import org.openstreetmap.josm.data.gpx.GpxImageEntry;
 
@@ -16 +17 @@
 
     private Image thumbnail;
+    private ImageData dataSet;
 
     /**
@@ -76 +78 @@
 
     @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);