Changeset 32887 in osm for applications/editors/josm/plugins/wikipedia/src/org/wikipedia/WikipediaApp.java

Timestamp:

2016-08-30T10:52:38+02:00 (8 years ago)

Author:

simon04

Message:

JOSM/wikipedia: reorganize (separate classes, packages)

File:

• applications/editors/josm/plugins/wikipedia/src/org/wikipedia/WikipediaApp.java (modified) (16 diffs)

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

@@ -12 +12 @@
 import java.util.Collection;
 import java.util.Collections;
-import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
@@ -19 +18 @@
 import java.util.Objects;
 import java.util.TreeMap;
-import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
@@ -31 +29 @@
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.data.osm.Tag;
 import org.openstreetmap.josm.gui.datatransfer.ClipboardUtils;
-import org.openstreetmap.josm.tools.AlphanumComparator;
-import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.openstreetmap.josm.tools.HttpClient;
 import org.openstreetmap.josm.tools.Utils;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
+import org.wikipedia.data.WikidataEntry;
+import org.wikipedia.data.WikipediaEntry;
+import org.wikipedia.data.WikipediaLangArticle;
+import org.wikipedia.tools.XPath;
 
 public final class WikipediaApp {
@@ -56 +55 @@
     }
 
-    static String getSiteUrl(String wikipediaLang) {
+    public static String getSiteUrl(String wikipediaLang) {
         if ("wikidata".equals(wikipediaLang)) {
             return "https://www.wikidata.org";
@@ -64 +63 @@
     }
 
-    static List<WikipediaEntry> getEntriesFromCoordinates(String wikipediaLang, LatLon min, LatLon max) {
+    public static List<WikipediaEntry> getEntriesFromCoordinates(String wikipediaLang, LatLon min, LatLon max) {
         try {
             // construct url
@@ -99 +98 @@
     }
 
-    static List<WikidataEntry> getWikidataEntriesForQuery(final String languageForQuery, final String query, final Locale localeForLabels) {
+    public static List<WikidataEntry> getWikidataEntriesForQuery(final String languageForQuery, final String query, final Locale localeForLabels) {
         try {
             final String url = "https://www.wikidata.org/w/api.php" +
@@ -120 +119 @@
     }
 
-    static List<WikipediaEntry> getEntriesFromCategory(String wikipediaLang, String category, int depth) {
+    public static List<WikipediaEntry> getEntriesFromCategory(String wikipediaLang, String category, int depth) {
         try {
             final String url = "https://tools.wmflabs.org/cats-php/"
@@ -138 +137 @@
     }
 
-    static List<WikipediaEntry> getEntriesFromClipboard(final String wikipediaLang) {
+    public static List<WikipediaEntry> getEntriesFromClipboard(final String wikipediaLang) {
         return Pattern.compile("[\\n\\r]+")
                 .splitAsStream(ClipboardUtils.getClipboardStringContent())
@@ -145 +144 @@
     }
 
-    static void updateWIWOSMStatus(String wikipediaLang, List<WikipediaEntry> entries) {
+    public static void updateWIWOSMStatus(String wikipediaLang, List<WikipediaEntry> entries) {
         if (entries.size() > 20) {
             partitionList(entries, 20).forEach(chunk -> updateWIWOSMStatus(wikipediaLang, chunk));
@@ -179 +178 @@
     }
 
-    static Stream<String> getWikipediaArticles(final String wikipediaLang, OsmPrimitive p) {
+    public static Stream<String> getWikipediaArticles(final String wikipediaLang, OsmPrimitive p) {
         if ("wikidata".equals(wikipediaLang)) {
             return Stream.of(p.get("wikidata")).filter(Objects::nonNull);
@@ -194 +193 @@
      * Returns a map mapping wikipedia articles to wikidata ids.
      */
-    static Map<String, String> getWikidataForArticles(String wikipediaLang, List<String> articles) {
+    public static Map<String, String> getWikidataForArticles(String wikipediaLang, List<String> articles) {
         if (articles.size() > 50) {
             return partitionList(articles, 50).stream()
@@ -225 +224 @@
     }
 
-    static List<String> getCategoriesForPrefix(final String wikipediaLang, final String prefix) {
+    public static List<String> getCategoriesForPrefix(final String wikipediaLang, final String prefix) {
         try {
             final String url = getSiteUrl(wikipediaLang) + "/w/api.php"
@@ -247 +246 @@
     }
 
-    static String getLabelForWikidata(String wikidataId, Locale locale, String ... preferredLanguage) {
+    public static String getLabelForWikidata(String wikidataId, Locale locale, String... preferredLanguage) {
         try {
             final List<WikidataEntry> entry = Collections.singletonList(new WikidataEntry(wikidataId, null, null, null));
@@ -310 +309 @@
     }
 
-    static Collection<WikipediaLangArticle> getInterwikiArticles(String wikipediaLang, String article) {
+    public static Collection<WikipediaLangArticle> getInterwikiArticles(String wikipediaLang, String article) {
         try {
             final String url = getSiteUrl(wikipediaLang) + "/w/api.php" +
@@ -332 +331 @@
     }
 
-    static LatLon getCoordinateForArticle(String wikipediaLang, String article) {
+    public static LatLon getCoordinateForArticle(String wikipediaLang, String article) {
         try {
             final String url = getSiteUrl(wikipediaLang) + "/w/api.php" +
@@ -351 +350 @@
             throw new RuntimeException(ex);
         }
-    }
-
-    static class WikipediaLangArticle {
-
-        final String lang, article;
-
-        public WikipediaLangArticle(String lang, String article) {
-            this.lang = lang;
-            this.article = article;
-        }
-
-        public static WikipediaLangArticle parseFromUrl(String url) {
-            if (url == null) {
-                return null;
-            }
-            // decode URL for nicer value
-            url = Utils.decodeUrl(url);
-            // extract Wikipedia language and
-            final Matcher m = Pattern.compile("(https?:)?//(\\w*)\\.wikipedia\\.org/wiki/(.*)").matcher(url);
-            if (!m.matches()) {
-                return null;
-            }
-            return new WikipediaLangArticle(m.group(2), m.group(3));
-        }
-
-        public static WikipediaLangArticle parseTag(String key, String value) {
-            if (value == null) {
-                return null;
-            } else if (value.startsWith("http")) {
-                //wikipedia=http...
-                return parseFromUrl(value);
-            } else if (value.contains(":")) {
-                //wikipedia=[lang]:[article]
-                //wikipedia:[lang]=[lang]:[article]
-                final String[] item = Utils.decodeUrl(value).split(":", 2);
-                final String article = item[1].replace("_", " ");
-                return new WikipediaLangArticle(item[0], article);
-            } else if (key.startsWith("wikipedia:")) {
-                //wikipedia:[lang]=[lang]:[article]
-                //wikipedia:[lang]=[article]
-                final String lang = key.split(":", 2)[1];
-                final String[] item = Utils.decodeUrl(value).split(":", 2);
-                final String article = item[item.length == 2 ? 1 : 0].replace("_", " ");
-                return new WikipediaLangArticle(lang, article);
-            } else {
-                return null;
-            }
-        }
-
-        @Override
-        public String toString() {
-            return lang + ":" + article;
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            if (this == o) return true;
-            if (o == null || getClass() != o.getClass()) return false;
-            final WikipediaLangArticle that = (WikipediaLangArticle) o;
-            return Objects.equals(lang, that.lang) &&
-                    Objects.equals(article, that.article);
-        }
-
-        @Override
-        public int hashCode() {
-            return Objects.hash(lang, article);
-        }
-    }
-
-    static class WikipediaEntry implements Comparable<WikipediaEntry> {
-
-        final String label;
-        final String wikipediaLang, wikipediaArticle;
-        final LatLon coordinate;
-        private Boolean wiwosmStatus;
-
-        WikipediaEntry(String wikipediaLang, String wikipediaArticle) {
-            this(wikipediaLang, wikipediaArticle, null, null);
-        }
-
-        WikipediaEntry(String wikipediaLang, String wikipediaArticle, String label, LatLon coordinate) {
-            this.label = label;
-            this.wikipediaLang = wikipediaLang;
-            this.wikipediaArticle = wikipediaArticle;
-            this.coordinate = coordinate;
-        }
-
-        protected Tag createWikipediaTag() {
-            return new Tag("wikipedia", wikipediaLang + ":" + wikipediaArticle);
-        }
-
-        public void setWiwosmStatus(Boolean wiwosmStatus) {
-            this.wiwosmStatus = wiwosmStatus;
-        }
-
-        public Boolean getWiwosmStatus() {
-            return wiwosmStatus;
-        }
-
-        public String getBrowserUrl() {
-            return getSiteUrl(wikipediaLang) + "/wiki/" + Utils.encodeUrl(wikipediaArticle.replace(" ", "_"));
-        }
-
-        public String getLabelText() {
-            return wikipediaArticle;
-        }
-
-        @Override
-        public String toString() {
-            return wikipediaArticle;
-        }
-
-        @Override
-        public int compareTo(WikipediaEntry o) {
-            return Comparator
-                    .<WikipediaEntry, String>comparing(x -> x.label, AlphanumComparator.getInstance())
-                    .thenComparing(x -> x.wikipediaArticle, AlphanumComparator.getInstance())
-                    .compare(this, o);
-        }
-    }
-
-    static class WikidataEntry extends WikipediaEntry {
-
-        final String description;
-
-        WikidataEntry(String id, String label, LatLon coordinate, String description) {
-            super("wikidata", id, label, coordinate);
-            this.description = description;
-            ensureValidWikidataId(id);
-        }
-
-        @Override
-        protected Tag createWikipediaTag() {
-            return new Tag("wikidata", wikipediaArticle);
-        }
-
-        @Override
-        public String getLabelText() {
-            final String descriptionInParen = description == null ? "" : (" (" + description + ")");
-            return getLabelText(label, wikipediaArticle + descriptionInParen);
-        }
-
-        static String getLabelText(String bold, String gray) {
-            return Utils.escapeReservedCharactersHTML(bold) + " <span color='gray'>" + Utils.escapeReservedCharactersHTML(gray) + "</span>";
-        }
-    }
-
-    static void ensureValidWikidataId(String id) {
-        CheckParameterUtil.ensureThat(WIKIDATA_PATTERN.matcher(id).matches(), "Invalid Wikidata ID given: " + id);
     }