Changeset 32114 in osm

Timestamp:

2016-03-22T22:54:50+01:00 (9 years ago)

Author:

simon04

Message:

JOSM/wikipedia - Zoom to selected Wikipedia article - see #josm12664

Location:

applications/editors/josm/plugins/wikipedia

Files:

• src/org/wikipedia/WikipediaApp.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

@@ -272 +272 @@
     }
 
+    static LatLon getCoordinateForArticle(String wikipediaLang, String article) {
+        try {
+            final String url = "https://" + wikipediaLang + ".wikipedia.org/w/api.php" +
+                    "?action=query" +
+                    "&prop=coordinates" +
+                    "&titles=" + Utils.encodeUrl(article) +
+                    "&format=xml";
+            try (final InputStream in = HttpClient.create(new URL(url)).setReasonForRequest("Wikipedia").connect().getContent()) {
+                final Document xml = DOCUMENT_BUILDER.parse(in);
+                final Node node = (Node) X_PATH.compile("//coordinates/co").evaluate(xml, XPathConstants.NODE);
+                if (node == null) {
+                    return null;
+                } else {
+                    final double lat = Double.parseDouble(node.getAttributes().getNamedItem("lat").getTextContent());
+                    final double lon = Double.parseDouble(node.getAttributes().getNamedItem("lon").getTextContent());
+                    return new LatLon(lat, lon);
+                }
+            }
+        } catch (Exception ex) {
+            throw new RuntimeException(ex);
+        }
+    }
+
     static class WikipediaLangArticle {
 

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

@@ -20 +20 @@
 import javax.swing.JList;
 import javax.swing.JOptionPane;
+import javax.swing.JPopupMenu;
 import javax.swing.SwingWorker;
 
@@ -53 +54 @@
                 new SideButton(new PasteWikipediaArticlesAction()),
                 new SideButton(new AddWikipediaTagAction()),
-                new SideButton(new OpenWikipediaArticleAction()),
                 new SideButton(new WikipediaSettingsAction(), false)));
         updateTitle();
@@ -100 +100 @@
                 }
             });
+
+            final JPopupMenu popupMenu = new JPopupMenu();
+            popupMenu.add(new OpenWikipediaArticleAction());
+            popupMenu.add(new ZoomToWikipediaArticleAction());
+            setComponentPopupMenu(popupMenu);
         }
     };
@@ -282 +287 @@
     }
 
+    class ZoomToWikipediaArticleAction extends AbstractAction {
+
+        ZoomToWikipediaArticleAction() {
+            super(tr("Zoom to selection"), ImageProvider.get("dialogs/autoscale", "selection"));
+            putValue(SHORT_DESCRIPTION, tr("Zoom to selection"));
+        }
+
+        @Override
+        public void actionPerformed(ActionEvent e) {
+            final WikipediaEntry entry = list.getSelectedValue();
+            if (entry == null) {
+                return;
+            }
+            final LatLon latLon = WikipediaApp.getCoordinateForArticle(entry.wikipediaLang, entry.wikipediaArticle);
+            if (latLon == null) {
+                return;
+            }
+            Main.map.mapView.zoomTo(latLon);
+        }
+    }
+
     protected void updateWikipediaArticles() {
         articles.clear();

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

@@ -125 +125 @@
 
     @Test
+    public void testGetCoordinates() throws Exception {
+        assertThat(WikipediaApp.getCoordinateForArticle("de", "Marchreisenspitze"), is(new LatLon(47.1725, 11.30833333)));
+        assertThat(WikipediaApp.getCoordinateForArticle("en", "Austria"), is(new LatLon(47.33333333, 13.33333333)));
+        assertThat(WikipediaApp.getCoordinateForArticle("en", "Foobar2000"), nullValue());
+    }
+
+    @Test
     public void testGetBrowserUrl() {
         final WikipediaEntry entry = new WikipediaEntry("Sternheim & Emanuel", "de", "Sternheim & Emanuel");