Changeset 17880 in josm for trunk/src/org/openstreetmap

Timestamp:

2021-05-10T21:44:33+02:00 (4 years ago)

Author:

simon04

Message:

see #8472 - Show geocoded images from Wikimedia Commons as GeoImageLayer

The icon wikimedia_commons.svg is taken from ​https://commons.wikimedia.org/wiki/File:Commons-logo.svg ("This image of simple geometry is ineligible for copyright and therefore in the public domain, because it consists entirely of information that is common property and contains no original authorship.")

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/gpx/GpxImageEntry.java (modified) (1 diff)
• gui/MainMenu.java (modified) (2 diffs)
• gui/layer/geoimage/CorrelateGpxWithImages.java (modified) (1 diff)
• gui/layer/geoimage/ImageDisplay.java (modified) (2 diffs)
• gui/layer/geoimage/ImageEntry.java (modified) (3 diffs)
• gui/layer/geoimage/ImageViewerDialog.java (modified) (3 diffs)
• gui/layer/geoimage/WikimediaCommonsEntry.java (added)
• gui/layer/geoimage/WikimediaCommonsLayer.java (added)
• gui/layer/geoimage/WikimediaCommonsLoader.java (added)
• tools/ImageProvider.java (modified) (3 diffs)
• tools/Mediawiki.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/data/gpx/GpxImageEntry.java

@@ -207 +207 @@
     public File getFile() {
         return file;
+    }
+
+    /**
+     * Returns a display name for this entry
+     * @return a display name for this entry
+     */
+    public String getDisplayName() {
+        return file == null ? "" : file.getName();
     }
 

trunk/src/org/openstreetmap/josm/gui/MainMenu.java

@@ -130 +130 @@
 import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeEvent;
 import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeListener;
+import org.openstreetmap.josm.gui.layer.geoimage.WikimediaCommonsLoader;
 import org.openstreetmap.josm.gui.mappaint.MapPaintMenu;
 import org.openstreetmap.josm.gui.preferences.imagery.ImageryPreference;
@@ -748 +749 @@
         add(fileMenu, searchNotes);
         add(fileMenu, downloadNotesInView);
+        add(fileMenu, new WikimediaCommonsLoader.Action());
         add(fileMenu, downloadReferrers);
         add(fileMenu, update);

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java

@@ -702 +702 @@
                 @Override
                 public String getElementAt(int i) {
-                    return yLayer.getImageData().getImages().get(i).getFile().getName();
+                    return yLayer.getImageData().getImages().get(i).getDisplayName();
                 }
 

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java

