Ticket #5706: 5706.ignore-spaces.patch

data/defaultpresets.xml

@@ -78 +78 @@
   value_off: the value to set when unchecked (default is 'no')
 
 role: type to specify possible roles in relations
-  key: the role name used in relation
+  key: comma separated list of role names used in relation
   text: fixed label to display
   requisite: "optional" or "required" (default is optional)
   count: how often can the role occur (if not given unlimited number is assumed)
@@ -4160 +4160 @@
             </optional>
             <roles>
                 <role key="" text="route segment" requisite="optional" type="way" />
-                <role key="forward" text="forward segment" requisite="optional" type="way" />
-                <role key="backward" text="backward segment" requisite="optional" type="way" />
+                <role key="forward,backward" text="forward/backward segment" requisite="optional" type="way" />
                 <role key="stop" text="halt point" requisite="optional" type="node" />
-                <role key="forward_stop" text="forward halt point" requisite="optional" type="node" />
-                <role key="backward_stop" text="backward halt point" requisite="optional" type="node" />
+                <role key="forward_stop,backward_stop" text="forward/backward_stop halt point" requisite="optional" type="node" />
+                <role key="north,south,east,west" text="(for North America)" requisite="optional" type="way" />
             </roles>
         </item>
         <item name="Route network" icon="presets/path.png" type="relation">

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

@@ -109 +109 @@
                 RoleInfo ri = map.get(s);
                 if (ri == null) {
                     ri = new RoleInfo();
+                    map.put(s, ri);
                 }
                 ri.total++;
                 if (m.isRelation()) {
@@ -124 +125 @@
                 else if (m.isNode()) {
                     ri.nodes++;
                 }
-                map.put(s, ri);
             }
             if(map.isEmpty()) {
                 errors.add( new TestError(this, Severity.ERROR, tr("Relation is empty"),
@@ -132 +132 @@
             } else {
                 LinkedList<String> done = new LinkedList<String>();
                 for (TaggingPreset.Role r : allroles) {
-                    done.add(r.key);
-                    String keyname = r.key;
+                    for (String keyname : r.key.split(",")) {
+                        keyname = keyname.trim();
+                        done.add(keyname);
+                        RoleInfo ri = map.get(keyname);
                     if ("".equals(keyname)) {
                         keyname = tr("<empty>");
                     }
-                    RoleInfo ri = map.get(r.key);
                     long count = (ri == null) ? 0 : ri.total;
                     long vc = r.getValidCount(count);
                     if (count != vc) {
@@ -164 +165 @@
                                 tr(s, keyname), MessageFormat.format(s, keyname), WRONG_TYPE, n) );
                     }
                 }
+                }
                 for (String key : map.keySet()) {
                     if (!done.contains(key)) {
                         if (key.length() > 0) {