Changeset 6630 in josm for trunk

Timestamp:

2014-01-05T12:17:49+01:00 (11 years ago)

Author:

simon04

Message:

see #9534 - "Overlapping areas" validator: do not generate warnings for non-closed/non-area-style objects

Location:

trunk

Files:

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

trunk/data/validator/geometry.mapcss

@@ -22 +22 @@
 }
 
-area.water_area ⧉ area.water_area {
+area:closed:areaStyle.water_area ⧉ area:closed:areaStyle.water_area {
   throwWarning: tr("Overlapping Water Areas");
 }
 
-area ⧉ area {
+area:closed:areaStyle ⧉ area:closed:areaStyle {
   throwOther: tr("Overlapping Areas");
 }

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

@@ -13 +13 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.gui.mappaint.Cascade;
+import org.openstreetmap.josm.gui.mappaint.ElemStyles;
 import org.openstreetmap.josm.gui.mappaint.Environment;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
@@ -333 +334 @@
             } else if ("sameTags".equals(id)) {
                 return e.osm.hasSameInterestingTags(Utils.firstNonNull(e.child, e.parent));
+            } else if ("areaStyle".equals(id)) {
+                return ElemStyles.hasAreaElemStyle(e.osm, false);
             }
             return true;