@@ -703 +703 @@
             }
             if (errorLoading) {
-                String loadingStr = tr("Error on file {0}", entry.getFile().getName());
+                String loadingStr = tr("Error on file {0}", entry.getDisplayName());
                 Rectangle2D noImageSize = g.getFontMetrics(g.getFont()).getStringBounds(loadingStr, g);
                 g.drawString(loadingStr,
@@ -749 +749 @@
             // we are probably still loading the image. (oldEntry gets set to entry when the image finishes loading).
             if (!errorLoading) {
-                errorMessage = tr("Loading {0}", entry.getFile().getName());
+                errorMessage = tr("Loading {0}", entry.getDisplayName());
             } else {
-                errorMessage = tr("Error on file {0}", entry.getFile().getName());
+                errorMessage = tr("Error on file {0}", entry.getDisplayName());
             }
         } else {

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageEntry.java

@@ -10 +10 @@
 import java.io.IOException;
 import java.io.UncheckedIOException;
+import java.net.MalformedURLException;
+import java.net.URL;
 import java.util.Collections;
 import java.util.Objects;
@@ -29 +31 @@
  * @since 2662
  */
-public final class ImageEntry extends GpxImageEntry {
+public class ImageEntry extends GpxImageEntry {
 
     private Image thumbnail;
@@ -141 +143 @@
      */
     public BufferedImage read(Dimension target) throws IOException {
-        Logging.info(tr("Loading {0}", getFile().getPath()));
-        BufferedImage image = ImageProvider.read(getFile(), false, false,
+        URL imageUrl = getImageUrl();
+        Logging.info(tr("Loading {0}", imageUrl));
+        BufferedImage image = ImageProvider.read(imageUrl, false, false,
                 r -> target == null ? r.getDefaultReadParam() : withSubsampling(r, target));
         Logging.debug("Loaded {0} with dimensions {1}x{2} memoryTaken={3}m exifOrientationSwitchedDimension={4}",
-                getFile().getPath(), image.getWidth(), image.getHeight(), image.getWidth() * image.getHeight() * 4 / 1024 / 1024,
+                imageUrl, image.getWidth(), image.getHeight(), image.getWidth() * image.getHeight() * 4 / 1024 / 1024,
                 ExifReader.orientationSwitchesDimensions(getExifOrientation()));
         return applyExifRotation(image);
+    }
+
+    protected URL getImageUrl() throws MalformedURLException {
+        return getFile().toURI().toURL();
     }
 

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java

@@ -372 +372 @@
         public void actionPerformed(ActionEvent e) {
             if (currentData != null) {
-                ClipboardUtils.copyString(currentData.getSelectedImage().getFile().toString());
+                ClipboardUtils.copyString(String.valueOf(currentData.getSelectedImage().getFile()));
             }
         }
@@ -461 +461 @@
             setPreviousEnabled(data.hasPreviousImage());
             btnDelete.setEnabled(true);
-            btnDeleteFromDisk.setEnabled(true);
+            btnDeleteFromDisk.setEnabled(entry.getFile() != null);
             btnCopyPath.setEnabled(true);
 
@@ -469 +469 @@
                 imgDisplay.setImage(entry);
             }
-            setTitle(tr("Geotagged Images") + (entry.getFile() != null ? " - " + entry.getFile().getName() : ""));
-            StringBuilder osd = new StringBuilder(entry.getFile() != null ? entry.getFile().getName() : "");
+            setTitle(tr("Geotagged Images") + (!entry.getDisplayName().isEmpty() ? " - " + entry.getDisplayName() : ""));
+            StringBuilder osd = new StringBuilder(entry.getDisplayName());
             if (entry.getElevation() != null) {
                 osd.append(tr("\nAltitude: {0} m", Math.round(entry.getElevation())));

trunk/src/org/openstreetmap/josm/tools/ImageProvider.java

@@ -1549 +1549 @@
      */
     public static BufferedImage read(File input, boolean readMetadata, boolean enforceTransparency) throws IOException {
-        return read(input, readMetadata, enforceTransparency, ImageReader::getDefaultReadParam);
-    }
-
-    /**
-     * Returns a <code>BufferedImage</code> as the result of decoding
-     * a supplied <code>File</code> with an <code>ImageReader</code>
-     * chosen automatically from among those currently registered.
-     * The <code>File</code> is wrapped in an
-     * <code>ImageInputStream</code>.  If no registered
-     * <code>ImageReader</code> claims to be able to read the
-     * resulting stream, <code>null</code> is returned.
-     *
-     * <p> The current cache settings from <code>getUseCache</code>and
-     * <code>getCacheDirectory</code> will be used to control caching in the
-     * <code>ImageInputStream</code> that is created.
-     *
-     * <p> Note that there is no <code>read</code> method that takes a
-     * filename as a <code>String</code>; use this method instead after
-     * creating a <code>File</code> from the filename.
-     *
-     * <p> This method does not attempt to locate
-     * <code>ImageReader</code>s that can read directly from a
-     * <code>File</code>; that may be accomplished using
-     * <code>IIORegistry</code> and <code>ImageReaderSpi</code>.
-     *
-     * @param input a <code>File</code> 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 <code>BufferedImage</code> containing the decoded contents of the input, or <code>null</code>.
-     *
-     * @throws IllegalArgumentException if <code>input</code> is <code>null</code>.
-     * @throws IOException if an error occurs during reading.
-     * @see BufferedImage#getProperty
-     * @since xxx
-     */
-    public static BufferedImage read(File input, boolean readMetadata, boolean enforceTransparency,
-                                     Function<ImageReader, ImageReadParam> readParamFunction) throws IOException {
         CheckParameterUtil.ensureParameterNotNull(input, "input");
         if (!input.canRead()) {
@@ -1601 +1558 @@
             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 +1645 @@
      */
     public static BufferedImage read(URL input, boolean readMetadata, boolean enforceTransparency) throws IOException {
+        return read(input, readMetadata, enforceTransparency, ImageReader::getDefaultReadParam);
+    }
+
+    /**
+     * Returns a <code>BufferedImage</code> as the result of decoding
+     * a supplied <code>URL</code> with an <code>ImageReader</code>
+     * chosen automatically from among those currently registered.  An
+     * <code>InputStream</code> is obtained from the <code>URL</code>,
+     * which is wrapped in an <code>ImageInputStream</code>.  If no
+     * registered <code>ImageReader</code> claims to be able to read
+     * the resulting stream, <code>null</code> is returned.
+     *
+     * <p> The current cache settings from <code>getUseCache</code>and
+     * <code>getCacheDirectory</code> will be used to control caching in the
+     * <code>ImageInputStream</code> that is created.
+     *
+     * <p> This method does not attempt to locate
+     * <code>ImageReader</code>s that can read directly from a
+     * <code>URL</code>; that may be accomplished using
+     * <code>IIORegistry</code> and <code>ImageReaderSpi</code>.
+     *
+     * @param input a <code>URL</code> 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 <code>BufferedImage</code> containing the decoded contents of the input, or <code>null</code>.
+     *
+     * @throws IllegalArgumentException if <code>input</code> is <code>null</code>.
+     * @throws IOException if an error occurs during reading.
+     * @since 17880
+     */
+    public static BufferedImage read(URL input, boolean readMetadata, boolean enforceTransparency,
+                                     Function<ImageReader, ImageReadParam> 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();

trunk/src/org/openstreetmap/josm/tools/Mediawiki.java

@@ -7 +7 @@
 import java.util.List;
 import java.util.Optional;
+import java.util.function.BiConsumer;
 import java.util.stream.Collectors;
 
@@ -15 +16 @@
 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 +58 @@
                 .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 +75 @@
     }
 
+    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 <a href="https://commons.wikimedia.org/">Wikimedia Commons</a> 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<String, LatLon> 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