Changeset 6611 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java

Timestamp:

2014-01-03T17:14:36+01:00 (12 years ago)

Author:

simon04

Message:

see #9516 - Replace BuildingInBuilding by a corresponding MapCSS test

File:

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

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

@@ -160 +160 @@
             @Override
             public void visit(Node n) {
-                if (e.parent == null && right.matches(e.withPrimitive(n))) {
+                if (e.child == null && left.matches(e.withPrimitive(n))) {
                     if (e.osm instanceof Way && Geometry.nodeInsidePolygon(n, ((Way) e.osm).getNodes())
                             || e.osm instanceof Relation && ((Relation) e.osm).isMultipolygon() && Geometry.isNodeInsideMultiPolygon(n, (Relation) e.osm, null)) {
-                        e.parent = n;
+                        e.child = n;
                     }
                 }
@@ -170 +170 @@
             @Override
             public void visit(Way w) {
-                if (e.parent == null && right.matches(e.withPrimitive(w))) {
+                if (e.child == null && left.matches(e.withPrimitive(w))) {
                     if (e.osm instanceof Way && Geometry.PolygonIntersection.FIRST_INSIDE_SECOND.equals(Geometry.polygonIntersection(w.getNodes(), ((Way) e.osm).getNodes()))
                             || e.osm instanceof Relation && ((Relation) e.osm).isMultipolygon() && Geometry.isPolygonInsideMultiPolygon(w.getNodes(), (Relation) e.osm, null)) {
-                        e.parent = w;
+                        e.child = w;
                     }
                 }
@@ -184 +184 @@
             public void visit(Collection<? extends OsmPrimitive> primitives) {
                 for (OsmPrimitive p : primitives) {
-                    if (e.parent != null) {
+                    if (e.child != null) {
                         // abort if first match has been found
                         break;
@@ -206 +206 @@
                     return false;
                 }
-                e.child = e.osm;
+                e.parent = e.osm;
 
                 final ContainsFinder containsFinder = new ContainsFinder(e);
@@ -221 +221 @@
                 }
 
-                return e.parent != null;
+                return e.child != null;
 
             } else if (ChildOrParentSelectorType.CHILD.equals(type)) {
@@ -374 +374 @@
 
         public boolean matchesBase(OsmPrimitiveType type) {
-            if (OsmPrimitiveType.NODE.equals(type)) {
-                return base.equals("node") || base.equals("*");
+            if (base.equals("*")) {
+                return true;
+            } else if (OsmPrimitiveType.NODE.equals(type)) {
+                return base.equals("node");
             } else if (OsmPrimitiveType.WAY.equals(type)) {
-                return base.equals("way") || base.equals("area") || base.equals("*");
+                return base.equals("way") || base.equals("area");
             } else if (OsmPrimitiveType.RELATION.equals(type)) {
                 return base.equals("area") || base.equals("relation") || base.equals("canvas");