Changeset 35224 in osm for applications/viewer/jmapviewer/src/org

Timestamp:

2019-11-04T23:17:38+01:00 (5 years ago)

Author:

wiktorn

Message:

Do not use zoom levels that lead to int overflows.

When fitting map to map elements do not use zoom levels that may lead to X/Y
coordinates to overflow. This prevents setting focus to place pointed by
overflown coordinates, when tile source allows higher zoom levels.

Now zoom level is capped based on tile size, so X/Y will not overflow.

See: #josm18289

File:

• applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/JMapViewer.java (modified) (1 diff)

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/JMapViewer.java

@@ -298 +298 @@
         int xMax = Integer.MIN_VALUE;
         int yMax = Integer.MIN_VALUE;
-        int mapZoomMax = tileController.getTileSource().getMaxZoom();
+        /*
+         *  Cap mapZoomMax at highest level that prevents overflowing int in X and Y coordinates. As int is from -2^31..2^31.
+         *  Log_2(TileSize) is how many bits are used due to tile size. Math.log(TileSize) / Math.log(2) gives Log_2(TileSize)
+         *  So 31 - tileSizeBits gives maximum zoom that can be handled without overflowing.
+         *  It means 23 for 256 tile size or 22 for 512 tile size
+         */
+        int tileSizeBits = (int) (Math.log(tileController.getTileSource().getDefaultTileSize()) / Math.log(2));
+        int mapZoomMax =  Math.min(31 - tileSizeBits, tileController.getTileSource().getMaxZoom());
 
         if (markers && mapMarkerList != null) {