Changeset 11829 in josm for trunk/src/org

Timestamp:

2017-04-03T13:59:39+02:00 (7 years ago)

Author:

bastiK

Message:

see #7427 - move TileRange class to jmapviewer

Location:

trunk/src/org/openstreetmap/josm/gui/layer

Files:

• AbstractTileSourceLayer.java (modified) (4 diffs)
• imagery/TilePosition.java (modified) (1 diff)
• imagery/TileRange.java (deleted)

trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java

@@ -42 +42 @@
 import java.util.function.Function;
 import java.util.stream.Collectors;
+import java.util.stream.IntStream;
 import java.util.stream.Stream;
 
@@ -61 +62 @@
 import org.openstreetmap.gui.jmapviewer.OsmTileLoader;
 import org.openstreetmap.gui.jmapviewer.Tile;
+import org.openstreetmap.gui.jmapviewer.TileRange;
 import org.openstreetmap.gui.jmapviewer.TileXY;
 import org.openstreetmap.gui.jmapviewer.interfaces.CachedTileLoader;
@@ -93 +95 @@
 import org.openstreetmap.josm.gui.layer.imagery.TileCoordinateConverter;
 import org.openstreetmap.josm.gui.layer.imagery.TilePosition;
-import org.openstreetmap.josm.gui.layer.imagery.TileRange;
 import org.openstreetmap.josm.gui.layer.imagery.TileSourceDisplaySettings;
 import org.openstreetmap.josm.gui.layer.imagery.TileSourceDisplaySettings.DisplaySettingsChangeEvent;
@@ -1320 +1321 @@
         }
 
-        @Override
+        /**
+         * Gets a stream of all tile positions in this set
+         * @return A stream of all positions
+         */
         public Stream<TilePosition> tilePositions() {
-            if (this.insane()) {
+            if (zoom == 0 || this.insane()) {
                 return Stream.empty(); // Tileset is either empty or too large
             } else {
-                return super.tilePositions();
+                return IntStream.rangeClosed(minX, maxX).mapToObj(
+                        x -> IntStream.rangeClosed(minY, maxY).mapToObj(y -> new TilePosition(x, y, zoom))
+                        ).flatMap(Function.identity());
             }
         }

trunk/src/org/openstreetmap/josm/gui/layer/imagery/TilePosition.java

@@ -12 +12 @@
     private final int y;
     private final int zoom;
-    TilePosition(int x, int y, int zoom) {
+
+    public TilePosition(int x, int y, int zoom) {
         this.x = x;
         this.y = y;