Changeset 36333 in osm for applications/editors

Timestamp:

2024-09-05T15:51:01+02:00 (4 months ago)

Author:

taylor.smock

Message:

Fix #23239: NPE when attempting to set a position of an image without a position already set

This will occur when attempting to position images when the image has no exif
location information.

File:

• applications/editors/josm/plugins/photoadjust/src/org/openstreetmap/josm/plugins/photoadjust/PhotoAdjustWorker.java (modified) (2 diffs)

applications/editors/josm/plugins/photoadjust/src/org/openstreetmap/josm/plugins/photoadjust/PhotoAdjustWorker.java

@@ -10 +10 @@
 import org.openstreetmap.josm.data.coor.ILatLon;
 import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.projection.Projection;
 import org.openstreetmap.josm.data.projection.ProjectionRegistry;
 import org.openstreetmap.josm.gui.MainApplication;
@@ -166 +167 @@
             } else {
                 disableCenterView();
+                final Projection proj = ProjectionRegistry.getProjection();
+                if (dragPhoto.getPos() == null) {
+                    // Set a false location -- the image most likely has no position
+                    // So we use a location in the middle of the projection bounds to ensure that everything works.
+                    dragPhoto.setPos(proj.getWorldBoundsLatLon().getCenter());
+                }
                 final EastNorth startEN = dragPhoto.getPos().getEastNorth(ProjectionRegistry.getProjection()).subtract(dragOffset);
                 final EastNorth currentEN = MainApplication.getMap().mapView.getEastNorth(evt.getX(), evt.getY());