Changeset 18590 in osm

Timestamp:

2009-11-14T19:09:20+01:00 (15 years ago)

Author:

dhansen

Message:

Put some better limits on slippymap tiles.

Even though we did not draw or attempt to create them,
we could try to iterate past some pretty large numbers
of tiles. That made things slow.

There was also a bug when calculating very large tileset
sizes where the integer would overflow. Make it a double
so that the calculation at least goes through

File:

• applications/editors/josm/plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java (modified) (5 diffs)

applications/editors/josm/plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java

@@ -732 +732 @@
             return this.tilesSpanned() > 10;
         }
+        boolean insane() {
+            return this.tilesSpanned() > 100;
+        }
         double tilesSpanned() {
             return Math.sqrt(1.0 * this.size());
         }
 
-        int size() {
-            int x_span = z12x1 - z12x0 + 1;
-            int y_span = z12y1 - z12y0 + 1;
+        double size() {
+            double x_span = z12x1 - z12x0 + 1.0;
+            double y_span = z12y1 - z12y0 + 1.0;
             return x_span * y_span;
         }
@@ -753 +756 @@
         {
             List<Tile> ret = new ArrayList<Tile>();
+            // Don't even try to iterate over the set.
+            // Someone created a crazy number of them
+            if (this.insane())
+                return ret;
             for (int x = z12x0; x <= z12x1; x++) {
                 for (int y = z12y0; y <= z12y1; y++) {
@@ -852 +859 @@
         // Too many tiles... refuse to draw
         if (!ts.tooLarge()) {
+            //out("size: " + ts.size() + " spanned: " + ts.tilesSpanned());
             ts.loadAllTiles(false);
         }
@@ -875 +883 @@
                 LatLon botRight2 = tileLatLon(t2);
                 TileSet ts2 = new TileSet(topLeft2, botRight2, newzoom);
+                if (ts2.tooLarge())
+                    continue;
                 newlyMissedTiles.addAll(this.paintTileImages(g, ts2, newzoom, missed));
             }
@@ -911 +921 @@
         //g.drawString("currentZoomLevel=" + currentZoomLevel, 120, 120);
         oldg.setColor(Color.black);
-        if (ts.tooLarge()) {
+        if (ts.insane()) {
+            oldg.drawString("zoom in to load any tiles", 120, 120);
+        } else if (ts.tooLarge()) {
             oldg.drawString("zoom in to load more tiles", 120, 120);
         } else if (ts.tooSmall()) {