Changeset 17662 in josm for trunk/src/org

Timestamp:

2021-03-25T00:28:04+01:00 (3 years ago)

Author:

simon04

Message:

fix #19012 - Tagging presets: additional matching criteria via <item match_expression="...">

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/Tagged.java (modified) (1 diff)
• gui/tagging/presets/TaggingPreset.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/data/osm/Tagged.java

@@ -233 +233 @@
         return OsmUtils.isFalse(get(key));
     }
+
+    /**
+     * Returns a Tagged instance for the given tag map
+     * @param tags the tag map
+     * @return a Tagged instance for the given tag map
+     */
+    static Tagged ofMap(Map<String, String> tags) {
+        return new Tagged() {
+
+            @Override
+            public String get(String key) {
+                return tags.get(key);
+            }
+
+            @Override
+            public Map<String, String> getKeys() {
+                return tags;
+            }
+
+            @Override
+            public Collection<String> keySet() {
+                return tags.keySet();
+            }
+
+            @Override
+            public void put(String key, String value) {
+                tags.put(key, value);
+            }
+
+            @Override
+            public void setKeys(Map<String, String> keys) {
+                tags.putAll(keys);
+            }
+
+            @Override
+            public boolean hasKeys() {
+                return !tags.isEmpty();
+            }
+
+            @Override
+            public int getNumKeys() {
+                return tags.size();
+            }
+
+            @Override
+            public void remove(String key) {
+                tags.remove(key);
+            }
+
+            @Override
+            public void removeAll() {
+                tags.clear();
+            }
+        };
+    }
 }

trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPreset.java

@@ -48 +48 @@
 import org.openstreetmap.josm.data.osm.RelationMember;
 import org.openstreetmap.josm.data.osm.Tag;
+import org.openstreetmap.josm.data.osm.Tagged;
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.osm.search.SearchCompiler;
@@ -135 +136 @@
     public transient TemplateEntry nameTemplate;
     public transient Match nameTemplateFilter;
+    public transient Match matchExpression;
 
     /**
@@ -288 +290 @@
     }
 
+    public void setMatch_expression(String filter) throws SAXException {
+        try {
+            this.matchExpression = SearchCompiler.compile(filter);
+        } catch (SearchParseError e) {
+            Logging.error("Error while parsing" + filter + ": " + e.getMessage());
+            throw new SAXException(e);
+        }
+    }
+
     private static class PresetPanel extends JPanel {
         private boolean hasElements;
@@ -646 +657 @@
         if ((onlyShowable && !isShowable()) || !typeMatches(t)) {
             return false;
+        } else if (matchExpression != null && !matchExpression.match(Tagged.ofMap(tags))) {
+            return false;
         } else {
             return TaggingPresetItem.matches(data, tags);