Changeset 11989 in josm for trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/Roles.java

Timestamp:

2017-04-23T22:55:45+02:00 (7 years ago)

Author:

stoecker

Message:

add support for type=building relation and support variable role names using regexp (level_0, level_1, ...)

File:

• trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/Roles.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/Roles.java

@@ -29 +29 @@
         /** Role name used in a relation */
         public String key; // NOSONAR
+        /** Is the role name a regular expression */
+        public boolean regexp; // NOSONAR
         /** The text to display */
         public String text; // NOSONAR
@@ -37 +39 @@
         /** An expression (cf. search dialog) for objects of this role */
         public SearchCompiler.Match memberExpression; // NOSONAR
-
+        /** Is this role required at least once in the relation? */
         public boolean required; // NOSONAR
+        /** How often must the element appear */
         private long count;
 
@@ -50 +53 @@
             } else if (!"optional".equals(str))
                 throw new SAXException(tr("Unknown requisite: {0}", str));
+        }
+
+        public void setRegexp(String str) throws SAXException {
+            if ("true".equals(str)) {
+                regexp = true;
+            } else if (!"false".equals(str))
+                throw new SAXException(tr("Unknown regexp value: {0}", str));
         }
 
@@ -83 +93 @@
             else
                 return c != 0 ? c : 1;
+        }
+
+        /**
+         * Check if the given role matches this class (required to check regexp role types)
+         * @param role role to check
+         * @return <code>true</code> if role matches
+         * @since 11989
+         */
+        public boolean isRole(String role) {
+            if (regexp && role != null) { // pass null through, it will anyway fail
+                
+                return role.matches(this.key);
+            }
+            return this.key.equals(role);
         }