Changeset 7169 in josm for trunk/src/org

Timestamp:

2014-05-22T20:11:33+02:00 (10 years ago)

Author:

simon04

Message:

fix #9361 - MapCSS: consider multipolygon when matching outer ring of a multipolygon for the ∈ selector

File:

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

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

@@ -5 +5 @@
 import java.util.Collections;
 import java.util.List;
+import java.util.NoSuchElementException;
 import java.util.regex.PatternSyntaxException;
 
@@ -20 +21 @@
 import org.openstreetmap.josm.tools.Geometry;
 import org.openstreetmap.josm.tools.Pair;
+import org.openstreetmap.josm.tools.Predicates;
 import org.openstreetmap.josm.tools.Utils;
 
@@ -204 +206 @@
                         // abort if first match has been found
                         break;
-                    } else if (!e.osm.equals(p) && p.isUsable()) {
+                    } else if (isPrimitiveUsable(p)) {
                         p.accept(this);
                     }
                 }
+            }
+
+            public boolean isPrimitiveUsable(OsmPrimitive p) {
+                return !e.osm.equals(p) && p.isUsable();
             }
         }
@@ -227 +233 @@
         }
 
-        private final class ContainsFinder extends AbstractFinder {
+        private class ContainsFinder extends AbstractFinder {
             private ContainsFinder(Environment e) {
                 super(e);
@@ -266 +272 @@
                     return false;
                 }
+
+                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 (!((GeneralSelector) right).matchesBase(OsmPrimitiveType.RELATION) || !(e.osm instanceof Way)) {
+                        throw new NoSuchElementException();
+                    }
+                    final Collection<Relation> multipolygons = Utils.filteredCollection(Utils.filter(
+                            e.osm.getReferrers(), Predicates.hasTag("type", "multipolygon")), Relation.class);
+                    final Relation multipolygon = multipolygons.iterator().next();
+                    if (multipolygon == null) throw new NoSuchElementException();
+                    containsFinder = new ContainsFinder(e.withPrimitive(multipolygon)) {
+                        @Override
+                        public boolean isPrimitiveUsable(OsmPrimitive p) {
+                            return super.isPrimitiveUsable(p) && !multipolygon.getMemberPrimitives().contains(p);
+                        }
+                    };
+                } catch (NoSuchElementException ignore) {
+                    containsFinder = new ContainsFinder(e);
+                }
                 e.parent = e.osm;
 
-                final ContainsFinder containsFinder = new ContainsFinder(e);
-                if (right instanceof GeneralSelector) {
-                    if (((GeneralSelector) right).matchesBase(OsmPrimitiveType.NODE)) {
+                if (left instanceof GeneralSelector) {
+                    if (((GeneralSelector) left).matchesBase(OsmPrimitiveType.NODE)) {
                         containsFinder.visit(e.osm.getDataSet().searchNodes(e.osm.getBBox()));
                     }
-                    if (((GeneralSelector) right).matchesBase(OsmPrimitiveType.WAY)) {
+                    if (((GeneralSelector) left).matchesBase(OsmPrimitiveType.WAY)) {
                         containsFinder.visit(e.osm.getDataSet().searchWays(e.osm.getBBox()));
                     }