Changeset 15068 in josm for trunk/src/org/openstreetmap

Timestamp:

2019-05-11T09:56:38+02:00 (6 years ago)

Author:

GerdP

Message:

see #17695: Fix ContainsFinder by removing wrong code

• did not work because the results in the newly created environment were not transferred into the original environment
• if that transfer is implemented false positives are produced for the examples in the lower row once you add another building inside the mp but outside of the inner way.

TODO: add code to support mp and improve performance of Geometry tests

File:

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

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

@@ -9 +9 @@
 import java.util.LinkedHashSet;
 import java.util.List;
-import java.util.NoSuchElementException;
 import java.util.Objects;
-import java.util.Set;
 import java.util.function.IntFunction;
 import java.util.function.IntSupplier;
@@ -21 +19 @@
 import org.openstreetmap.josm.data.osm.IRelationMember;
 import org.openstreetmap.josm.data.osm.IWay;
-import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
 import org.openstreetmap.josm.data.osm.OsmUtils;
 import org.openstreetmap.josm.data.osm.Relation;
-import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.osm.visitor.PrimitiveVisitor;
 import org.openstreetmap.josm.data.osm.visitor.paint.relations.MultipolygonCache;
@@ -358 +354 @@
                 }
 
-                ContainsFinder containsFinder;
-                try {
-                    // if right selector also matches relations and if matched primitive is a way which is part of a multipolygon,
-                    // use the multipolygon for further analysis
-                    if (!(e.osm instanceof Way)
-                            || (right instanceof OptimizedGeneralSelector
-                            && !((OptimizedGeneralSelector) right).matchesBase(OsmPrimitiveType.RELATION))) {
-                        throw new NoSuchElementException();
-                    }
-                    final Relation multipolygon = ((Way) e.osm).referrers(Relation.class)
-                            .filter(p -> p.hasTag("type", "multipolygon"))
-                            .findFirst()
-                            .orElseThrow(NoSuchElementException::new);
-                    final Set<OsmPrimitive> members = multipolygon.getMemberPrimitives();
-                    containsFinder = new ContainsFinder(new Environment(multipolygon)) {
-                        @Override
-                        public boolean isPrimitiveUsable(IPrimitive p) {
-                            return super.isPrimitiveUsable(p) && !members.contains(p);
-                        }
-                    };
-                } catch (NoSuchElementException ignore) {
-                    Logging.trace(ignore);
-                    containsFinder = new ContainsFinder(e);
-                }
+                ContainsFinder containsFinder = new ContainsFinder(e);
                 e.parent = e.osm;