Changeset 7280 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2014-07-01T19:23:18+02:00 (10 years ago)

Author:

simon04

Message:

fix #10120 see #10215 - Validator: do not warn "Overlapping Water Areas" for overlaps of water areas with normal areas

File:

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

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

@@ -225 +225 @@
             @Override
             public void visit(Way w) {
-                if (e.child == null && left.matches(e.withPrimitive(w))) {
+                if (e.child == null && left.matches(new Environment().withPrimitive(w))) {
                     if (e.osm instanceof Way && Geometry.PolygonIntersection.CROSSING.equals(Geometry.polygonIntersection(w.getNodes(), ((Way) e.osm).getNodes()))) {
                         e.child = w;
@@ -241 +241 @@
             @Override
             public void visit(Node n) {
-                if (e.child == null && left.matches(e.withPrimitive(n))) {
+                if (e.child == null && left.matches(new Environment().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)) {
@@ -251 +251 @@
             @Override
             public void visit(Way w) {
-                if (e.child == null && left.matches(e.withPrimitive(w))) {
+                if (e.child == null && left.matches(new Environment().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)) {
@@ -284 +284 @@
                     final Relation multipolygon = multipolygons.iterator().next();
                     if (multipolygon == null) throw new NoSuchElementException();
-                    containsFinder = new ContainsFinder(e.withPrimitive(multipolygon)) {
+                    containsFinder = new ContainsFinder(new Environment().withPrimitive(multipolygon)) {
                         @Override
                         public boolean isPrimitiveUsable(OsmPrimitive p) {