save refactor

Author: AlaricBaraou

src/three/plugins/images/PMTilesPlugin.js

@@ -13,11 +13,38 @@ export class PMTilesPlugin extends EllipsoidProjectionTilesPlugin {
 
 	}
 
+	// Intercept pmtiles:// URLs and fetch from the PMTiles archive
 	fetchData( url, options ) {
 
 		if ( url.startsWith( 'pmtiles://' ) ) {
 
-			return this.imageSource.fetchInternal( url, options );
+			const parts = url.split( '/' );
+			const y = parseInt( parts.pop() );
+			const x = parseInt( parts.pop() );
+			const z = parseInt( parts.pop() );
+
+			return this.imageSource.instance.getZxy( z, x, y, options?.signal )
+				.then( res => {
+
+					if ( ! res || ! res.data ) {
+
+						return new ArrayBuffer( 0 );
+
+					}
+
+					const data = res.data;
+
+					// Handle both ArrayBuffer and Uint8Array
+					if ( data instanceof ArrayBuffer ) {
+
+						return data;
+
+					}
+
+					// Uint8Array - copy to new ArrayBuffer to avoid shared buffer issues
+					return data.slice().buffer;
+
+				} );
 
 		}
 

src/three/plugins/images/sources/PMTilesImageSource.d.ts

@@ -16,7 +16,6 @@ export class PMTilesImageSource {
 
 	init(): Promise<void>;
 	getUrl( x: number, y: number, level: number ): string;
-	fetchInternal( url: string, options: { signal?: AbortSignal } ): Promise<ArrayBuffer | null>;
-	processBufferToTexture( buffer: ArrayBuffer ): Promise<Texture>;
+	fetchItem( tokens: [ number, number, number ], signal?: AbortSignal ): Promise<Texture>;
 
 }

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

@@ -1,56 +1,60 @@
 import { MVTImageSource } from './MVTImageSource.js';
-import { PMTilesFetcher } from './fetchers/PMTilesFetcher.js';
 import { ProjectionScheme } from '../utils/ProjectionScheme.js';
+import { PMTiles } from 'pmtiles';
 
 export class PMTilesImageSource extends MVTImageSource {
 
 	constructor( options = {} ) {
 
 		super( options );
 
-		// Use composed fetcher
-		this._fetcher = new PMTilesFetcher( { url: options.url } );
+		this.pmtilesUrl = options.url.replace( /^pmtiles:\/\//, '' );
+		this.instance = new PMTiles( this.pmtilesUrl );
 		this.tiling.flipY = true;
 
 	}
 
-	get pmtilesUrl() {
-
-		return this._fetcher.pmtilesUrl;
-
-	}
-
-	get instance() {
-
-		return this._fetcher.instance;
-
-	}
-
 	getUrl( x, y, level ) {
 
-		return this._fetcher.getUrl( x, y, level );
+		return `pmtiles://${level}/${x}/${y}`;
 
 	}
 
 	async init() {
 
-		const metadata = await this._fetcher.init();
+		const header = await this.instance.getHeader();
 		this.tiling.setProjection( new ProjectionScheme( 'EPSG:3857' ) );
-		this.tiling.generateLevels( metadata.maxZoom, this.tiling.projection.tileCountX, this.tiling.projection.tileCountY, {
+		this.tiling.generateLevels( header.maxZoom, this.tiling.projection.tileCountX, this.tiling.projection.tileCountY, {
 			tilePixelWidth: this.tileDimension,
 			tilePixelHeight: this.tileDimension,
 		} );
 
 	}
 
-	async fetchInternal( url, options ) {
+	// Override fetchItem to fetch directly from PMTiles archive (bypasses plugin fetchData chain)
+	fetchItem( tokens, signal ) {
+
+		const [ x, y, level ] = tokens;
+
+		return this.instance.getZxy( level, x, y, signal )
+			.then( res => {
+
+				if ( ! res || ! res.data ) {
+
+					return this._createEmptyTexture();
+
+				}
+
+				// res.data is Uint8Array - convert to ArrayBuffer for processBufferToTexture
+				const data = res.data;
+				const buffer = data.buffer.slice(
+					data.byteOffset,
+					data.byteOffset + data.byteLength
+				);
 
-		const parts = url.split( '/' );
-		const y = parseInt( parts.pop() );
-		const x = parseInt( parts.pop() );
-		const z = parseInt( parts.pop() );
+				return this.processBufferToTexture( buffer );
 
-		return this._fetcher.fetchTile( x, y, z, options.signal );
+			} );
 
 	}