Changeset 17037 in josm

Timestamp:

2020-09-18T10:25:02+02:00 (4 years ago)

Author:

GerdP

Message:

fix #19597: validator is very slow when validating a complete complex multipolygon

• CrossingFinder: don't check if a closed way is crossing a multipolygon relation when the way is a member of that relation (we already ignored this combination when the multipolygon is checked)

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java

@@ -15 +15 @@
 import java.util.Map;
 import java.util.Objects;
+import java.util.Set;
 import java.util.function.IntFunction;
 import java.util.function.IntSupplier;
@@ -362 +363 @@
             @Override
             public void visit(Collection<? extends IPrimitive> primitives) {
-                List<? extends IPrimitive> toIgnore;
+                Set<? extends IPrimitive> toIgnore;
                 if (e.osm instanceof Relation) {
-                    toIgnore = ((IRelation<?>) e.osm).getMemberPrimitivesList();
+                    toIgnore = ((Relation) e.osm).getMemberPrimitives();
                 } else {
                     toIgnore = null;
@@ -373 +374 @@
                             && left.matches(new Environment(p).withParent(e.osm)) && isArea(p)
                             && (toIgnore == null || !toIgnore.contains(p))) {
+                        if (e.osm instanceof Way && ((Way)e.osm).referrers(Relation.class).anyMatch(ref -> ref == p))
+                            continue;
                         visitArea(p);
                     }