Changeset 28485 in osm for applications/editors/josm

Timestamp:

2012-07-14T10:53:58+02:00 (12 years ago)

Author:

simon04

Message:

JOSM/wikipedia: refactoring

Location:

applications/editors/josm/plugins/wikipedia/src/org/wikipedia

Files:

• WikipediaApp.java (added)
• WikipediaToggleDialog.java (modified) (9 diffs)

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

@@ -7 +7 @@
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URL;
-import java.net.URLDecoder;
-import java.net.URLEncoder;
-import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collection;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Map;
-import java.util.Scanner;
 import java.util.Set;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 import javax.swing.AbstractAction;
 import javax.swing.DefaultListCellRenderer;
@@ -30 +18 @@
 import javax.swing.JList;
 import javax.swing.JOptionPane;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.xpath.XPathConstants;
-import javax.xml.xpath.XPathExpression;
-import javax.xml.xpath.XPathFactory;
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.search.SearchAction;
@@ -53 +37 @@
 import org.openstreetmap.josm.tools.LanguageInfo;
 import org.openstreetmap.josm.tools.OpenBrowser;
-import org.openstreetmap.josm.tools.Utils;
-import org.w3c.dom.Document;
-import org.w3c.dom.NodeList;
+import org.wikipedia.WikipediaApp.WikipediaEntry;
 
 public class WikipediaToggleDialog extends ToggleDialog implements MapView.EditLayerChangeListener, DataSetListenerAdapter.Listener {
@@ -115 +97 @@
     };
 
