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

Timestamp:

2016-07-17T19:01:53+02:00 (8 years ago)

Author:

simon04

Message:

JOSM/wikipedia: add prefix search for categories

Location:

applications/editors/josm/plugins/wikipedia

Files:

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

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

@@ -11 +11 @@
 import java.util.Collection;
 import java.util.Collections;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
 import java.util.TreeSet;
-import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 
@@ -31 +29 @@
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionListItem;
 import org.openstreetmap.josm.gui.util.GuiHelper;
-import org.openstreetmap.josm.gui.widgets.SearchTextResultListPanel;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.Predicate;
@@ -120 +117 @@
     }
 
-    private static class Selector extends SearchTextResultListPanel<WikipediaApp.WikidataEntry> {
-
-        final Debouncer debouncer = new Debouncer(
-                Executors.newSingleThreadScheduledExecutor(Utils.newThreadFactory("wikidata-search-%d", Thread.NORM_PRIORITY)));
+    private static class Selector extends WikiSearchTextResultListPanel<WikipediaApp.WikidataEntry> {
 
         Selector() {
@@ -135 +129 @@
                 }
             });
-        }
-
-        public WikipediaApp.WikidataEntry getSelectedItem() {
-            final WikipediaApp.WikidataEntry selected = lsResult.getSelectedValue();
-            if (selected != null) {
-                return selected;
-            } else if (!lsResultModel.isEmpty()) {
-                return lsResultModel.getElementAt(0);
-            } else {
-                return null;
-            }
         }
 

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

@@ -264 +264 @@
             }
             return r;
+        } catch (Exception ex) {
+            throw new RuntimeException(ex);
+        }
+    }
+
+    static List<String> getCategoriesForPrefix(final String wikipediaLang, final String prefix) {
+        try {
+            final String url = getSiteUrl(wikipediaLang) + "/w/api.php"
+                    + "?action=query"
+                    + "&list=prefixsearch"
+                    + "&format=xml"
+                    + "&psnamespace=14"
+                    + "&pslimit=50"
+                    + "&pssearch=" + Utils.encodeUrl(prefix);
+            // parse XML document
+            try (final InputStream in = HttpClient.create(new URL(url)).setReasonForRequest("Wikipedia").connect().getContent()) {
+                final Document doc = DOCUMENT_BUILDER.parse(in);
+                final NodeList nodes = (NodeList) X_PATH.compile("//ps/@title").evaluate(doc, XPathConstants.NODESET);
+                final List<String> categories = new ArrayList<>(nodes.getLength());
+                for (int i = 0; i < nodes.getLength(); i++) {
+                    final Node node = nodes.item(i);
+                    final String value = node.getNodeValue();
+                    categories.add(value.contains(":") ? value.split(":", 2)[1] : value);
+                }
+                return categories;
+            }
         } catch (Exception ex) {
             throw new RuntimeException(ex);

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

@@ -205 +205 @@
         @Override
         public void actionPerformed(ActionEvent e) {
-            final String category = JOptionPane.showInputDialog(
-                    Main.parent,
-                    tr("Enter the Wikipedia category"));
+            final WikipediaCategorySearchDialog categorySearchDialog = WikipediaCategorySearchDialog.getInstance();
+            categorySearchDialog.showDialog();
+            if (categorySearchDialog.getValue() != 1) {
+                return;
+            }
+            final String category = categorySearchDialog.getCategory();
             if (category == null) {
                 return;

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

@@ -6 +6 @@
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.tools.Predicate;
+import org.openstreetmap.josm.tools.Predicates;
 import org.openstreetmap.josm.tools.Utils;
 import org.wikipedia.WikipediaApp.WikipediaEntry;
@@ -214 +215 @@
         assertThat(entry3.getWiwosmStatus(), is(false));
     }
+
+    @Test
+    public void testCategoriesForPrefix() throws Exception {
+        final List<String> categories = WikipediaApp.getCategoriesForPrefix("de", "Gemeinde in Öster");
+        assertTrue(Utils.exists(categories, Predicates.equalTo("Gemeinde in Österreich")));
+    }
 }