Changeset 15137 in josm for trunk/src

Timestamp:

2019-05-29T09:21:54+02:00 (5 years ago)

Author:

GerdP

Message:

fix #17767: "Update multipolygon" may change route relation to multipolygon
If no relation is selected but at least one way: Collect the multipolygon relations which have the selected way(s) as members. If the collection contains exactly one relation the action is enabled.
The implementation stops early when more than one multipolygon relation is found.

File:

• trunk/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java

@@ -179 +179 @@
     }
 
-    private Relation getSelectedMultipolygonRelation() {
-        DataSet ds = getLayerManager().getEditDataSet();
-        return getSelectedMultipolygonRelation(ds.getSelectedWays(), ds.getSelectedRelations());
-    }
-
     private static Relation getSelectedMultipolygonRelation(Collection<Way> selectedWays, Collection<Relation> selectedRelations) {
-        if (selectedRelations.size() == 1 && "multipolygon".equals(selectedRelations.iterator().next().get("type"))) {
-            return selectedRelations.iterator().next();
-        } else {
-            final Set<Relation> relatedRelations = new HashSet<>();
+        Relation candidate = null;
+        if (selectedRelations.size() == 1) {
+            candidate = selectedRelations.iterator().next();
+            if (!candidate.hasTag("type", "multipolygon"))
+                candidate = null;
+        } else if (!selectedWays.isEmpty()) {
             for (final Way w : selectedWays) {
-                w.referrers(Relation.class).forEach(relatedRelations::add);
-            }
-            return relatedRelations.size() == 1 ? relatedRelations.iterator().next() : null;
-        }
+                for (OsmPrimitive r : w.getReferrers()) {
+                    if (r != candidate && r instanceof Relation && r.hasTag("type", "multipolygon")) {
+                        if (candidate != null)
+                            return null; // found another multipolygon relation
+                        candidate = (Relation) r;
+                    }
+                }
+            }
+        }
+        return candidate;
     }
 
@@ -271 +274 @@
       * Enable this action only if something is selected
       *
-      * @param selection the current selection, gets tested for emptyness
+      * @param selection the current selection, gets tested for emptiness
       */
     @Override
     protected void updateEnabledState(Collection<? extends OsmPrimitive> selection) {
         DataSet ds = getLayerManager().getEditDataSet();
-        if (ds == null) {
+        if (ds == null || selection.isEmpty()) {
             setEnabled(false);
         } else if (update) {
-            setEnabled(getSelectedMultipolygonRelation() != null);
+            setEnabled(getSelectedMultipolygonRelation(ds.getSelectedWays(), ds.getSelectedRelations()) != null);
         } else {
-            setEnabled(!getLayerManager().getEditDataSet().getSelectedWays().isEmpty());
+            setEnabled(!ds.getSelectedWays().isEmpty());
         }
     }