imageEntries = new ArrayList<>();
+ try {
+ new Mediawiki(apiUrl).searchGeoImages(bounds, (title, latLon) -> imageEntries.add(new WikimediaCommonsEntry(title, latLon)));
+ } catch (ParserConfigurationException | XPathExpressionException e) {
+ throw new IllegalStateException(e);
+ }
+ Logging.info("Loaded {0} images from Wikimedia Commons", imageEntries.size());
+ layer = new WikimediaCommonsLayer(imageEntries);
+ }
+
+ @Override
+ protected void finish() {
+ MainApplication.getLayerManager().addLayer(layer);
+ }
+
+ @Override
+ protected void cancel() {
+ // do nothing
+ }
+
+ public static class Action extends JosmAction {
+ public Action() {
+ super(tr("Load images from Wikimedia Commons"), "wikimedia_commons", null, null, false);
+ }
+
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ Bounds bounds = MainApplication.getMap().mapView.getRealBounds();
+ MainApplication.worker.execute(new WikimediaCommonsLoader(bounds));
+ }
+
+ @Override
+ protected void updateEnabledState() {
+ setEnabled(MainApplication.isDisplayingMapView());
+ }
+ }
+
+}
Index: trunk/src/org/openstreetmap/josm/tools/ImageProvider.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/ImageProvider.java (revision 17878)
+++ trunk/src/org/openstreetmap/josm/tools/ImageProvider.java (revision 17880)
@@ -1549,47 +1549,4 @@
*/
public static BufferedImage read(File input, boolean readMetadata, boolean enforceTransparency) throws IOException {
- return read(input, readMetadata, enforceTransparency, ImageReader::getDefaultReadParam);
- }
-
- /**
- * Returns a BufferedImage as the result of decoding
- * a supplied File with an ImageReader
- * chosen automatically from among those currently registered.
- * The File is wrapped in an
- * ImageInputStream. If no registered
- * ImageReader claims to be able to read the
- * resulting stream, null is returned.
- *
- * The current cache settings from getUseCacheand
- * getCacheDirectory will be used to control caching in the
- * ImageInputStream that is created.
- *
- *
Note that there is no read method that takes a
- * filename as a String; use this method instead after
- * creating a File from the filename.
- *
- *
This method does not attempt to locate
- * ImageReaders that can read directly from a
- * File; that may be accomplished using
- * IIORegistry and ImageReaderSpi.
- *
- * @param input a File to read from.
- * @param readMetadata if {@code true}, makes sure to read image metadata to detect transparency color, if any.
- * In that case the color can be retrieved later through {@link #PROP_TRANSPARENCY_COLOR}.
- * Always considered {@code true} if {@code enforceTransparency} is also {@code true}
- * @param enforceTransparency if {@code true}, makes sure to read image metadata and, if the image does not
- * provide an alpha channel but defines a {@code TransparentColor} metadata node, that the resulting image
- * has a transparency set to {@code TRANSLUCENT} and uses the correct transparent color.
- * @param readParamFunction a function to compute the read parameters from the image reader
- *
- * @return a BufferedImage containing the decoded contents of the input, or null.
- *
- * @throws IllegalArgumentException if input is null.
- * @throws IOException if an error occurs during reading.
- * @see BufferedImage#getProperty
- * @since xxx
- */
- public static BufferedImage read(File input, boolean readMetadata, boolean enforceTransparency,
- Function readParamFunction) throws IOException {
CheckParameterUtil.ensureParameterNotNull(input, "input");
if (!input.canRead()) {
@@ -1601,5 +1558,5 @@
throw new IIOException("Can't create an ImageInputStream!");
}
- BufferedImage bi = read(stream, readMetadata, enforceTransparency, readParamFunction);
+ BufferedImage bi = read(stream, readMetadata, enforceTransparency);
if (bi == null) {
stream.close();
@@ -1688,9 +1645,47 @@
*/
public static BufferedImage read(URL input, boolean readMetadata, boolean enforceTransparency) throws IOException {
+ return read(input, readMetadata, enforceTransparency, ImageReader::getDefaultReadParam);
+ }
+
+ /**
+ * Returns a BufferedImage as the result of decoding
+ * a supplied URL with an ImageReader
+ * chosen automatically from among those currently registered. An
+ * InputStream is obtained from the URL,
+ * which is wrapped in an ImageInputStream. If no
+ * registered ImageReader claims to be able to read
+ * the resulting stream, null is returned.
+ *
+ * The current cache settings from getUseCacheand
+ * getCacheDirectory will be used to control caching in the
+ * ImageInputStream that is created.
+ *
+ *
This method does not attempt to locate
+ * ImageReaders that can read directly from a
+ * URL; that may be accomplished using
+ * IIORegistry and ImageReaderSpi.
+ *
+ * @param input a URL to read from.
+ * @param readMetadata if {@code true}, makes sure to read image metadata to detect transparency color for non translucent images, if any.
+ * In that case the color can be retrieved later through {@link #PROP_TRANSPARENCY_COLOR}.
+ * Always considered {@code true} if {@code enforceTransparency} is also {@code true}
+ * @param enforceTransparency if {@code true}, makes sure to read image metadata and, if the image does not
+ * provide an alpha channel but defines a {@code TransparentColor} metadata node, that the resulting image
+ * has a transparency set to {@code TRANSLUCENT} and uses the correct transparent color.
+ * @param readParamFunction a function to compute the read parameters from the image reader
+ *
+ * @return a BufferedImage containing the decoded contents of the input, or null.
+ *
+ * @throws IllegalArgumentException if input is null.
+ * @throws IOException if an error occurs during reading.
+ * @since 17880
+ */
+ public static BufferedImage read(URL input, boolean readMetadata, boolean enforceTransparency,
+ Function readParamFunction) throws IOException {
CheckParameterUtil.ensureParameterNotNull(input, "input");
try (InputStream istream = Utils.openStream(input)) {
ImageInputStream stream = createImageInputStream(istream); // NOPMD
- BufferedImage bi = read(stream, readMetadata, enforceTransparency);
+ BufferedImage bi = read(stream, readMetadata, enforceTransparency, readParamFunction);
if (bi == null) {
stream.close();
Index: trunk/src/org/openstreetmap/josm/tools/Mediawiki.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/Mediawiki.java (revision 17878)
+++ trunk/src/org/openstreetmap/josm/tools/Mediawiki.java (revision 17880)
@@ -7,4 +7,5 @@
import java.util.List;
import java.util.Optional;
+import java.util.function.BiConsumer;
import java.util.stream.Collectors;
@@ -15,6 +16,10 @@
import javax.xml.xpath.XPathFactory;
+import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.coor.LatLon;
import org.w3c.dom.Document;
+import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
import org.xml.sax.SAXException;
@@ -53,10 +58,5 @@
.collect(Collectors.joining(Utils.encodeUrl("|")))
);
- final HttpClient.Response conn = HttpClient.create(url).connect();
- final Document document;
- try (InputStream content = conn.getContent()) {
- document = XmlUtils.parseSafeDOM(content);
- }
- conn.disconnect();
+ final Document document = getDocument(url);
final XPath xPath = XPathFactory.newInstance().newXPath();
for (String page : distinctPages) {
@@ -75,4 +75,44 @@
}
+ private Document getDocument(URL url) throws IOException, ParserConfigurationException, SAXException {
+ final HttpClient.Response conn = HttpClient.create(url).connect();
+ try (InputStream content = conn.getContent()) {
+ return XmlUtils.parseSafeDOM(content);
+ } finally {
+ conn.disconnect();
+ }
+ }
+
+ /**
+ * Searches geocoded images from Wikimedia Commons for the given bounding box.
+ * @param bounds the bounds to load
+ * @param imageConsumer a consumer to receive the file title and the coordinates for every geocoded image
+ * @throws IOException if any I/O error occurs
+ * @throws ParserConfigurationException if a parser cannot be created
+ * @throws SAXException if any XML error occurs
+ * @throws XPathExpressionException if any error in an XPath expression occurs
+ */
+ public void searchGeoImages(Bounds bounds, BiConsumer imageConsumer)
+ throws IOException, ParserConfigurationException, SAXException, XPathExpressionException {
+ final URL url = new URL(baseUrl +
+ "?format=xml" +
+ "&action=query" +
+ "&list=geosearch" +
+ "&gsnamespace=6" +
+ "&gslimit=500" +
+ "&gsprop=type|name" +
+ "&gsbbox=" + bounds.getMaxLat() + "|" + bounds.getMinLon() + "|" + bounds.getMinLat() + "|" + bounds.getMaxLon());
+ final Document document = getDocument(url);
+ final XPath xPath = XPathFactory.newInstance().newXPath();
+ NodeList nodes = (NodeList) xPath.evaluate("/api/query/geosearch/gs", document, XPathConstants.NODESET);
+ for (int i = 0; i < nodes.getLength(); i++) {
+ NamedNodeMap attributes = nodes.item(i).getAttributes();
+ String title = attributes.getNamedItem("title").getNodeValue();
+ double lat = Double.parseDouble(attributes.getNamedItem("lat").getNodeValue());
+ double lon = Double.parseDouble(attributes.getNamedItem("lon").getNodeValue());
+ imageConsumer.accept(title, new LatLon(lat, lon));
+ }
+ }
+
/**
* Computes the URL for the given filename on the MediaWiki server