Changeset 7523 in josm

Timestamp:

2014-09-11T15:40:26+02:00 (10 years ago)

Author:

Don-vip

Message:

fix #10398 - clarify warning about missing public_transport:version tag in route relations

File:

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

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

@@ -100 +100 @@
                 && n.hasTag("route", "train", "subway", "monorail", "tram", "bus", "trolleybus", "aerialway", "ferry")) {
             errors.add(new TestError(this, Severity.WARNING,
-                    tr("Route scheme (public_transport or legacy) is unspecified. Add {0}", "public_transport:version"),
+                    tr("Route scheme is unspecified. Add {0} ({1}=public_transport; {2}=legacy)", "public_transport:version", "2", "1"),
                     RELATION_UNKNOWN, n));
         } else if (allroles.isEmpty()) {
             errors.add(new TestError(this, Severity.WARNING, tr("Relation type is unknown"), RELATION_UNKNOWN, n));
-        } else {
-            HashMap<String, RoleInfo> map = buildRoleInfoMap(n);
-            if (map.isEmpty()) {
-                errors.add(new TestError(this, Severity.ERROR, tr("Relation is empty"), RELATION_EMPTY, n));
-            } else {
-                checkRoles(n, allroles, map);
-            }
+        }
+
+        HashMap<String, RoleInfo> map = buildRoleInfoMap(n);
+        if (map.isEmpty()) {
+            errors.add(new TestError(this, Severity.ERROR, tr("Relation is empty"), RELATION_EMPTY, n));
+        } else if (!allroles.isEmpty()) {
+            checkRoles(n, allroles, map);
         }
     }