Changeset 6680 in josm for trunk

Timestamp:

2014-01-13T18:19:57+01:00 (10 years ago)

Author:

simon04

Message:

fix #9556 - Validator: add "natural and landuse of the same type should not cross each other"

Location:

trunk

Files:

• data/validator/geometry.mapcss (modified) (1 diff)
• src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java (modified) (1 diff)

trunk/data/validator/geometry.mapcss

@@ -34 +34 @@
   throwWarning: tr("{0} inside {1}", "amenity=parking", "amenity=parking");
 }
+
+/* see ticket #9556 */
+area:closed:areaStyle[tag("natural") = parent_tag("natural")] ⧉ area:closed:areaStyle[natural] {
+  throwWarning: tr("Overlapping Identical Natural Areas");
+}
+
+area:closed:areaStyle[tag("landuse") = parent_tag("landuse")] ⧉ area:closed:areaStyle[landuse] {
+  throwWarning: tr("Overlapping Identical Landuses");
+}

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

@@ -254 +254 @@
 
             } else if (ChildOrParentSelectorType.CROSSING.equals(type) && e.osm instanceof Way) {
+                e.parent = e.osm;
                 final CrossingFinder crossingFinder = new CrossingFinder(e);
                 if (((GeneralSelector) right).matchesBase(OsmPrimitiveType.WAY)) {