Changeset 17006 in josm

Timestamp:

2020-09-03T21:50:29+02:00 (5 years ago)

Author:

simon04

Message:

fix #19754 - Tag2Link: support multi-values for wikimedia_commons

Location:

trunk

Files:

• src/org/openstreetmap/josm/tools/Tag2Link.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/tools/Tag2LinkTest.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/tools/Tag2Link.java

@@ -187 +187 @@
         }
         if (key.matches("(.*:)?wikidata")) {
-            OsmUtils.splitMultipleValues(value)
-                    .forEach(q -> linkConsumer.acceptLink(tr("View Wikidata item"), "https://www.wikidata.org/wiki/" + q, imageResource.get()));
+            OsmUtils.splitMultipleValues(value).forEach(q -> linkConsumer.acceptLink(
+                    tr("View Wikidata item"), "https://www.wikidata.org/wiki/" + q, imageResource.get()));
         }
         if (key.matches("(.*:)?species")) {
@@ -195 +195 @@
         }
         if (key.matches("wikimedia_commons|image") && value.matches("(?i:File):.*")) {
-            String url = "https://commons.wikimedia.org/wiki/" + value;
-            linkConsumer.acceptLink(tr("View image on Wikimedia Commons"), url, imageResource.get());
+            OsmUtils.splitMultipleValues(value).forEach(i -> linkConsumer.acceptLink(
+                    tr("View image on Wikimedia Commons"), "https://commons.wikimedia.org/wiki/" + i, imageResource.get()));
         }
         if (key.matches("wikimedia_commons|image") && value.matches("(?i:Category):.*")) {
-            String url = "https://commons.wikimedia.org/wiki/" + value;
-            linkConsumer.acceptLink(tr("View category on Wikimedia Commons"), url, imageResource.get());
+            OsmUtils.splitMultipleValues(value).forEach(i -> linkConsumer.acceptLink(
+                    tr("View category on Wikimedia Commons"), "https://commons.wikimedia.org/wiki/" + i, imageResource.get()));
         }
 

trunk/test/unit/org/openstreetmap/josm/tools/Tag2LinkTest.java

@@ -88 +88 @@
         Tag2Link.getLinksForTag("image", "File:Witten Brücke Gasstraße.jpg", this::addLink);
         checkLinks("View image on Wikimedia Commons // https://commons.wikimedia.org/wiki/File:Witten Brücke Gasstraße.jpg");
+        links.clear();
+        // non-regression test for #19754
+        Tag2Link.getLinksForTag("image", "File:Foo.jpg;File:Bar.jpg", this::addLink);
+        checkLinks("View image on Wikimedia Commons // https://commons.wikimedia.org/wiki/File:Foo.jpg",
+                "View image on Wikimedia Commons // https://commons.wikimedia.org/wiki/File:Bar.jpg");
     }