Changeset 8833 in josm

Timestamp:

2015-10-07T22:50:30+02:00 (9 years ago)

Author:

simon04

Message:

fix #11939 - MapCSS: fix parent_tag() in ∈ and ⧉ tests

Location:

trunk

Files:

• data_nodist/amenity-in-amenity.osm (added)
• src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java (modified) (3 diffs)
• test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/ChildOrParentSelectorTest.groovy (modified) (2 diffs)

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

@@ -256 +256 @@
             @Override
             public void visit(Way w) {
-                if (e.child == null && left.matches(new Environment(w))) {
+                if (e.child == null && left.matches(new Environment(w).withParent(e.osm))) {
                     if (e.osm instanceof Way && Geometry.PolygonIntersection.CROSSING.equals(
                             Geometry.polygonIntersection(w.getNodes(), ((Way) e.osm).getNodes()))) {
@@ -273 +273 @@
             @Override
             public void visit(Node n) {
-                if (e.child == null && left.matches(new Environment(n))) {
+                if (e.child == null && left.matches(new Environment(n).withParent(e.osm))) {
                     if (e.osm instanceof Way && Geometry.nodeInsidePolygon(n, ((Way) e.osm).getNodes())
                             || e.osm instanceof Relation && (
@@ -284 +284 @@
             @Override
             public void visit(Way w) {
-                if (e.child == null && left.matches(new Environment(w))) {
+                if (e.child == null && left.matches(new Environment(w).withParent(e.osm))) {
                     if (e.osm instanceof Way && Geometry.PolygonIntersection.FIRST_INSIDE_SECOND.equals(
                             Geometry.polygonIntersection(w.getNodes(), ((Way) e.osm).getNodes()))

trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/ChildOrParentSelectorTest.groovy

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.mappaint.mapcss
 
-import org.openstreetmap.josm.gui.mappaint.MultiCascade;
-
-import static org.junit.Assert.*
+import org.openstreetmap.josm.data.osm.OsmPrimitiveType
+import org.openstreetmap.josm.gui.mappaint.MultiCascade
+import org.openstreetmap.josm.io.OsmReader
 
 import java.util.logging.Logger
@@ -182 +182 @@
         assert selector.matches(e)
     }
+
+    @Test
+    public void testContains() throws Exception {
+        def ds = OsmReader.parseDataSet(new FileInputStream("data_nodist/amenity-in-amenity.osm"), null)
+        def css = parse("node[tag(\"amenity\") = parent_tag(\"amenity\")] ∈ *[amenity] {}")
+        assert css.matches(new Environment(ds.getPrimitiveById(123, OsmPrimitiveType.WAY)))
+        assert css.matches(new Environment(ds.getPrimitiveById(123, OsmPrimitiveType.RELATION)))
+    }
 }