Changeset 33070 in osm for applications/editors/josm/plugins

Timestamp:

2016-11-17T23:29:10+01:00 (8 years ago)

Author:

simon04

Message:

JOSM/wikipedia: fix ISE: Duplicate key again - #josm13991

Location:

applications/editors/josm/plugins/wikipedia

Files:

• src/org/wikipedia/WikipediaApp.java (modified) (1 diff)
• test/unit/org/wikipedia/WikipediaAppTest.java (modified) (3 diffs)

applications/editors/josm/plugins/wikipedia/src/org/wikipedia/WikipediaApp.java

@@ -216 +216 @@
                     final String wikidata = X_PATH.evaluateString("./@id", node);
                     final String wikipedia = X_PATH.evaluateString("./sitelinks/sitelink/@title", node);
-                    r.put(wikipedia, wikidata);
+                    if (WIKIDATA_PATTERN.matcher(wikidata).matches()) { // non existing entries result in negative integers
+                        r.put(wikipedia, wikidata);
+                    }
                 });
             }

applications/editors/josm/plugins/wikipedia/test/unit/org/wikipedia/WikipediaAppTest.java

@@ -8 +8 @@
 import org.wikipedia.data.WikipediaEntry;
 
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -116 +115 @@
         assertThat(map.get("Völs, Tyrol"), is("Q278250"));
         assertThat(map.get("a-non-existing-article"), nullValue());
-        assertThat(map.size(), is(4));
+        assertThat(map.size(), is(3));
     }
 
@@ -124 +123 @@
                 Stream.iterate("London", x -> x).limit(100).collect(Collectors.toList()));
         assertThat(map, is(Collections.singletonMap("London", "Q84")));
+        final List<String> articles = IntStream.range(0, 200)
+                .mapToObj(i -> "a-non-existing-article-" + i)
+                .collect(Collectors.toList());
+        assertTrue(WikipediaApp.getWikidataForArticles("en", articles).isEmpty());
     }