Changeset 6613 in josm

Timestamp:

2014-01-03T17:47:52+01:00 (10 years ago)

Author:

simon04

Message:

see #9516 - MapCSS: add support for crossing polygon check (area ⧉ area), replace OverlappingAreas test by a corresponding MapCSS test

Location:

trunk

Files:

• data/validator/geometry.mapcss (modified) (1 diff)
• src/org/openstreetmap/josm/data/validation/OsmValidator.java (modified) (2 diffs)
• src/org/openstreetmap/josm/data/validation/tests/OverlappingAreas.java (deleted)
• src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParser.jj (modified) (2 diffs)
• src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java (modified) (4 diffs)

trunk/data/validator/geometry.mapcss

@@ -16 +16 @@
   throwWarning: tr("Building inside building");
 }
+
+/* Overlapping areas (spatial test) */
+area[natural =~ /^(water|wetland|coastline)$/], area[landuse=reservoir] {
+  set water_area;
+}
+
+area.water_area ⧉ area.water_area {
+  throwWarning: tr("Overlapping Water Areas");
+}
+
+area ⧉ area {
+  throwOther: tr("Overlapping Areas");
+}

trunk/src/org/openstreetmap/josm/data/validation/OsmValidator.java

@@ -38 +38 @@
 import org.openstreetmap.josm.data.validation.tests.NodesDuplicatingWayTags;
 import org.openstreetmap.josm.data.validation.tests.OpeningHourTest;
-import org.openstreetmap.josm.data.validation.tests.OverlappingAreas;
 import org.openstreetmap.josm.data.validation.tests.OverlappingWays;
 import org.openstreetmap.josm.data.validation.tests.PowerLines;
@@ -110 +109 @@
         TurnrestrictionTest.class, // ID  1801 ..  1899
         DuplicateRelation.class, // ID 1901 .. 1999
-        OverlappingAreas.class, // ID 2201 .. 2299
         WayConnectedToArea.class, // ID 2301 .. 2399
         NodesDuplicatingWayTags.class, // ID 2401 .. 2499

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

@@ -81 +81 @@
 |   < FULLSTOP: "." >
 |   < ELEMENT_OF: "∈" >
+|   < CROSSING: "⧉" >
 |   < COMMENT_START: "/*" > : COMMENT
 |   < UNEXPECTED_CHAR : ~[] > // avoid TokenMgrErrors because they are hard to recover from
@@ -278 +279 @@
         |
             <ELEMENT_OF> { type = Selector.ChildOrParentSelectorType.ELEMENT_OF; }
+        |
+            <CROSSING> { type = Selector.ChildOrParentSelectorType.CROSSING; }
         )
         { selLink = new LinkSelector(conditions); }

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

@@ -39 +39 @@
 
     public static enum ChildOrParentSelectorType {
-        CHILD, PARENT, ELEMENT_OF
+        CHILD, PARENT, ELEMENT_OF, CROSSING
     }
 
@@ -150 +150 @@
         }
 
-        private class ContainsFinder extends AbstractVisitor {
-            private final Environment e;
-
-            private ContainsFinder(Environment e) {
+        private abstract class AbstractFinder extends AbstractVisitor {
+            protected final Environment e;
+
+            protected AbstractFinder(Environment e) {
                 this.e = e;
-                CheckParameterUtil.ensureThat(!(e.osm instanceof Node), "Nodes not supported");
             }
 
             @Override
             public void visit(Node 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.child = n;
-                    }
-                }
             }
 
             @Override
             public void visit(Way 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.child = w;
-                    }
-                }
             }
 
@@ -194 +181 @@
         }
 
+        private class CrossingFinder extends AbstractFinder {
+            private CrossingFinder(Environment e) {
+                super(e);
+                CheckParameterUtil.ensureThat(e.osm instanceof Way, "Only ways are supported");
+            }
+
+            @Override
+            public void visit(Way w) {
+                if (e.child == null && left.matches(e.withPrimitive(w))) {
+                    if (e.osm instanceof Way && Geometry.PolygonIntersection.CROSSING.equals(Geometry.polygonIntersection(w.getNodes(), ((Way) e.osm).getNodes()))) {
+                        e.child = w;
+                    }
+                }
+            }
+        }
+
+        private class ContainsFinder extends AbstractFinder {
+            private ContainsFinder(Environment e) {
+                super(e);
+                CheckParameterUtil.ensureThat(!(e.osm instanceof Node), "Nodes not supported");
+            }
+
+            @Override
+            public void visit(Node 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.child = n;
+                    }
+                }
+            }
+
+            @Override
+            public void visit(Way 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.child = w;
+                    }
+                }
+            }
+        }
+
         @Override
         public boolean matches(Environment e) {
@@ -223 +253 @@
                 return e.child != null;
 
+            } else if (ChildOrParentSelectorType.CROSSING.equals(type) && e.osm instanceof Way) {
+                final CrossingFinder crossingFinder = new CrossingFinder(e);
+                if (((GeneralSelector) right).matchesBase(OsmPrimitiveType.WAY)) {
+                    crossingFinder.visit(e.osm.getDataSet().searchWays(e.osm.getBBox()));
+                }
+                return e.child != null;
             } else if (ChildOrParentSelectorType.CHILD.equals(type)) {
                 MatchingReferrerFinder collector = new MatchingReferrerFinder(e);