Changeset 32608 in osm for applications/editors/josm/plugins/wikipedia

Timestamp:

2016-07-08T19:58:16+02:00 (8 years ago)

Author:

simon04

Message:

JOSM/wikipedia: fetch multiple Wikidata labels at once

Location:

applications/editors/josm/plugins/wikipedia

Files:

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

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

@@ -10 +10 @@
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
@@ -218 +219 @@
 
     static String getLabelForWikidata(String wikidataId, Locale locale, String ... preferredLanguage) {
-        try {
-            CheckParameterUtil.ensureThat(WIKIDATA_PATTERN.matcher(wikidataId).matches(), "Invalid Wikidata ID given");
+        return getLabelForWikidata(Collections.singleton(wikidataId), locale, preferredLanguage).get(wikidataId);
+    }
+
+    static Map<String, String> getLabelForWikidata(Collection<String> wikidataIds, Locale locale, String ... preferredLanguage) {
+        try {
+            for (final String wikidataId : wikidataIds) {
+                ensureValidWikidataId(wikidataId);
+            }
             final String url = "https://www.wikidata.org/w/api.php" +
                     "?action=wbgetentities" +
                     "&props=labels" +
-                    "&ids=" + wikidataId +
+                    "&ids=" + Utils.join("|", wikidataIds) +
                     "&format=xml";
             final Collection<String> languages = new ArrayList<>();
@@ -232 +239 @@
             languages.addAll(Arrays.asList(preferredLanguage));
             languages.add("en");
+            languages.add(null);
+            final Map<String, String> r = new HashMap<>();
             try (final InputStream in = HttpClient.create(new URL(url)).setReasonForRequest("Wikipedia").connect().getContent()) {
                 final Document xml = DOCUMENT_BUILDER.parse(in);
-                for (String language : languages) {
-                    final String label = (String) X_PATH.compile("//label[@language='" + language + "']/@value")
-                            .evaluate(xml, XPathConstants.STRING);
-                    if (label != null && !label.isEmpty()) {
-                         return label;
+                for (final String wikidataId : wikidataIds) {
+                    final Node entity = (Node) X_PATH.compile("//entity[@id='" + wikidataId + "']").evaluate(xml, XPathConstants.NODE);
+                    for (String language : languages) {
+                        final String label = (String) X_PATH.compile(language != null
+                                ? "./labels/label[@language='" + language + "']/@value"
+                                : "./labels/label/@value"
+                        ).evaluate(entity, XPathConstants.STRING);
+                        if (label != null && !label.isEmpty()) {
+                            r.put(wikidataId, label);
+                            break;
+                        }
                     }
                 }
-                final String fallBackLabel = (String) X_PATH.compile("//label/@value").evaluate(xml, XPathConstants.STRING);
-                return fallBackLabel == null || fallBackLabel.isEmpty() ? null : fallBackLabel;
-            }
+            }
+            return r;
         } catch (Exception ex) {
             throw new RuntimeException(ex);
@@ -409 +423 @@
     }
 
+    static void ensureValidWikidataId(String id) {
+        CheckParameterUtil.ensureThat(WIKIDATA_PATTERN.matcher(id).matches(), "Invalid Wikidata ID given: " + id);
+    }
+
     public static <T> List<List<T>> partitionList(final List<T> list, final int size) {
         return new AbstractList<List<T>>() {

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

@@ -168 +168 @@
         // not found -> null
         assertThat(WikipediaApp.getLabelForWikidata("Q" + Long.MAX_VALUE, Locale.ENGLISH), nullValue());
+        final Map<String, String> twoLabels = WikipediaApp.getLabelForWikidata(Arrays.asList("Q84", "Q1741"), Locale.GERMAN);
+        assertThat(twoLabels.get("Q84"), is("London"));
+        assertThat(twoLabels.get("Q1741"), is("Wien"));
     }