Changeset 16616 in josm for trunk/src/org/openstreetmap

Timestamp:

2020-06-14T11:24:35+02:00 (4 years ago)

Author:

simon04

Message:

fix #19380 - RelationChecker: improve validation message "Role verification problem - Role 'route' is not among expected values '<empty>/guidepost'"

File:

• trunk/src/org/openstreetmap/josm/data/validation/tests/RelationChecker.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/validation/tests/RelationChecker.java

@@ -44 +44 @@
 
     // CHECKSTYLE.OFF: SingleSpaceSeparator
-    /** Role ''{0}'' is not in templates ''{1}'' */
+    /** Role ''{0}'' is not among expected values ''{1}'' */
     public static final int ROLE_UNKNOWN     = 1701;
     /** Empty role found when expecting one of ''{0}'' */
@@ -320 +320 @@
         for (String key : map.keySet()) {
             if (allroles.keySet().stream().noneMatch(role -> role.isRole(key))) {
-                String templates = allroles.keySet().stream().map(r -> r.key).collect(Collectors.joining("/"));
+                String templates = allroles.keySet().stream()
+                        .map(r -> r.key)
+                        .map(r -> r == null || r.isEmpty() ? tr("<empty>") : r)
+                        .distinct()
+                        .collect(Collectors.joining("/"));
                 List<OsmPrimitive> primitives = new ArrayList<>(n.findRelationMembers(key));
                 primitives.add(0, n);
@@ -326 +330 @@
                 if (!key.isEmpty()) {
                     errors.add(TestError.builder(this, Severity.WARNING, ROLE_UNKNOWN)
-                            .message(ROLE_VERIF_PROBLEM_MSG, marktr("Role ''{0}'' is not in templates ''{1}''"), key, templates)
+                            .message(ROLE_VERIF_PROBLEM_MSG, marktr("Role ''{0}'' is not among expected values ''{1}''"), key, templates)
                             .primitives(primitives)
                             .build());