Changeset 35236 in osm for applications/editors

Timestamp:

2019-11-25T20:33:01+01:00 (5 years ago)

Author:

holgermappt

Message:

Deactivate UntaggedGeoImageLayerAction if there are just tagged or untagged images, see #josm18357

File:

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

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

@@ -65 +65 @@
 
     /**
-     * Check if there is any image without coordinates.
+     * Determine if the action should be enabled. That is the case if there is
+     * any image without coordinates and any image with coordinates.
      * @param layer geo image layer
      * @return {@code true} if there is any image without coordinates
@@ -71 +72 @@
     private static boolean enabled(GeoImageLayer layer) {
         if (layer != null) {
+            boolean hasNoPos = false;
+            boolean hasPos = false;
             for (ImageEntry img: layer.getImages()) {
                 if (img.getPos() == null) {
+                    hasNoPos = true;
+                } else {
+                    hasPos = true;
+                }
+                if (hasNoPos && hasPos) {
                     return true;
                 }