diff --git a/src/org/openstreetmap/gui/jmapviewer/Tile.java b/src/org/openstreetmap/gui/jmapviewer/Tile.java index ba59ee0..00685f9 100644 --- a/src/org/openstreetmap/gui/jmapviewer/Tile.java +++ b/src/org/openstreetmap/gui/jmapviewer/Tile.java @@ -228,7 +228,7 @@ public class Tile { } /** - * @return tile indexes as TileXY object + * @return tile indexes of the top left corner as TileXY object */ public TileXY getTileXY() { return new TileXY(xtile, ytile); diff --git a/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java b/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java index 6e9bdc3..35e9558 100644 --- a/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java +++ b/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java @@ -34,9 +34,14 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Map.Entry; +import java.util.Objects; import java.util.Set; import java.util.concurrent.ConcurrentSkipListSet; import java.util.concurrent.atomic.AtomicInteger; +import java.util.function.Consumer; +import java.util.function.Function; +import java.util.stream.Collectors; +import java.util.stream.IntStream; import java.util.stream.Stream; import javax.swing.AbstractAction; @@ -968,6 +973,10 @@ implements ImageObserver, TileLoaderListener, ZoomChangeListener, FilterChangeLi return new Tile(tileSource, x, y, zoom); } + private Tile getOrCreateTile(TilePosition tilePosition) { + return getOrCreateTile(tilePosition.getX(), tilePosition.getY(), tilePosition.getZoom()); + } + private Tile getOrCreateTile(int x, int y, int zoom) { Tile tile = getTile(x, y, zoom); if (tile == null) { @@ -981,6 +990,10 @@ implements ImageObserver, TileLoaderListener, ZoomChangeListener, FilterChangeLi return tile; } + private Tile getTile(TilePosition tilePosition) { + return getTile(tilePosition.getX(), tilePosition.getY(), tilePosition.getZoom()); + } + /** * Returns tile at given position. * This can and will return null for tiles that are not already in the cache. @@ -1121,6 +1134,25 @@ implements ImageObserver, TileLoaderListener, ZoomChangeListener, FilterChangeLi } } + private List paintTileImages(Graphics g, TileSet ts) { + Object paintMutex = new Object(); + List missed = Collections.synchronizedList(new ArrayList<>()); + ts.visitTiles(tile -> { + Image img = getLoadedTileImage(tile); + if (img == null) { + missed.add(new TilePosition(tile)); + } + img = applyImageProcessors((BufferedImage) img); + Rectangle2D sourceRect = coordinateConverter.getRectangleForTile(tile); + synchronized (paintMutex) { + //cannot paint in parallel + drawImageInside(g, img, sourceRect, null); + } + }, missed::add); + + return missed.stream().map(this::getOrCreateTile).collect(Collectors.toList()); + } + // This function is called for several zoom levels, not just // the current one. It should not trigger any tiles to be // downloaded. It should also avoid polluting the tile cache @@ -1132,10 +1164,7 @@ implements ImageObserver, TileLoaderListener, ZoomChangeListener, FilterChangeLi // border is null and we draw the entire tile set. private List paintTileImages(Graphics g, TileSet ts, int zoom, Tile border) { if (zoom <= 0) return Collections.emptyList(); - Rectangle2D borderRect = null; - if (border != null) { - borderRect = coordinateConverter.getRectangleForTile(border); - } + Rectangle2D borderRect = coordinateConverter.getRectangleForTile(border); List missedTiles = new LinkedList<>(); // The callers of this code *require* that we return any tiles // that we do not draw in missedTiles. ts.allExistingTiles() by @@ -1286,6 +1315,67 @@ implements ImageObserver, TileLoaderListener, ZoomChangeListener, FilterChangeLi int ySpan = maxY - minY + 1; return xSpan * ySpan; } + + /** + * Gets a stream of all tile positions in this set + * @return A stream of all positions + */ + public Stream tilePositions() { + if (zoom == 0) { + return Stream.empty(); + } else { + return IntStream.rangeClosed(minX, maxX).mapToObj( + x -> IntStream.rangeClosed(minY, maxY).mapToObj(y -> new TilePosition(x, y, zoom)) + ).flatMap(Function.identity()); + } + } + } + + /** + * The position of a single tile. + * @author Michael Zangl + * @since xxx + */ + private static class TilePosition { + private final int x; + private final int y; + private final int zoom; + public TilePosition(int x, int y, int zoom) { + super(); + this.x = x; + this.y = y; + this.zoom = zoom; + } + + public TilePosition(Tile tile) { + this(tile.getXtile(), tile.getYtile(), tile.getZoom()); + } + + /** + * @return the x position + */ + public int getX() { + return x; + } + + /** + * @return the y position + */ + public int getY() { + return y; + } + + /** + * @return the zoom + */ + public int getZoom() { + return zoom; + } + + @Override + public String toString() { + return "TilePosition [x=" + x + ", y=" + y + ", zoom=" + zoom + "]"; + } } private class TileSet extends TileRange { @@ -1299,7 +1389,7 @@ implements ImageObserver, TileLoaderListener, ZoomChangeListener, FilterChangeLi * null tile set */ private TileSet() { - return; + // default } protected void sanitize() { @@ -1334,41 +1424,29 @@ implements ImageObserver, TileLoaderListener, ZoomChangeListener, FilterChangeLi * already in the tileCache. */ private List allExistingTiles() { - return this.__allTiles(false); + return allTiles(p -> getTile(p)); } private List allTilesCreate() { - return this.__allTiles(true); + return allTiles(p -> getOrCreateTile(p)); } - private List __allTiles(boolean create) { - // Tileset is either empty or too large - if (zoom == 0 || this.insane()) - return Collections.emptyList(); - List ret = new ArrayList<>(); - for (int x = minX; x <= maxX; x++) { - for (int y = minY; y <= maxY; y++) { - Tile t; - if (create) { - t = getOrCreateTile(x, y, zoom); - } else { - t = getTile(x, y, zoom); - } - if (t != null) { - ret.add(t); - } - } + private List allTiles(Function mapper) { + return tilePositions().map(mapper).filter(Objects::nonNull).collect(Collectors.toList()); + } + + @Override + public Stream tilePositions() { + if (this.insane()) { + // Tileset is either empty or too large + return Stream.empty(); + } else { + return super.tilePositions(); } - return ret; } private List allLoadedTiles() { - List ret = new ArrayList<>(); - for (Tile t : this.allExistingTiles()) { - if (t.isLoaded()) - ret.add(t); - } - return ret; + return allExistingTiles().stream().filter(Tile::isLoaded).collect(Collectors.toList()); } /** @@ -1377,18 +1455,7 @@ implements ImageObserver, TileLoaderListener, ZoomChangeListener, FilterChangeLi private Comparator getTileDistanceComparator() { final int centerX = (int) Math.ceil((minX + maxX) / 2d); final int centerY = (int) Math.ceil((minY + maxY) / 2d); - return new Comparator() { - private int getDistance(Tile t) { - return Math.abs(t.getXtile() - centerX) + Math.abs(t.getYtile() - centerY); - } - - @Override - public int compare(Tile o1, Tile o2) { - int distance1 = getDistance(o1); - int distance2 = getDistance(o2); - return Integer.compare(distance1, distance2); - } - }; + return Comparator.comparingInt(t -> Math.abs(t.getXtile() - centerX) + Math.abs(t.getYtile() - centerY)); } private void loadAllTiles(boolean force) { @@ -1411,6 +1478,26 @@ implements ImageObserver, TileLoaderListener, ZoomChangeListener, FilterChangeLi } } + /** + * Call the given paint method for all tiles in this tile set. + *

+ * Uses a parallel stream. + * @param visitor A visitor to call for each tile. + * @param missed a consumer to call for each missed tile. + */ + public void visitTiles(Consumer visitor, Consumer missed) { + tilePositions().parallel().forEach(tp -> visitTilePosition(visitor, tp, missed)); + } + + private void visitTilePosition(Consumer visitor, TilePosition tp, Consumer missed) { + Tile tile = getTile(tp); + if (tile == null) { + missed.accept(tp); + } else { + visitor.accept(tile); + } + } + @Override public String toString() { return getClass().getName() + ": zoom: " + zoom + " X(" + minX + ", " + maxX + ") Y(" + minY + ", " + maxY + ") size: " + size(); @@ -1583,7 +1670,7 @@ implements ImageObserver, TileLoaderListener, ZoomChangeListener, FilterChangeLi g.setColor(Color.DARK_GRAY); - List missedTiles = this.paintTileImages(g, ts, displayZoomLevel, null); + List missedTiles = this.paintTileImages(g, ts); int[] otherZooms = {-1, 1, -2, 2, -3, -4, -5}; for (int zoomOffset : otherZooms) { if (!getDisplaySettings().isAutoZoom()) {