Changeset 6940 in josm for trunk


Ignore:
Timestamp:
2014-03-28T21:55:22+01:00 (6 years ago)
Author:
Don-vip
Message:

fix #9820 - validator: fix regression from r6862 in overlapping ways test

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/data/validation/tests/OverlappingWays.java

    r6872 r6940  
    5252
    5353    protected static final CollectionProperty IGNORED_KEYS = new CollectionProperty(
    54             "overlapping-ways.ignored-keys", Arrays.asList("barrier", "building"));
     54            "overlapping-ways.ignored-keys", Arrays.asList("barrier", "building", "historic:building"));
    5555
    5656    /** Constructor */
     
    156156        }
    157157
    158         // see ticket #9598 - only report if at least 3 segments are shared
     158        // see ticket #9598 - only report if at least 3 segments are shared, except for overlapping ways, i.e warnings (see #9820)
    159159        for (TestError error : preliminaryErrors) {
    160             if (error.getHighlighted().size() / error.getPrimitives().size() >= 3) {
     160            if (error.getSeverity().equals(Severity.WARNING) || error.getHighlighted().size() / error.getPrimitives().size() >= 3) {
    161161                boolean ignore = false;
    162162                for (String ignoredKey : IGNORED_KEYS.get()) {
Note: See TracChangeset for help on using the changeset viewer.