Changeset 33993 in osm

Timestamp:

2018-01-11T00:07:20+01:00 (7 years ago)

Author:

donvip

Message:

handle multiple levels of wikipedia article redirections when searching for their wikidata items

Location:

applications/editors/josm/plugins/wikipedia

Files:

• .settings/org.eclipse.core.resources.prefs (added)
• src/org/wikipedia/WikipediaApp.java (modified) (2 diffs)
• test/unit/org/wikipedia/WikipediaAppTest.java (modified) (1 diff)

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

@@ -35 +35 @@
 import org.openstreetmap.josm.tools.HttpClient;
 import org.openstreetmap.josm.tools.Logging;
+import org.openstreetmap.josm.tools.Pair;
 import org.openstreetmap.josm.tools.Utils;
 import org.w3c.dom.Document;
@@ -258 +259 @@
                 .collect(Collectors.toList());
         if (!unresolved.isEmpty()) {
-            final Map<String, String> redirects = resolveRedirectsForArticles(unresolved);
-            final Map<String, String> result2 = getWikidataForArticles0(redirects.values());
+            doResolveWikidataItems(unresolved, result);
+        }
+        return result;
+    }
+
+    private Pair<Map<String, String>, Map<String, String>> doResolveWikidataItems(List<String> unresolved, Map<String, String> result) {
+        final Map<String, String> redirects = resolveRedirectsForArticles(unresolved);
+        final Map<String, String> result2 = getWikidataForArticles0(redirects.values());
+        final List<String> unresolved2 = new ArrayList<>();
+        redirects.forEach((original, resolved) -> {
+            if (result2.containsKey(resolved)) {
+                result.put(original, result2.get(resolved));
+            } else if (!Objects.equals(original, resolved)) {
+                // Handle double redirection like USA -> United States of America -> United States (as of 9th January 2018)
+                unresolved2.add(resolved);
+            }
+        });
+        if (!unresolved2.isEmpty()) {
+            Pair<Map<String, String>, Map<String, String>> p = doResolveWikidataItems(unresolved2, result);
             redirects.forEach((original, resolved) -> {
-                if (result2.containsKey(resolved)) {
-                    result.put(original, result2.get(resolved));
+                if (!result2.containsKey(resolved)) {
+                    p.a.forEach((original2, resolved2) -> {
+                        if (p.b.containsKey(resolved2)) {
+                            result.put(original, p.b.get(resolved2));
+                        }
+                    });
                 }
             });
         }
-        return result;
+        return Pair.create(redirects, result2);
     }
 

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

@@ -124 +124 @@
         assertThat(map.get("einstein"), is("Q937"));
         assertThat(map.get("USA"), is("Q30"));
-        assertThat(map.size(), is(2));
+        assertThat(map.size(), is(3));
     }