Changeset 15143 in josm for trunk/src

Timestamp:

2019-05-30T14:20:06+02:00 (5 years ago)

Author:

GerdP

Message:

fix #17767 (again)

• make sure that we don't create multipolygon in update mode
• ignore filtered relations when only ways are selected

File:

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

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

@@ -161 +161 @@
                 : null;
 
+        if (update && multipolygonRelation == null)
+            return;
         // download incomplete relation or incomplete members if necessary
         OsmDataLayer editLayer = getLayerManager().getEditLayer();
@@ -188 +190 @@
             for (final Way w : selectedWays) {
                 for (OsmPrimitive r : w.getReferrers()) {
-                    if (r != candidate && r instanceof Relation && r.hasTag("type", "multipolygon")) {
+                    if (r != candidate && !r.isDisabled() && r instanceof Relation && r.hasTag("type", "multipolygon")) {
                         if (candidate != null)
                             return null; // found another multipolygon relation