Changeset 6630 in josm


Ignore:
Timestamp:
2014-01-05T12:17:49+01:00 (6 years ago)
Author:
simon04
Message:

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

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/data/validator/geometry.mapcss

    r6628 r6630  
    2222}
    2323
    24 area.water_area ⧉ area.water_area {
     24area:closed:areaStyle.water_area ⧉ area:closed:areaStyle.water_area {
    2525  throwWarning: tr("Overlapping Water Areas");
    2626}
    2727
    28 area ⧉ area {
     28area:closed:areaStyle ⧉ area:closed:areaStyle {
    2929  throwOther: tr("Overlapping Areas");
    3030}
  • trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Condition.java

    r6629 r6630  
    1313import org.openstreetmap.josm.data.osm.Way;
    1414import org.openstreetmap.josm.gui.mappaint.Cascade;
     15import org.openstreetmap.josm.gui.mappaint.ElemStyles;
    1516import org.openstreetmap.josm.gui.mappaint.Environment;
    1617import org.openstreetmap.josm.tools.CheckParameterUtil;
     
    333334            } else if ("sameTags".equals(id)) {
    334335                return e.osm.hasSameInterestingTags(Utils.firstNonNull(e.child, e.parent));
     336            } else if ("areaStyle".equals(id)) {
     337                return ElemStyles.hasAreaElemStyle(e.osm, false);
    335338            }
    336339            return true;
Note: See TracChangeset for help on using the changeset viewer.