TilingScheme: Fix incorrect reporting of empty tile ranges (#1328)

* Correctly report empty tile range if requested range is outside the given bounds.

* Add bounds for geojson

Author: gkjohnson

src/three/plugins/images/sources/GeoJSONImageSource.js

@@ -64,13 +64,8 @@ export class GeoJSONImageSource extends TiledImageSource {
 
 		// seems that this approach to optimize rendering by defining bounds
 		// doesn't work if not using a very large offset for the bounds, maybe an error?
-		// const geoBounds = this._geoJSONBounds( 50 );
-		// if ( geoBounds ) {
-		// 	this.tiling.setContentBounds( ...geoBounds );
-		// 	console.log( `GeoJSONImageSource: set content bounds from geojson: ${geoBounds}` );
-		// } else {
-		// 	this.tiling.setContentBounds( ...this.tiling.projection.getBounds() );
-		// }
+		const geoBounds = this._geoJSONBounds( 50 ).map( v => v * MathUtils.DEG2RAD );
+		this.tiling.setContentBounds( ...geoBounds );
 
 	}
 

src/three/plugins/images/utils/TilingScheme.js

@@ -1,5 +1,14 @@
 import { MathUtils } from 'three';
 
+function doBoundsIntersect( a, b ) {
+
+	const [ aMinX, aMinY, aMaxX, aMaxY ] = a;
+	const [ bMinX, bMinY, bMaxX, bMaxY ] = b;
+
+	return ! ( aMinX >= bMaxX || aMaxX <= bMinX || aMinY >= bMaxY || aMaxY <= bMinY );
+
+}
+
 // Class for storing and querying a tiling scheme including a bounds, origin, and negative tile indices.
 // Assumes that tiles are split into four child tiles at each level.
 
@@ -199,10 +208,36 @@ export class TilingScheme {
 
 	getTilesInRange( minX, minY, maxX, maxY, level, normalized = false ) {
 
-		[ minX, minY, maxX, maxY ] = this.clampToContentBounds( [ minX, minY, maxX, maxY ], normalized );
+		// check if the range is outside the content bounds
+		const range = [ minX, minY, maxX, maxY ];
+		const contentBounds = this.getContentBounds( normalized );
+		let tileBounds = this.getLevel( level ).tileBounds;
+		if ( ! doBoundsIntersect( range, contentBounds ) ) {
+
+			return [ 0, 0, - 1, - 1 ];
+
+		}
+
+		// check if the range is outside the tile bounds
+		if ( tileBounds ) {
+
+			if ( normalized ) {
+
+				tileBounds = this.toNormalizedRange( tileBounds );
+
+			}
+
+			if ( ! doBoundsIntersect( range, contentBounds ) ) {
+
+				return [ 0, 0, - 1, - 1 ];
+
+			}
+
+		}
 
-		const minTile = this.getTileAtPoint( minX, minY, level, normalized );
-		const maxTile = this.getTileAtPoint( maxX, maxY, level, normalized );
+		const [ clampedMinX, clampedMinY, clampedMaxX, clampedMaxY ] = this.clampToContentBounds( range, normalized );
+		const minTile = this.getTileAtPoint( clampedMinX, clampedMinY, level, normalized );
+		const maxTile = this.getTileAtPoint( clampedMaxX, clampedMaxY, level, normalized );
 
 		if ( this.flipY ) {
 

test/TilingScheme.test.js

@@ -1,7 +1,7 @@
 import { TilingScheme } from '../src/three/plugins/images/utils/TilingScheme.js';
 import { ProjectionScheme } from '../src/three/plugins/images/utils/ProjectionScheme.js';
 
-describe( 'TiltingScheme', () => {
+describe( 'TilingScheme', () => {
 
 	it( 'should allow for automatically building levels.', () => {
 
@@ -123,6 +123,38 @@ describe( 'TiltingScheme', () => {
 
 	} );
 
+	if ( 'should report an empty set of tiles if the requested range is outside the level tile bounds.', () => {
+
+		const scheme = new TilingScheme();
+		scheme.setLevel( 0, {
+			tileCountX: 4,
+			tileCountY: 4,
+			tileBounds: [ 0.5, 0.5, 1.5, 1.5 ],
+		} );
+
+		expect( scheme.getTilesInRange( 0, 0, 0.25, 0.25, 0 ) ).toEqual( [ 0, 0, - 1, - 1 ] );
+		expect( scheme.getTilesInRange( 1.75, 1.75, 2, 2, 0 ) ).toEqual( [ 0, 0, - 1, - 1 ] );
+		expect( scheme.getTilesInRange( 0, 1.75, 2, 2, 0 ) ).toEqual( [ 0, 0, - 1, - 1 ] );
+		expect( scheme.getTilesInRange( 1.75, 0, 2, 2, 0 ) ).toEqual( [ 0, 0, - 1, - 1 ] );
+
+	} );
+
+	if ( 'should report an empty set of tiles if the requested range is outside the tiling scheme content bounds.', () => {
+
+		const scheme = new TilingScheme();
+		scheme.setContentBounds( 0.5, 0.5, 1.5, 1.5 );
+		scheme.setLevel( 0, {
+			tileCountX: 4,
+			tileCountY: 4,
+		} );
+
+		expect( scheme.getTilesInRange( 0, 0, 0.25, 0.25, 0 ) ).toEqual( [ 0, 0, - 1, - 1 ] );
+		expect( scheme.getTilesInRange( 1.75, 1.75, 2, 2, 0 ) ).toEqual( [ 0, 0, - 1, - 1 ] );
+		expect( scheme.getTilesInRange( 0, 1.75, 2, 2, 0 ) ).toEqual( [ 0, 0, - 1, - 1 ] );
+		expect( scheme.getTilesInRange( 1.75, 0, 2, 2, 0 ) ).toEqual( [ 0, 0, - 1, - 1 ] );
+
+	} );
+
 	it( 'should correctly report the set of tiles in a range relative to level tile bounds.', () => {
 
 		const scheme = new TilingScheme();