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

Timestamp:

2014-07-03T20:42:42+02:00 (10 years ago)

Author:

simon04

Message:

see #10211 - fix CCE when using ∈ and ⧉ in mappaint styles

File:

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

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

@@ -277 +277 @@
                     // 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)) {
+                    if (!(e.osm instanceof Way)
+                            || (right instanceof OptimizedGeneralSelector
+                            && !((OptimizedGeneralSelector) right).matchesBase(OsmPrimitiveType.RELATION))) {
                         throw new NoSuchElementException();
                     }
@@ -295 +297 @@
                 e.parent = e.osm;
 
-                if (left instanceof GeneralSelector) {
-                    if (((GeneralSelector) left).matchesBase(OsmPrimitiveType.NODE)) {
+                if (left instanceof OptimizedGeneralSelector) {
+                    if (((OptimizedGeneralSelector) left).matchesBase(OsmPrimitiveType.NODE)) {
                         containsFinder.visit(e.osm.getDataSet().searchNodes(e.osm.getBBox()));
                     }
-                    if (((GeneralSelector) left).matchesBase(OsmPrimitiveType.WAY)) {
+                    if (((OptimizedGeneralSelector) left).matchesBase(OsmPrimitiveType.WAY)) {
                         containsFinder.visit(e.osm.getDataSet().searchWays(e.osm.getBBox()));
                     }
@@ -312 +314 @@
                 e.parent = e.osm;
                 final CrossingFinder crossingFinder = new CrossingFinder(e);
-                if (((GeneralSelector) right).matchesBase(OsmPrimitiveType.WAY)) {
+                if (right instanceof OptimizedGeneralSelector
+                        && ((OptimizedGeneralSelector) right).matchesBase(OsmPrimitiveType.WAY)) {
                     crossingFinder.visit(e.osm.getDataSet().searchWays(e.osm.getBBox()));
                 }
@@ -471 +474 @@
         }
         
-        public boolean matchesBase(OsmPrimitiveType type) {
-            if ("*".equals(base)) {
-                return true;
-            } else if (OsmPrimitiveType.NODE.equals(type)) {
-                return "node".equals(base);
-            } else if (OsmPrimitiveType.WAY.equals(type)) {
-                return "way".equals(base) || "area".equals(base);
-            } else if (OsmPrimitiveType.RELATION.equals(type)) {
-                return "area".equals(base) || "relation".equals(base) || "canvas".equals(base);
-            }
-            return false;
-        }
-
-        public boolean matchesBase(OsmPrimitive p) {
-            if (!matchesBase(p.getType())) {
-                return false;
-            } else {
-                if (p instanceof Relation) {
-                    if ("area".equals(base)) {
-                        return ((Relation) p).isMultipolygon();
-                    } else if ("canvas".equals(base)) {
-                        return p.get("#canvas") != null;
-                    }
-                }
-                return true;
-            }
-        }
-
-        public boolean matchesBase(Environment e) {
-            return matchesBase(e.osm);
-        }
-        
         public boolean matchesConditions(Environment e) {
             return super.matches(e);
@@ -565 +536 @@
         }
 
+        public boolean matchesBase(OsmPrimitiveType type) {
+            if ("*".equals(base)) {
+                return true;
+            } else if (OsmPrimitiveType.NODE.equals(type)) {
+                return "node".equals(base);
+            } else if (OsmPrimitiveType.WAY.equals(type)) {
+                return "way".equals(base) || "area".equals(base);
+            } else if (OsmPrimitiveType.RELATION.equals(type)) {
+                return "area".equals(base) || "relation".equals(base) || "canvas".equals(base);
+            }
+            return false;
+        }
+
+        public boolean matchesBase(OsmPrimitive p) {
+            if (!matchesBase(p.getType())) {
+                return false;
+            } else {
+                if (p instanceof Relation) {
+                    if ("area".equals(base)) {
+                        return ((Relation) p).isMultipolygon();
+                    } else if ("canvas".equals(base)) {
+                        return p.get("#canvas") != null;
+                    }
+                }
+                return true;
+            }
+        }
+
+        public boolean matchesBase(Environment e) {
+            return matchesBase(e.osm);
+        }
+
         @Override
         public Selector optimizedBaseCheck() {