Changeset 32625 in osm for applications/editors/josm

Timestamp:

2016-07-10T22:56:57+02:00 (8 years ago)

Author:

simon04

Message:

JOSM/wikipedia: add search Wikidata items - #josm12039

Location:

applications/editors/josm/plugins/wikipedia

Files:

• src/org/wikipedia/Debouncer.java (added)
• src/org/wikipedia/WikidataItemSearchDialog.java (added)
• src/org/wikipedia/WikipediaApp.java (modified) (1 diff)
• src/org/wikipedia/WikipediaPlugin.java (modified) (1 diff)
• src/org/wikipedia/WikipediaToggleDialog.java (modified) (4 diffs)
• test/unit/org/wikipedia/WikipediaAppTest.java (modified) (1 diff)

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

@@ -121 +121 @@
     }
 
+    static List<WikidataEntry> getWikidataEntriesForQuery(final String language, final String query) {
+        try {
+            final String url = "https://www.wikidata.org/w/api.php" +
+                    "?action=wbsearchentities" +
+                    "&language=" + language +
+                    "&strictlanguage=false" +
+                    "&search=" + Utils.encodeUrl(query) +
+                    "&limit=50" +
+                    "&format=xml";
+            final List<WikidataEntry> r = new ArrayList<>();
+            try (final InputStream in = HttpClient.create(new URL(url)).setReasonForRequest("Wikipedia").connect().getContent()) {
+                final Document xml = DOCUMENT_BUILDER.parse(in);
+                final NodeList nodes = (NodeList) X_PATH.compile("//entity").evaluate(xml, XPathConstants.NODESET);
+                final XPathExpression xpathId = X_PATH.compile("@id");
+                final XPathExpression xpathLabel = X_PATH.compile("@label");
+                for (int i = 0; i < nodes.getLength(); i++) {
+                    final Node node = nodes.item(i);
+                    final String id = (String) xpathId.evaluate(node, XPathConstants.STRING);
+                    final String label = (String) xpathLabel.evaluate(node, XPathConstants.STRING);
+                    r.add(new WikidataEntry(id, label, null));
+                }
+            }
+            return r;
+        } catch (Exception ex) {
+            throw new RuntimeException(ex);
+        }
+    }
+
     static List<WikipediaEntry> getEntriesFromCategory(String wikipediaLang, String category, int depth) {
         try {

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

@@ -15 +15 @@
         MainMenu.add(Main.main.menu.dataMenu, new WikipediaAddNamesAction());
         MainMenu.add(Main.main.menu.dataMenu, new FetchWikidataAction());
+        MainMenu.add(Main.main.menu.dataMenu, new WikidataItemSearchDialog.Action());
     }
 

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

@@ -55 +55 @@
                 new SideButton(new WikipediaLoadCategoryAction()),
                 new SideButton(new PasteWikipediaArticlesAction()),
-                new SideButton(new AddWikipediaTagAction()),
+                new SideButton(new AddWikipediaTagAction(list)),
                 new SideButton(new WikipediaSettingsAction(), false)));
         updateTitle();
@@ -61 +61 @@
     /** A string describing the context (use-case) for determining the dialog title */
     String titleContext = null;
-    final StringProperty wikipediaLang = new StringProperty("wikipedia.lang", LanguageInfo.getJOSMLocaleCode().substring(0, 2));
+    static final StringProperty wikipediaLang = new StringProperty("wikipedia.lang", LanguageInfo.getJOSMLocaleCode().substring(0, 2));
     final Set<String> articles = new HashSet<>();
     final DefaultListModel<WikipediaEntry> model = new DefaultListModel<>();
@@ -287 +287 @@
     }
 
-    class AddWikipediaTagAction extends AbstractAction {
-
-        public AddWikipediaTagAction() {
+    static class AddWikipediaTagAction extends AbstractAction {
+
+        private final JList<WikipediaEntry> list;
+
+        public AddWikipediaTagAction(JList<WikipediaEntry> list) {
             super(tr("Add Tag"));
+            this.list = list;
             new ImageProvider("pastetags").getResource().attachImageIcon(this, true);
             putValue(SHORT_DESCRIPTION, tr("Adds a ''wikipedia'' tag corresponding to this article to the selected objects"));
@@ -297 +300 @@
         @Override
         public void actionPerformed(ActionEvent e) {
-            if (list.getSelectedValue() != null) {
-                Tag tag = ((WikipediaEntry) list.getSelectedValue()).createWikipediaTag();
-                if (tag != null) {
-                    final Collection<OsmPrimitive> selected = Main.getLayerManager().getEditDataSet().getSelected();
-                    if (!GuiUtils.confirmOverwrite(tag.getKey(), tag.getValue(), selected)) {
-                        return;
-                    }
-                    ChangePropertyCommand cmd = new ChangePropertyCommand(
-                            selected,
-                            tag.getKey(), tag.getValue());
-                    Main.main.undoRedo.add(cmd);
-                    Main.worker.submit(new FetchWikidataAction.Fetcher(selected));
-                }
-            }
+            addTag(list.getSelectedValue());
+        }
+
+        static void addTag(WikipediaEntry entry) {
+            if (entry == null) {
+                return;
+            }
+            addTag(entry.createWikipediaTag());
+        }
+
+        static void addTag(Tag tag) {
+            if (tag == null) {
+                return;
+            }
+            final Collection<OsmPrimitive> selected = Main.getLayerManager().getEditDataSet().getSelected();
+            if (!GuiUtils.confirmOverwrite(tag.getKey(), tag.getValue(), selected)) {
+                return;
+            }
+            ChangePropertyCommand cmd = new ChangePropertyCommand(
+                    selected,
+                    tag.getKey(), tag.getValue());
+            Main.main.undoRedo.add(cmd);
+            Main.worker.submit(new FetchWikidataAction.Fetcher(selected));
         }
     }

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

@@ -147 +147 @@
             }
         }));
+    }
+
+    @Test
+    public void testForQuery() throws Exception {
+        final List<WikipediaApp.WikidataEntry> entries = WikipediaApp.getWikidataEntriesForQuery("de", "Österreich");
+        assertThat(entries.get(0).wikipediaArticle, is("Q40"));
+        assertThat(entries.get(0).wikipediaLang, is("wikidata"));
+        // assertThat(entries.get(0).label, is("Österreich"));
     }