Changeset 17876 in josm

Timestamp:

2021-05-06T22:37:43+02:00 (3 years ago)

Author:

simon04

Message:

fix #20851, see #20842 - Tagging presets: value_template="..." for conditional template

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/osm/Tagged.java (modified) (2 diffs)
• src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetItemGuiSupport.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetItemGuiSupportTest.java (modified) (2 diffs)

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

@@ -6 +6 @@
 import java.util.Map;
 import java.util.Objects;
+import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -234 +235 @@
     }
 
+
+    /**
+     * Returns a Tagged instance for the given tag collection
+     * @param tags the tag collection
+     * @return a Tagged instance for the given tag collection
+     */
+    static Tagged ofTags(Collection<Tag> tags) {
+        return ofMap(tags.stream().collect(Collectors.toMap(Tag::getKey, Tag::getValue, (a, b) -> a)));
+    }
+
     /**
      * Returns a Tagged instance for the given tag map

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

@@ -4 +4 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Tag;
+import org.openstreetmap.josm.data.osm.Tagged;
 import org.openstreetmap.josm.data.osm.search.SearchCompiler;
 import org.openstreetmap.josm.gui.tagging.presets.items.KeyedItem;
@@ -107 +108 @@
     @Override
     public boolean evaluateCondition(SearchCompiler.Match condition) {
-        throw new UnsupportedOperationException();
+        Tagged tagged = Tagged.ofTags(changedTagsSupplier.get());
+        return condition.match(tagged);
     }
 

trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetItemGuiSupportTest.java

@@ -37 +37 @@
     void testTemplate() throws Exception {
         ArrayList<Tag> tags = new ArrayList<>(Arrays.asList(
+                new Tag("route", "bus"),
                 new Tag("name", "xxx"),
                 new Tag("from", "Foo"),
@@ -46 +47 @@
         TemplateEntry templateEntry = new TemplateParser("Bus {ref}: {from} -> {to}").parse();
         assertEquals("Bus 42: Foo -> Bar", templateEntry.getText(support));
+        templateEntry = new TemplateParser("?{route=train 'Train'|route=bus 'Bus'|'X'} {ref}: {from} -> {to}").parse();
+        assertEquals("Bus 42: Foo -> Bar", templateEntry.getText(support));
     }
 }