Changeset 35146 in osm for applications

Timestamp:

2019-09-27T14:43:08+02:00 (5 years ago)

Author:

donvip

Message:

fix wikimedia commons regex, add case insensitiveness

Location:

applications/editors/josm/plugins/tag2link

Files:

• resources/tag2link_sources.xml (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/plugins/tag2link/Tag2LinkRuleCheckerTest.java (modified) (1 diff)

applications/editors/josm/plugins/tag2link/resources/tag2link_sources.xml

@@ -50 +50 @@
         </rule>
         <rule>
-            <condition k="image" v="File:.*"/>
+            <condition k="image" v="(?i:File|Category):.*"/>
             <link name="View image" href="https://commons.wikimedia.org/wiki/%v%" />
         </rule>
@@ -69 +69 @@
         </rule>
         <rule>
-            <condition k="wikimedia_commons" v="(File|Category):.*"/>
+            <condition k="wikimedia_commons" v="(?i:File):.*"/>
             <link name="View Commons file" href="https://commons.wikimedia.org/wiki/%v%" />
         </rule>
         <rule>
-            <condition k="wikimedia_commons" v="Category:.*"/>
+            <condition k="wikimedia_commons" v="(?i:Category):.*"/>
             <link name="View Commons category" href="https://commons.wikimedia.org/wiki/%v%" />
         </rule>

applications/editors/josm/plugins/tag2link/test/unit/org/openstreetmap/josm/plugins/tag2link/Tag2LinkRuleCheckerTest.java

@@ -19 +19 @@
     @Test
     public void testImageCommons() {
-        final Collection<Link> links = Tag2LinkRuleChecker.getLinks(new Tag("image", "File:Witten Brücke Gasstraße.jpg"));
+        Collection<Link> links = Tag2LinkRuleChecker.getLinks(new Tag("image", "File:Witten Brücke Gasstraße.jpg"));
         assertEquals(1, links.size());
         assertEquals("https://commons.wikimedia.org/wiki/File%3AWitten_Br%C3%BCcke_Gasstra%C3%9Fe.jpg", links.iterator().next().url);
+        links = Tag2LinkRuleChecker.getLinks(new Tag("image", "category:JOSM"));
+        assertEquals(1, links.size());
+        assertEquals("https://commons.wikimedia.org/wiki/category%3AJOSM", links.iterator().next().url);
     }