Changeset 12976 in josm


Ignore:
Timestamp:
2017-10-10T02:50:56+02:00 (9 days ago)
Author:
Don-vip
Message:

fix #14131 - Relation checker: Do not raise an error for incomplete ways for which we expect them to be closed, as we cannot know

File:
1 edited

Legend:

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

    r12865 r12976  
    244244            // it could also fail at memberExpression, but we can't guess at which
    245245
    246             // convert in localization friendly way to string of accepted types
    247             String typesStr = types.stream().map(x -> tr(x.getName())).collect(Collectors.joining("/"));
    248 
    249             errors.add(TestError.builder(this, Severity.WARNING, WRONG_TYPE)
    250                     .message(ROLE_VERIF_PROBLEM_MSG,
     246            // Do not raise an error for incomplete ways for which we expect them to be closed, as we cannot know
     247            boolean ignored = member.getMember().isIncomplete() && OsmPrimitiveType.WAY.equals(member.getType())
     248                    && !types.contains(TaggingPresetType.WAY) && types.contains(TaggingPresetType.CLOSEDWAY);
     249            if (!ignored) {
     250                // convert in localization friendly way to string of accepted types
     251                String typesStr = types.stream().map(x -> tr(x.getName())).collect(Collectors.joining("/"));
     252
     253                errors.add(TestError.builder(this, Severity.WARNING, WRONG_TYPE)
     254                        .message(ROLE_VERIF_PROBLEM_MSG,
    251255                            marktr("Type ''{0}'' of relation member with role ''{1}'' does not match accepted types ''{2}'' in template {3}"),
    252256                            member.getType(), member.getRole(), typesStr, name)
    253                     .primitives(member.getMember().isUsable() ? member.getMember() : n)
    254                     .build());
     257                        .primitives(member.getMember().isUsable() ? member.getMember() : n)
     258                        .build());
     259            }
    255260        }
    256261        return false;
Note: See TracChangeset for help on using the changeset viewer.