-    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 = 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(1), m.group(2));
-        }
-    }
-
-    static class WikipediaEntry implements Comparable<WikipediaEntry> {
-
-        final String name, description;
-        final String wikipediaLang, wikipediaArticle;
-        final LatLon coordinate;
-        private Boolean wiwosmStatus;
-
-        public WikipediaEntry(String name, String description, LatLon coordinate) {
-            this.name = name;
-            this.description = description;
-            this.coordinate = coordinate;
-
-            final WikipediaLangArticle wp = WikipediaLangArticle.parseFromUrl(getHrefFromDescription());
-            if (wp == null) {
-                System.err.println("Could not extract Wikipedia tag from: " + getHrefFromDescription());
-            }
-            this.wikipediaLang = wp == null ? null : wp.lang;
-            this.wikipediaArticle = wp == null ? null : wp.article;
-        }
-
-        public WikipediaEntry(String name, String wikipediaLang, String wikipediaArticle) {
-            this.name = name;
-            this.description = null;
-            this.wikipediaLang = wikipediaLang;
-            this.wikipediaArticle = wikipediaArticle;
-            this.coordinate = null;
-        }
-
-        protected final String getHrefFromDescription() {
-            if (description == null) {
-                return null;
-            }
-            final Matcher m = Pattern.compile(".*href=\"(.+?)\".*").matcher(description);
-            if (m.matches()) {
-                return m.group(1);
-            } else {
-                System.err.println("Could not parse URL from: " + description);
-                return null;
-            }
-        }
-
-        protected final Tag createWikipediaTag() {
-            return new Tag("wikipedia", wikipediaLang + ":" + wikipediaArticle);
-        }
-
-        private void updateWiwosmStatus() {
-            try {
-                final String url = "http://toolserver.org/~master/osmjson/getGeoJSON.php?action=check"
-                        + "&lang=" + wikipediaLang
-                        + "&article=" + encodeURL(wikipediaArticle);
-                System.out.println("Wikipedia: GET " + url);
-                final Scanner scanner = new Scanner(new URL(url).openStream());
-                wiwosmStatus = scanner.hasNextInt() && scanner.nextInt() == 1;
-            } catch (IOException ex) {
-                throw new RuntimeException(ex);
-            }
-        }
-
-        public void setWiwosmStatus(Boolean wiwosmStatus) {
-            this.wiwosmStatus = wiwosmStatus;
-        }
-
-        public Boolean getWiwosmStatus() {
-            return wiwosmStatus;
-        }
-
-        @Override
-        public String toString() {
-            return name;
-        }
-
-        @Override
-        public int compareTo(WikipediaEntry o) {
-            return name.compareTo(o.name);
-        }
-    }
-
-    private void setWikipediaEntries(Collection<WikipediaEntry> entries) {
-        Collection<String> articleNames = new ArrayList<String>();
-        for (WikipediaEntry i : entries) {
-            articleNames.add(i.wikipediaArticle);
-        }
-        Map<String, Boolean> status = new HashMap<String, Boolean>();
-        if (!articleNames.isEmpty()) {
-            final String url = "http://toolserver.org/~master/osmjson/getGeoJSON.php?action=check"
-                    + "&lang=" + wikipediaLang.get()
-                    + "&articles=" + encodeURL(Utils.join(",", articleNames));
-            System.out.println("Wikipedia: GET " + url);
-
-            try {
-                final Scanner scanner = new Scanner(new URL(url).openStream()).useDelimiter("\n");
-                while (scanner.hasNext()) {
-                    //[article]\t[0|1]
-                    final String line = scanner.next();
-                    final String[] x = line.split("\t");
-                    if (x.length == 2) {
-                        status.put(x[0], "1".equals(x[1]));
-                    } else {
-                        System.err.println("Unknown element " + line);
-                    }
-                }
-            } catch (Exception ex) {
-                throw new RuntimeException(ex);
-            }
-        }
-
+    private void setWikipediaEntries(List<WikipediaEntry> entries) {
+        Collections.sort(entries);
+        WikipediaApp.updateWIWOSMStatus(wikipediaLang.get(), entries);
         model.clear();
         for (WikipediaEntry i : entries) {
-            i.setWiwosmStatus(status.get(i.wikipediaArticle));
             model.addElement(i);
         }
@@ -265 +119 @@
                 LatLon min = Main.map.mapView.getLatLon(0, Main.map.mapView.getHeight());
                 LatLon max = Main.map.mapView.getLatLon(Main.map.mapView.getWidth(), 0);
-                final String bbox = min.lon() + "," + min.lat() + "," + max.lon() + "," + max.lat();
-                // construct url
-                final String url = "http://toolserver.org/~kolossos/geoworld/marks.php?"
-                        + "bbox=" + bbox + "&LANG=" + wikipediaLang.get();
-                System.out.println("Wikipedia: GET " + url);
-                // parse XML document
-                final XPathExpression xpathPlacemark = XPathFactory.newInstance().newXPath().compile("//Placemark");
-                final XPathExpression xpathName = XPathFactory.newInstance().newXPath().compile("name/text()");
-                final XPathExpression xpathCoord = XPathFactory.newInstance().newXPath().compile("Point/coordinates/text()");
-                final XPathExpression xpathDescr = XPathFactory.newInstance().newXPath().compile("description");
-                Document doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(new URL(url).openStream());
-                NodeList nodes = (NodeList) xpathPlacemark.evaluate(doc, XPathConstants.NODESET);
-                // construct WikipediaEntry for each XML element
-                List<WikipediaEntry> entries = new ArrayList<WikipediaEntry>(nodes.getLength());
-                for (int i = 0; i < nodes.getLength(); i++) {
-                    final String[] coord = xpathCoord.evaluate(nodes.item(i)).split(",");
-                    if (coord.length <= 2) {
-                        continue;
-                    }
-                    final String name = xpathName.evaluate(nodes.item(i));
-                    final String descr = xpathDescr.evaluate(nodes.item(i));
-                    entries.add(new WikipediaEntry(name, descr,
-                            new LatLon(Double.parseDouble(coord[1]), Double.parseDouble(coord[0]))));
-                }
-                Collections.sort(entries);
+                List<WikipediaEntry> entries = WikipediaApp.getEntriesFromCoordinates(
+                        wikipediaLang.get(), min, max);
                 // add entries to list model
                 setWikipediaEntries(entries);
@@ -308 +139 @@
         @Override
         public void actionPerformed(ActionEvent e) {
-            try {
-                final String category = JOptionPane.showInputDialog(
-                        Main.parent,
-                        tr("Enter the Wikipedia category"));
-                if (category == null) {
-                    return;
-                }
-                final String url = "http://toolserver.org/~daniel/WikiSense/CategoryIntersect.php?"
-                        + "wikilang=" + wikipediaLang.get()
-                        + "&wikifam=.wikipedia.org"
-                        + "&basecat=" + encodeURL(category)
-                        + "&basedeep=3&templates=&mode=al&format=csv";
-                System.out.println("Wikipedia: GET " + url);
-                final Scanner scanner = new Scanner(new URL(url).openStream()).useDelimiter("\n");
-                final List<WikipediaEntry> entries = new ArrayList<WikipediaEntry>();
-                while (scanner.hasNext()) {
-                    final String article = scanner.next().split("\t")[1].replace("_", " ");
-                    entries.add(new WikipediaEntry(article, wikipediaLang.get(), article));
-                }
-                Collections.sort(entries);
-                setWikipediaEntries(entries);
-                setTitle(/* I18n: [language].Wikipedia.org: [category] */ tr("{0}.Wikipedia.org: {1}", wikipediaLang.get(), category));
-            } catch (IOException ex) {
-                throw new RuntimeException(ex);
-            }
+            final String category = JOptionPane.showInputDialog(
+                    Main.parent,
+                    tr("Enter the Wikipedia category"));
+            if (category == null) {
+                return;
+            }
+            List<WikipediaEntry> entries = WikipediaApp.getEntriesFromCategory(wikipediaLang.get(), category);
+            setWikipediaEntries(entries);
+            setTitle(/* I18n: [language].Wikipedia.org: [category] */ tr("{0}.Wikipedia.org: {1}", wikipediaLang.get(), category));
         }
     }
@@ -346 +161 @@
         public void actionPerformed(ActionEvent e) {
             if (list.getSelectedValue() != null) {
-                WikipediaEntry entry = (WikipediaEntry) list.getSelectedValue();
-                final String url;
-                if (entry.getHrefFromDescription() != null) {
-                    url = entry.getHrefFromDescription();
-                } else {
-                    url = "http://" + entry.wikipediaLang + ".wikipedia.org/wiki/"
-                            + encodeURL(entry.wikipediaArticle.replace(" ", "_"));
-                }
+                final String url = ((WikipediaEntry) list.getSelectedValue()).getBrowserUrl();
                 System.out.println("Wikipedia: opening " + url);
                 OpenBrowser.displayUrl(url);
@@ -405 +213 @@
         if (Main.main != null && Main.main.getCurrentDataSet() != null) {
             for (final OsmPrimitive p : Main.main.getCurrentDataSet().allPrimitives()) {
-                articles.addAll(getWikipediaArticles(p));
-            }
-        }
-    }
-
-    protected Collection<String> getWikipediaArticles(OsmPrimitive p) {
-        Collection<String> r = new ArrayList<String>();
-        final Map<String, String> tags = p.getKeys();
-        // consider wikipedia=[lang]:*
-        final String wp = tags.get("wikipedia");
-        if (wp != null && wp.startsWith("http")) {
-            //wikipedia=http...
-            final WikipediaLangArticle item = WikipediaLangArticle.parseFromUrl(wp);
-            if (item != null && wikipediaLang.get().equals(item.lang)) {
-                r.add(item.article.replace("_", " "));
-            }
-        } else if (wp != null) {
-            //wikipedia=[lang]:[article]
-            String[] item = decodeURL(wp).split(":", 2);
-            if (item.length == 2 && wikipediaLang.get().equals(item[0])) {
-                r.add(item[1].replace("_", " "));
-            }
-        }
-        // consider wikipedia:[lang]=*
-        final String wpLang = tags.get("wikipedia:" + wikipediaLang.get());
-        if (wpLang != null && wpLang.startsWith("http")) {
-            //wikipedia:[lang]=http...
-            final WikipediaLangArticle item = WikipediaLangArticle.parseFromUrl(wpLang);
-            if (wikipediaLang.get().equals(item.lang)) {
-                r.add(item.article.replace("_", " "));
-            }
-        } else if (wpLang != null) {
-            //wikipedia:[lang]=[lang]:[article]
-            //wikipedia:[lang]=[article]
-            String[] item = decodeURL(wpLang).split(":", 2);
-            r.add(item[item.length == 2 ? 1 : 0].replace("_", " "));
-        }
-        return r;
+                articles.addAll(WikipediaApp.getWikipediaArticles(wikipediaLang.get(), p));
+            }
+        }
     }
 
@@ -472 +245 @@
         list.repaint();
     }
-
-    public static String decodeURL(String url) {
-        try {
-            return URLDecoder.decode(url, "UTF-8");
-        } catch (UnsupportedEncodingException ex) {
-            throw new IllegalStateException(ex);
-        }
-    }
-
-    public static String encodeURL(String url) {
-        try {
-            return URLEncoder.encode(url, "UTF-8");
-        } catch (UnsupportedEncodingException ex) {
-            throw new IllegalStateException(ex);
-        }
-    }
 }