Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions modules/geo-layers/src/tileset-2d/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -284,10 +284,16 @@ export function getTileIndices({
modelMatrixInverse?: Matrix4;
zoomOffset?: number;
}) {
// This round/ceil operation ensures that tiles are rendered in the same way as Google Maps, Map Libre, etc.
// eg. at viewport.zoom = 9.5, you should fetch tiles at z = 10, not z = 9.
let z = viewport.isGeospatial
? Math.round(viewport.zoom + Math.log2(TILE_SIZE / tileSize)) + zoomOffset
: Math.ceil(viewport.zoom) + zoomOffset;
if (typeof minZoom === 'number' && Number.isFinite(minZoom) && z < minZoom) {
? Math.round(viewport.zoom + Math.log2(TILE_SIZE / tileSize) + zoomOffset)
: Math.ceil(viewport.zoom + zoomOffset);

// This check doesn't round/ceil and doesn't use the offset. This ensures that tiles are not rendered if the
// viewport.zoom is less than minZoom. eg. at viewport.zoom = 9.5 with minZoom = 10 we should not fetch tiles
// at z = 10 until viewport.zoom is 10 or greater.
if (typeof minZoom === 'number' && Number.isFinite(minZoom) && viewport.zoom < minZoom) {
if (!extent) {
return [];
}
Expand Down
8 changes: 8 additions & 0 deletions test/modules/geo-layers/tileset-2d/utils.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,14 @@ const TEST_CASES = [
maxZoom: undefined,
output: []
},
{
title: 'ignore round and offset on minZoom check',
viewport: new WebMercatorViewport({longitude: -90, latitude: 45, zoom: 3.5}),
zoomOffset: 1,
minZoom: 4,
maxZoom: undefined,
output: []
},
{
title: 'over zoom',
viewport: new WebMercatorViewport({
Expand Down
Loading