Ticket #10391: 10391.patch

src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParser.jj

@@ -215 +215 @@
 |   < FULLSTOP: "." >
 |   < DEG: "°" >
 |   < ELEMENT_OF: "∈" >
+|   < NOT_ELEMENT_OF: "∉" >
 |   < CROSSING: "⧉" >
 |   < PERCENT: "%" >
 |   < COMMENT_START: "/*" > : COMMENT
@@ -690 +691 @@
             |
                 <ELEMENT_OF> { type = Selector.ChildOrParentSelectorType.ELEMENT_OF; }
             |
+                <NOT_ELEMENT_OF> { type = Selector.ChildOrParentSelectorType.NOT_ELEMENT_OF; }
+            |
                 <CROSSING> { type = Selector.ChildOrParentSelectorType.CROSSING; }
             )
             w()

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

@@ -93 +93 @@
      * @see ChildOrParentSelector
      */
     enum ChildOrParentSelectorType {
-        CHILD, PARENT, ELEMENT_OF, CROSSING, SIBLING
+        CHILD, PARENT, ELEMENT_OF, NOT_ELEMENT_OF, CROSSING, SIBLING
     }
 
     /**
@@ -312 +312 @@
 
         @Override
         public boolean matches(Environment e) {
+            if (ChildOrParentSelectorType.ELEMENT_OF == type ||
+                    ChildOrParentSelectorType.NOT_ELEMENT_OF == type) {
+                if (!left.matches(e))
+                    return false;
+                boolean is_element_of = false;
+                // does exist any element in dataset that contains e.osm?
+                for (IPrimitive p: e.osm.getDataSet().allPrimitives()) {
+                    Environment ne = new Environment(p);
+                    if (!right.matches(ne))
+                        continue;
+                    ContainsFinder cf = new ContainsFinder(ne);
+                    if (e.osm instanceof IWay)
+                        cf.visit((IWay) e.osm);
+                    if (e.osm instanceof INode)
+                        cf.visit((INode) e.osm);
+                    if (ne.child == e.osm)
+                        is_element_of = true;
+                }
+                Logging.log(Logging.LEVEL_INFO, "ELEMENT_OF is " + is_element_of, null);
+                if (ChildOrParentSelectorType.ELEMENT_OF == type)
+                    return is_element_of;
+                else
+                    return !is_element_of;
+            }
 
             if (!right.matches(e))
                 return false;
 
             if (ChildOrParentSelectorType.ELEMENT_OF == type) {
-
+/*
                 if (e.osm instanceof INode || e.osm.getDataSet() == null) {
                     // nodes cannot contain elements
                     return false;
@@ -362 +386 @@
                 }
 
                 return e.child != null;
-
+*/
             } else if (ChildOrParentSelectorType.CROSSING == type && e.osm instanceof IWay) {
                 e.parent = e.osm;
                 final CrossingFinder crossingFinder = new CrossingFinder(e);