maplibre-gl 6.3.0 → 6.4.0

package/dist/maplibre-gl-dev.mjs

@@ -1,10 +1,10 @@
 /**
 * MapLibre GL JS
-* @license 3-Clause BSD. Full text of license: https://github.com/maplibre/maplibre-gl-js/blob/v6.3.0/LICENSE.txt
+* @license 3-Clause BSD. Full text of license: https://github.com/maplibre/maplibre-gl-js/blob/v6.4.0/LICENSE.txt
 */
-import { $ as projectToWorldCoordinates, $n as defaultEasing, $r as add, $t as Transitionable, A as getOverlapMode, Ai as rotateZ, An as makeRequest, Ar as rollPitchBearingEqual, At as Uniform1f, B as parseGlyphPbf, Bi as offscreenCanvasSupported, Bn as MAX_VALID_LATITUDE, Br as zoomScale, Bt as CollisionBoxArray, C as createStyleLayer, Ci as identity, Cn as Evented, Cr as parseCacheControl, Ct as isHeatmapStyleLayer, D as isSymbolStyleLayer, Di as perspective, Dn as getJSON, Dr as rayPlaneIntersection, Dt as isCircleStyleLayer, E as isBackgroundStyleLayer, Ei as ortho, En as getArrayBuffer, Er as radiansToDegrees, Et as RGBAImage, Fi as create$2, Fn as config, Fr as threePlaneIntersection, Ft as UniformColor, Gn as clamp, Gr as scale$1, Gt as QuadTriangleArray, H as collisionCircleLayout, Hn as arrayBufferToImage, Hr as EXTENT, Ht as LineStripIndexArray, I as ImagePosition, Ii as determinant, In as AbortError, Ir as translatePosition, It as UniformColorArray, J as calculateTileMatrix, Jn as createIdentityMat4f64, Jr as fromEuler, Jt as createLayout, K as isFillExtrusionStyleLayer, Kn as clone$2, Kr as sqrLen, Kt as RasterBoundsArray, L as potpack, Li as invert, Ln as isAbortError, Lr as uniqueId, Lt as UniformFloatArray, M as evaluateSizeForZoom, Mi as translate, Mn as addProtocol, Mr as scaleZoom, Mt as Uniform2f, Ni as create$4, Nn as getProtocol, Nr as sphericalToCartesian, Nt as Uniform3f, O as SymbolBucket, Oi as rotateX, On as getReferrer, Or as readImageUsingVideoFrame, Ot as polygonIntersectsPolygon, P as getAnchorAlignment, Pi as fromRotation, Pn as removeProtocol, Pr as subscribe, Pt as Uniform4f, Q as maxMercatorHorizonAngle, Qn as deepEqual, Qr as transformMat4, Qt as TRANSITION_SUFFIX, R as isStyleImageWebGLData, Ri as rotate, Rn as throwIfAborted, Rr as warnOnce, Rt as UniformMatrix4f, S as Actor, Si as fromScaling, Sn as Event, Sr as nextPowerOfTwo, St as HEATMAP_FULL_RENDER_FBO_KEY, T as validateCustomStyleLayer, Ti as multiply, Tn as GLOBAL_DISPATCHER_ID, Tr as pointPlaneSignedDistance, Tt as AlphaImage, U as isLineStyleLayer, Un as arrayBufferToImageBitmap, Ur as create$3, Ut as Pos3dArray, Vi as Point, Vn as angleToRotateBetweenVectors2D, Vr as pixelsToTileUnits, Vt as CollisionCircleLayoutArray, Wn as bezier, Wr as length, Wt as PosArray, X as cameraMercatorCoordinateFromCenterAndRotation, Xn as createVec3f64, Xr as mul, Xt as DataConstantProperty, Y as cameraDirectionFromPitchBearing, Yn as createMat4f64, Yr as slerp, Yt as isRasterStyleLayer, Z as getMercatorHorizon, Zn as createVec4f64, Zr as scale$3, Zt as Properties, _ as OverscaledTileID, _i as clone$1, _n as featureFilter, _r as isTouchableOrPointableType, _t as SubdivisionGranularitySetting, a as clipLine, ai as negate, an as SPEC_SOURCE_TYPES, ar as extend, at as lngFromMercatorX, b as compareTileId, bi as equals, bn as latest, br as mapObject, bt as Texture, ci as rotateY, cn as validateStyle, cr as getAABB, ct as mercatorZfromAltitude, di as scaleAndAdd, dn as ProjectionDefinition, ei as clone, en as EvaluationParameters, er as degreesToRadians, et as tileCoordinatesToMercatorCoordinates, f as GEOJSON_TILE_LAYER_NAME, fi as sub, fn as ValidationError, fr as getRollPitchBearing, ft as isFillStyleLayer, g as CanonicalTileID, gi as zero$1, gn as emptyStyle, gr as isTouchableEvent, gt as SubdivisionGranularityExpression, h as Bounds, hi as transformQuat, hn as diff, hr as isSafari, ht as SOUTH_POLE_Y, ii as length$1, ir as evaluateZoomSnap, it as latFromMercatorY, j as evaluateSizeForFeature, ji as scale, jn as sameOrigin, jr as rollPitchBearingToQuat, jt as Uniform1i, k as addDynamicAttributes, ki as rotateY$1, kn as getVideo, kr as remapSaturate, kt as toEvaluationFeature, li as rotateZ$1, ln as validateStyleAndEmit, lr as getAngleDelta, lt as LngLat, mi as transformMat4$1, mn as derefLayers, mr as isPointableEvent, mt as NORTH_POLE_Y, ni as dot, nn as codePointUsesLocalIdeographFontFamily, nr as distanceOfAnglesRadians, nt as MercatorCoordinate, oi as normalize, on as emitValidationErrors, or as filterObject, ot as mercatorXfromLng, pi as transformMat3, pr as isImageBitmap, qn as createIdentityMat4f32, qr as zero, qt as TriangleIndexArray, r as TextAnchorEnum, ri as len, rn as ZoomHistory, rr as ensureError, rt as altitudeFromMercatorZ, s as TileCache, si as rotateX$1, sn as validateAndEmit, sr as findLineIntersection, st as mercatorYfromLat, t as getAnchorJustification, ti as cross, tr as differenceOfAnglesDegrees, tt as unprojectFromWorldCoordinates, u as GeoJSONFeature, ui as scale$2, un as Color, ur as getEdgeTiles, ut as earthRadius, v as UnwrappedTileID, vi as copy, vr as isWorker, vt as isColorReliefStyleLayer, w as isCustomStyleLayer, wi as invert$1, wn as AJAXError, wr as pick, wt as renderColorRamp, x as isInBoundsForZoomLngLat, xi as exactEquals, xn as ErrorEvent, xr as mod, xt as isHillshadeStyleLayer, y as calculateTileKey, yi as create$1, yn as interpolateFactory, yr as lerp, z as renderStyleImage, zi as isOffscreenCanvasDistorted, zr as wrap, zt as SegmentVector } from "./maplibre-gl-shared-dev.mjs";
+import { $ as tileCoordinatesToMercatorCoordinates, $n as deepEqual, $r as mul, $t as TRANSITION_SUFFIX, A as evaluateSizeForFeature, Ai as perspective, An as getVideo, Ar as remapSaturate, At as toEvaluationFeature, Bi as invert, Br as wrap, Bt as SegmentVector, C as isCustomStyleLayer, Ci as equals, Cn as Event, Cr as nextPowerOfTwo, Ct as HEATMAP_FULL_RENDER_FBO_KEY, D as SymbolBucket, Di as invert$1, Dn as getArrayBuffer, Dr as radiansToDegrees, Dt as RGBAImage, E as isSymbolStyleLayer, Ei as identity, En as GLOBAL_DISPATCHER_ID, Er as pointPlaneSignedDistance, Et as AlphaImage, F as ImagePosition, Fi as translate, Fn as removeProtocol, Fr as subscribe, Ft as Uniform4f, G as isFillExtrusionStyleLayer, Gn as bezier, Gr as length, Gt as PosArray, H as isLineStyleLayer, Hi as isOffscreenCanvasDistorted, Hn as angleToRotateBetweenVectors2D, Hr as pixelsToTileUnits, Ht as CollisionCircleLayoutArray, I as potpack, Ii as create$4, In as config, Ir as threePlaneIntersection, It as UniformColor, J as cameraDirectionFromPitchBearing, Jn as createIdentityMat4f32, Jr as zero, Jt as TriangleIndexArray, Kn as clamp, Kr as scale$1, Kt as QuadTriangleArray, L as isStyleImageWebGLData, Li as fromRotation, Ln as AbortError, Lr as translatePosition, Lt as UniformColorArray, Mi as rotateY$1, Mn as sameOrigin, Mr as rollPitchBearingToQuat, Mt as Uniform1i, N as getAnchorAlignment, Ni as rotateZ, Nn as addProtocol, Nr as scaleZoom, Nt as Uniform2f, O as addDynamicAttributes, Oi as multiply, On as getJSON, Or as rayPlaneIntersection, Ot as isCircleStyleLayer, Pi as scale, Pn as getProtocol, Pr as sphericalToCartesian, Pt as Uniform3f, Q as projectToWorldCoordinates, Qn as createVec4f64, Qr as slerp, Qt as Properties, R as renderStyleImage, Ri as create$2, Rn as isAbortError, Rr as uniqueId, Rt as UniformFloatArray, S as createStyleLayer, Si as create$1, Sn as ErrorEvent, Sr as mod, St as isHillshadeStyleLayer, T as isBackgroundStyleLayer, Ti as fromScaling, Tn as AJAXError, Tr as pick, Tt as renderColorRamp, Ui as offscreenCanvasSupported, Un as arrayBufferToImage, Ur as EXTENT, Ut as LineStripIndexArray, V as collisionCircleLayout, Vi as rotate, Vn as MAX_VALID_LATITUDE, Vr as zoomScale, Vt as CollisionBoxArray, Wi as Point, Wn as arrayBufferToImageBitmap, Wr as create$3, Wt as Pos3dArray, X as getMercatorHorizon, Xn as createMat4f64, Xr as fromValues, Xt as isRasterStyleLayer, Y as cameraMercatorCoordinateFromCenterAndRotation, Yn as createIdentityMat4f64, Yr as fromEuler, Yt as createLayout, Z as maxMercatorHorizonAngle, Zn as createVec3f64, Zr as multiply$1, Zt as DataConstantProperty, _ as UnwrappedTileID, _i as transformMat4$1, _n as emptyStyle, _r as isTouchableEvent, _t as SubdivisionGranularityExpression, a as clipLine, ai as dot, ar as evaluateZoomSnap, at as mercatorXfromLng, b as isInBoundsForZoomLngLat, bi as clone$1, bn as interpolateFactory, br as lerp, ci as negate, cn as validateAndEmit, cr as findLineIntersection, ct as LngLat, di as rotateY, dn as Color, dr as getEdgeTiles, dt as EXTENT_BOUNDS, ei as scale$3, en as Transitionable, er as defaultEasing, et as unprojectFromWorldCoordinates, f as GEOJSON_TILE_LAYER_NAME, fi as rotateZ$1, fn as ProjectionDefinition, ft as Bounds, g as OverscaledTileID, gi as transformMat3, gn as diff, gr as isSafari, gt as SOUTH_POLE_Y, h as CanonicalTileID, hi as sub, hn as derefLayers, hr as isPointableEvent, ht as NORTH_POLE_Y, ii as cross, in as ZoomHistory, ir as ensureError, it as lngFromMercatorX, j as evaluateSizeForZoom, ji as rotateX, jn as makeRequest, jr as rollPitchBearingEqual, jt as Uniform1f, k as getOverlapMode, ki as ortho, kn as getReferrer, kr as readImageUsingVideoFrame, kt as polygonIntersectsPolygon, li as normalize, ln as validateStyle, lr as getAABB, lt as earthRadius, mi as scaleAndAdd, mr as isImageBitmap, ni as add, nr as differenceOfAnglesDegrees, nt as altitudeFromMercatorZ, oi as len, on as SPEC_SOURCE_TYPES, or as extend, ot as mercatorYfromLat, pi as scale$2, pn as ValidationError, pr as getRollPitchBearing, pt as isFillStyleLayer, q as calculateTileMatrix, qn as clone$2, qr as sqrLen, qt as RasterBoundsArray, r as TextAnchorEnum, ri as clone, rn as codePointUsesLocalIdeographFontFamily, rr as distanceOfAnglesRadians, rt as latFromMercatorY, s as TileCache, si as length$1, sn as emitValidationErrors, sr as filterObject, st as mercatorZfromAltitude, t as getAnchorJustification, ti as transformMat4, tn as EvaluationParameters, tr as degreesToRadians, tt as MercatorCoordinate, u as GeoJSONFeature, ui as rotateX$1, un as validateStyleAndEmit, ur as getAngleDelta, v as calculateTileKey, vi as transformQuat, vn as featureFilter, vr as isTouchableOrPointableType, vt as SubdivisionGranularitySetting, w as validateCustomStyleLayer, wi as exactEquals, wn as Evented, wr as parseCacheControl, wt as isHeatmapStyleLayer, x as Actor, xi as copy, xn as latest, xr as mapObject, xt as Texture, y as compareTileId, yi as zero$1, yr as isWorker, yt as isColorReliefStyleLayer, z as parseGlyphPbf, zi as determinant, zn as throwIfAborted, zr as warnOnce, zt as UniformMatrix4f } from "./maplibre-gl-shared-dev.mjs";
 //#region package.json
-var version$2 = "6.3.0";
+var version$2 = "6.4.0";
 //#endregion
 //#region src/util/browser.ts
 let linkEl;
@@ -326,6 +326,12 @@ let ImageRequest;
 		for (const key of Object.keys(throttleControlCallbacks)) if (throttleControlCallbacks[key]()) return true;
 		return false;
 	};
+	async function transformAndGetImage(requestManager, url, resourceType, abortController, supportImageRefresh = true, imageBitmapOptions) {
+		const requestParameters = await requestManager.transformRequest(url, resourceType);
+		throwIfAborted(abortController.signal);
+		return ImageRequest.getImage(requestParameters, abortController, supportImageRefresh, imageBitmapOptions);
+	}
+	_ImageRequest.transformAndGetImage = transformAndGetImage;
 	_ImageRequest.getImage = (requestParameters, abortController, supportImageRefresh = true, imageBitmapOptions) => {
 		return new Promise((resolve, reject) => {
 			requestParameters.headers ||= {};
@@ -754,51 +760,25 @@ async function doOnceCompleted(jsonsMap, imagesMap) {
 //#endregion
 //#region src/render/image_manager.ts
 /**
-* When copied into the atlas texture, image data is padded by one pixel on each side. Icon
-* images are padded with fully transparent pixels, while pattern images are padded with a
-* copy of the image data wrapped from the opposite side. In both cases, this ensures the
-* correct behavior of GL_LINEAR texture sampling mode.
-*/
-const padding = 1;
-/**
-* ImageManager does three things:
-*
-* 1. Tracks requests for icon images from tile workers and sends responses when the requests are fulfilled.
-* 2. Builds a texture atlas for pattern images.
-* 3. Rerenders renderable images once per frame
-*
-* These are disparate responsibilities and should eventually be handled by different classes. When we implement
-* data-driven support for `*-pattern`, we'll likely use per-bucket pattern atlases, and that would be a good time
-* to refactor this.
+* Owns every image of the style - the ones the sprites bring in as well as the ones added at
+* runtime - and tracks requests for them from the tile workers, sending responses when the
+* requests are fulfilled.
 */
 var ImageManager = class extends Evented {
 	constructor() {
 		super();
 		this.images = {};
-		this.updatedImages = {};
-		this.callbackDispatchedThisFrame = {};
+		this.updateVersion = 0;
 		this.loaded = false;
 		this.requestors = [];
 		this.missingImageResolver = null;
-		this.patterns = {};
-		this.atlasImage = new RGBAImage({
-			width: 1,
-			height: 1
-		});
-		this.dirty = true;
+		this._spriteImagesIds = {};
+		this._imagesIds = null;
+		this._renderCallbacksDispatchedThisFrame = {};
 	}
 	destroy() {
-		if (this.atlasTexture) {
-			this.atlasTexture.destroy();
-			this.atlasTexture = null;
-		}
 		for (const id of Object.keys(this.images)) this.removeImage(id);
-		this.patterns = {};
-		this.atlasImage = new RGBAImage({
-			width: 1,
-			height: 1
-		});
-		this.dirty = true;
+		this._spriteImagesIds = {};
 	}
 	isLoaded() {
 		return this.loaded;
@@ -827,6 +807,7 @@ var ImageManager = class extends Evented {
 		if (this.images[id]) throw new Error(`Image id ${id} already exist, use updateImage instead`);
 		if (this._validate(id, image)) {
 			this.images[id] = image;
+			this._imagesIds = null;
 			if (image.isWebGLImage) this.updateImage(id, image, false);
 		}
 	}
@@ -869,21 +850,97 @@ var ImageManager = class extends Evented {
 		if (content[2] < content[0]) return false;
 		return content[3] >= content[1];
 	}
+	/**
+	* Replaces an image that is already known under this id, bumping its version so that the
+	* atlases holding it notice.
+	*
+	* The old record is read directly rather than through {@link ImageManager.getImage}, which
+	* would force a synchronous decode of the sprite data of the very image being replaced. Its
+	* size therefore comes from whichever of the two the pixels are still in, since an image that
+	* came from a sprite and was never rendered has not been decoded yet, and its version is
+	* defaulted, since images start out without one.
+	*
+	* @param validate - whether to reject an image of a different size than the one it replaces
+	*/
 	updateImage(id, image, validate = true) {
-		const oldImage = this.getImage(id);
-		if (validate && (oldImage.data.width !== image.data.width || oldImage.data.height !== image.data.height)) throw new Error(`size mismatch between old image (${oldImage.data.width}x${oldImage.data.height}) and new image (${image.data.width}x${image.data.height}).`);
-		image.version = oldImage.version + 1;
+		const oldImage = this.images[id];
+		if (validate) {
+			const oldData = oldImage.data || oldImage.spriteData;
+			if (oldData.width !== image.data.width || oldData.height !== image.data.height) throw new Error(`size mismatch between old image (${oldData.width}x${oldData.height}) and new image (${image.data.width}x${image.data.height}).`);
+		}
+		image.version = (oldImage.version ?? 0) + 1;
 		this.images[id] = image;
-		this.updatedImages[id] = true;
+		this.updateVersion++;
 	}
 	removeImage(id) {
 		const image = this.images[id];
+		if (!image) return;
 		delete this.images[id];
-		delete this.patterns[id];
+		this._imagesIds = null;
 		if (image.userImage?.onRemove) image.userImage.onRemove();
 	}
+	/**
+	* @returns the ids of every image currently held, sprite images and runtime ones alike. The
+	* returned array is shared between callers and must not be modified.
+	*/
 	listImages() {
-		return Object.keys(this.images);
+		this._imagesIds ??= Object.keys(this.images);
+		return this._imagesIds;
+	}
+	/**
+	* Images of the `default` sprite keep their plain id, the ones of any other sprite are
+	* namespaced by their sprite's id.
+	*/
+	_getSpriteImageId(spriteId, imageId) {
+		return spriteId === "default" ? imageId : `${spriteId}:${imageId}`;
+	}
+	/**
+	* Takes over the images of a single sprite: adds the new ones, updates the ones that are
+	* already known, and removes the ones that a previous load of this same sprite had brought in
+	* but that are not part of it anymore.
+	*
+	* @param spriteId - the id of the sprite the images belong to
+	* @param images - the sprite's images, keyed by their id within the sprite
+	* @returns the ids of the images that this sprite now provides, and the ids of the ones that
+	* were removed because they are no longer part of it
+	*/
+	setSpriteImages(spriteId, images) {
+		const previousIds = this._spriteImagesIds[spriteId] ?? [];
+		const loaded = [];
+		for (const id in images) {
+			const imageId = this._getSpriteImageId(spriteId, id);
+			loaded.push(imageId);
+			if (imageId in this.images) this.updateImage(imageId, images[id], false);
+			else this.addImage(imageId, images[id]);
+		}
+		const loadedIds = new Set(loaded);
+		const removed = previousIds.filter((imageId) => !loadedIds.has(imageId));
+		for (const imageId of removed) this.removeImage(imageId);
+		this._spriteImagesIds[spriteId] = loaded;
+		return {
+			loaded,
+			removed
+		};
+	}
+	/**
+	* Removes all the images a single sprite has brought in.
+	* @returns the ids of the removed images
+	*/
+	removeSpriteImages(spriteId) {
+		const removed = this._spriteImagesIds[spriteId] ?? [];
+		for (const imageId of removed) this.removeImage(imageId);
+		delete this._spriteImagesIds[spriteId];
+		return removed;
+	}
+	/**
+	* Removes the images of every sprite, leaving the images added at runtime alone.
+	* @returns the ids of the removed images
+	*/
+	removeAllSpriteImages() {
+		const removed = Object.values(this._spriteImagesIds).flat();
+		for (const imageId of removed) this.removeImage(imageId);
+		this._spriteImagesIds = {};
+		return removed;
 	}
 	setMissingImageResolver(resolver) {
 		this.missingImageResolver = resolver;
@@ -904,7 +961,7 @@ var ImageManager = class extends Evented {
 	async _getImagesForIds(ids) {
 		const unresolvedIds = new Set(ids.filter((id) => !this.getImage(id)));
 		const resolver = this.missingImageResolver;
-		if (resolver) await Promise.all(Array.from(unresolvedIds, (id) => resolver(id)));
+		if (resolver) await Promise.allSettled(Array.from(unresolvedIds, (id) => resolver(id)));
 		const response = {};
 		for (const id of ids) {
 			const image = this.getImage(id);
@@ -931,57 +988,126 @@ var ImageManager = class extends Evented {
 		}
 		return response;
 	}
+	beginFrame() {
+		this._renderCallbacksDispatchedThisFrame = {};
+	}
+	/**
+	* Re-renders the images among `ids` that were added with a `render` callback (see
+	* `StyleImageInterface`), at most once per frame each.
+	*/
+	dispatchRenderCallbacks(ids) {
+		for (const id of ids) {
+			if (this._renderCallbacksDispatchedThisFrame[id]) continue;
+			this._renderCallbacksDispatchedThisFrame[id] = true;
+			const image = this.getImage(id);
+			if (!image) warnOnce(`Image with ID: "${id}" was not found`);
+			if (renderStyleImage(image)) this.updateImage(id, image);
+		}
+	}
+	cloneImages() {
+		const clonedImages = {};
+		for (const id in this.images) {
+			const image = this.images[id];
+			clonedImages[id] = {
+				...image,
+				data: image.data ? image.data.clone() : null
+			};
+		}
+		return clonedImages;
+	}
+};
+//#endregion
+//#region src/render/pattern_atlas.ts
+/**
+* When copied into the atlas texture, pattern images are padded by one pixel on each side with a
+* copy of the image data wrapped from the opposite side. This ensures the correct behavior of
+* GL_LINEAR texture sampling mode.
+*/
+const PADDING = 1;
+/**
+* A texture atlas of the pattern images that are drawn without a tile's own {@link ImageAtlas},
+* i.e. `background-pattern`. Entries are packed on demand and re-packed whenever one of them is
+* added or changes, which is rare enough for the repacking cost not to matter.
+*/
+var PatternAtlas = class {
+	constructor(imageManager) {
+		this._imageManager = imageManager;
+		this._entries = {};
+		this._image = new RGBAImage({
+			width: 1,
+			height: 1
+		});
+		this._dirty = true;
+	}
+	destroy() {
+		if (this._texture) {
+			this._texture.destroy();
+			this._texture = null;
+		}
+		this._entries = {};
+		this._image = new RGBAImage({
+			width: 1,
+			height: 1
+		});
+		this._dirty = true;
+	}
 	getPixelSize() {
-		const { width, height } = this.atlasImage;
+		const { width, height } = this._image;
 		return {
 			width,
 			height
 		};
 	}
+	/**
+	* @returns the position of the pattern within the atlas, or `null` if there is no such image
+	*/
 	getPattern(id) {
-		const pattern = this.patterns[id];
-		const image = this.getImage(id);
+		const image = this._imageManager.getImage(id);
 		if (!image) return null;
-		if (pattern && pattern.position.version === image.version) return pattern.position;
-		if (!pattern) {
+		const entry = this._entries[id];
+		if (entry?.image !== image) {
 			const bin = {
 				w: image.data.width + 2,
 				h: image.data.height + 2,
 				x: 0,
 				y: 0
 			};
-			const position = new ImagePosition(bin, image);
-			this.patterns[id] = {
+			this._entries[id] = {
 				bin,
-				position
+				position: new ImagePosition(bin, image),
+				image
 			};
-		} else pattern.position.version = image.version;
-		this._updatePatternAtlas();
-		return this.patterns[id].position;
+		} else if (entry.position.version !== image.version) entry.position.version = image.version;
+		else return entry.position;
+		this._update();
+		return this._entries[id].position;
 	}
 	bind(context) {
 		const gl = context.gl;
-		if (!this.atlasTexture) this.atlasTexture = new Texture(context, this.atlasImage, gl.RGBA);
-		else if (this.dirty) {
-			this.atlasTexture.update(this.atlasImage);
-			this.dirty = false;
+		if (!this._texture) {
+			this._texture = new Texture(context, this._image, gl.RGBA);
+			this._dirty = false;
+		} else if (this._dirty) {
+			this._texture.update(this._image);
+			this._dirty = false;
 		}
-		this.atlasTexture.bind(gl.LINEAR, gl.CLAMP_TO_EDGE);
+		this._texture.bind(gl.LINEAR, gl.CLAMP_TO_EDGE);
 	}
-	_updatePatternAtlas() {
+	_update() {
+		for (const id in this._entries) if (!this._imageManager.getImage(id)) delete this._entries[id];
 		const bins = [];
-		for (const id in this.patterns) bins.push(this.patterns[id].bin);
+		for (const id in this._entries) bins.push(this._entries[id].bin);
 		const { w, h } = potpack(bins);
-		const dst = this.atlasImage;
+		const dst = this._image;
 		dst.resize({
 			width: w || 1,
 			height: h || 1
 		});
-		for (const id in this.patterns) {
-			const { bin } = this.patterns[id];
-			const x = bin.x + padding;
-			const y = bin.y + padding;
-			const src = this.getImage(id).data;
+		for (const id in this._entries) {
+			const { bin } = this._entries[id];
+			const x = bin.x + PADDING;
+			const y = bin.y + PADDING;
+			const src = this._entries[id].image.data;
 			const w = src.width;
 			const h = src.height;
 			RGBAImage.copy(src, dst, {
@@ -1035,30 +1161,7 @@ var ImageManager = class extends Evented {
 				height: h
 			});
 		}
-		this.dirty = true;
-	}
-	beginFrame() {
-		this.callbackDispatchedThisFrame = {};
-	}
-	dispatchRenderCallbacks(ids) {
-		for (const id of ids) {
-			if (this.callbackDispatchedThisFrame[id]) continue;
-			this.callbackDispatchedThisFrame[id] = true;
-			const image = this.getImage(id);
-			if (!image) warnOnce(`Image with ID: "${id}" was not found`);
-			if (renderStyleImage(image)) this.updateImage(id, image);
-		}
-	}
-	cloneImages() {
-		const clonedImages = {};
-		for (const id in this.images) {
-			const image = this.images[id];
-			clonedImages[id] = {
-				...image,
-				data: image.data ? image.data.clone() : null
-			};
-		}
-		return clonedImages;
+		this._dirty = true;
 	}
 };
 //#endregion
@@ -2790,10 +2893,9 @@ var RasterTileSource = class extends Evented {
 		const url = tile.tileID.canonical.url(this.tiles, this.map.getPixelRatio(), this.scheme);
 		const premultiply = this._premultiplyAlpha;
 		const imageBitmapOptions = premultiply ? void 0 : { premultiplyAlpha: "none" };
-		const request = await this.map._requestManager.transformRequest(url, "Tile");
 		tile.abortController = new AbortController();
 		try {
-			const response = await ImageRequest.getImage(request, tile.abortController, this.map._refreshExpiredTiles, imageBitmapOptions);
+			const response = await ImageRequest.transformAndGetImage(this.map._requestManager, url, "Tile", tile.abortController, this.map._refreshExpiredTiles, imageBitmapOptions);
 			delete tile.abortController;
 			if (tile.aborted) {
 				tile.state = "unloaded";
@@ -2875,11 +2977,10 @@ var RasterDEMTileSource = class extends RasterTileSource {
 	}
 	async loadTile(tile) {
 		const url = tile.tileID.canonical.url(this.tiles, this.map.getPixelRatio(), this.scheme);
-		const request = await this.map._requestManager.transformRequest(url, "Tile");
 		tile.neighboringTiles = this._getNeighboringTiles(tile.tileID);
 		tile.abortController = new AbortController();
 		try {
-			const response = await ImageRequest.getImage(request, tile.abortController, this.map._refreshExpiredTiles);
+			const response = await ImageRequest.transformAndGetImage(this.map._requestManager, url, "Tile", tile.abortController, this.map._refreshExpiredTiles, { colorSpaceConversion: "none" });
 			delete tile.abortController;
 			if (tile.aborted) {
 				tile.state = "unloaded";
@@ -3847,11 +3948,10 @@ var ImageSource = class extends Evented {
 		this._loaded = false;
 		this.fire(new MapSourceDataEvent("dataloading"));
 		this.url = this.options.url;
-		const request = await this.map._requestManager.transformRequest(this.url, "Image");
-		this._request = new AbortController();
+		this._abortController = new AbortController();
 		try {
-			const image = await ImageRequest.getImage(request, this._request);
-			this._request = null;
+			const image = await ImageRequest.transformAndGetImage(this.map._requestManager, this.url, "Image", this._abortController);
+			this._abortController = null;
 			this._loaded = true;
 			if (image?.data) {
 				this._setImage(image.data);
@@ -3859,9 +3959,10 @@ var ImageSource = class extends Evented {
 				this._finishLoading();
 			}
 		} catch (err) {
-			this._request = null;
+			if (isAbortError(err)) return;
+			this._abortController = null;
 			this._loaded = true;
-			if (!isAbortError(err)) this.fire(new ErrorEvent(ensureError(err)));
+			this.fire(new ErrorEvent(ensureError(err)));
 		}
 	}
 	loaded() {
@@ -3878,9 +3979,9 @@ var ImageSource = class extends Evented {
 	* @param options - The options object.
 	*/
 	updateImage(options) {
-		if (this._request) {
-			this._request.abort();
-			this._request = null;
+		if (this._abortController) {
+			this._abortController.abort();
+			this._abortController = null;
 		}
 		if ("image" in options) {
 			this._loaded = true;
@@ -3915,9 +4016,9 @@ var ImageSource = class extends Evented {
 		this.load();
 	}
 	onRemove() {
-		if (this._request) {
-			this._request.abort();
-			this._request = null;
+		if (this._abortController) {
+			this._abortController.abort();
+			this._abortController = null;
 		}
 		this._disposeTexture();
 		this.image = null;
@@ -5140,12 +5241,6 @@ function coveringTiles(transform, options) {
 	return result.sort((a, b) => a.distanceSq - b.distanceSq).map((a) => a.tileID);
 }
 //#endregion
-//#region src/data/extent_bounds.ts
-/**
-* The bounding box covering the entire extent of a tile.
-*/
-const EXTENT_BOUNDS = Bounds.fromPoints([new Point(0, 0), new Point(EXTENT, EXTENT)]);
-//#endregion
 //#region src/tile/tile_manager_raster.ts
 function isRasterType(type) {
 	return type === "raster" || type === "image" || type === "video";
@@ -5463,10 +5558,10 @@ var TileManager = class TileManager extends Evented {
 		if (shouldReload) this.reload();
 		if (this.transform) this.update(this.transform, this.terrain);
 	}
-	async _loadTile(tile, id, state) {
+	async _loadTile(tile, id, state, hadData) {
 		try {
 			const result = await this._source.loadTile(tile);
-			this._tileLoaded(tile, id, state, result);
+			this._tileLoaded(tile, id, state, hadData, result);
 		} catch (err) {
 			tile.state = "errored";
 			if (err.status !== 404) this._source.fire(new ErrorEvent(ensureError(err), { tile }));
@@ -5532,12 +5627,15 @@ var TileManager = class TileManager extends Evented {
 	async _reloadTile(id, state) {
 		const tile = this._inViewTiles.getTileById(id);
 		if (!tile) return;
+		const hadData = tile.hasData();
 		if (tile.state !== "loading") tile.state = state;
-		await this._loadTile(tile, id, state);
+		await this._loadTile(tile, id, state, hadData);
 	}
-	_tileLoaded(tile, id, previousState, result) {
-		tile.timeAdded = now();
-		if (tile.selfFading) tile.fadeEndTime = tile.timeAdded + this._rasterFadeDuration;
+	_tileLoaded(tile, id, previousState, hadData, result) {
+		if (!hadData) {
+			tile.timeAdded = now();
+			if (tile.selfFading) tile.fadeEndTime = tile.timeAdded + this._rasterFadeDuration;
+		}
 		if (previousState === "expired") tile.refreshedUponExpiration = true;
 		this._setTileReloadTimer(id, tile);
 		if (result?.unmodified) return;
@@ -5788,7 +5886,7 @@ var TileManager = class TileManager extends Evented {
 		const cached = tile;
 		if (!tile) {
 			tile = new Tile(tileID, this._source.tileSize * tileID.overscaleFactor());
-			this._loadTile(tile, tileID.key, tile.state);
+			this._loadTile(tile, tileID.key, tile.state, false);
 		}
 		tile.uses++;
 		this._inViewTiles.setTile(tileID.key, tile);
@@ -8284,24 +8382,54 @@ var TileLayerIndex = class {
 			const entry = this._symbolsByKey[symbolInstance.key];
 			if (!entry) continue;
 			const scaledSymbolCoord = this.getScaledCoordinates(symbolInstance, newTileID);
-			if (entry.index) {
-				const indexes = entry.index.range(scaledSymbolCoord.x - tolerance, scaledSymbolCoord.y - tolerance, scaledSymbolCoord.x + tolerance, scaledSymbolCoord.y + tolerance).sort();
-				for (const i of indexes) {
-					const crossTileID = entry.crossTileIDs[i];
-					if (!zoomCrossTileIDs[crossTileID]) {
-						zoomCrossTileIDs[crossTileID] = true;
-						symbolInstance.crossTileID = crossTileID;
-						break;
-					}
-				}
-			} else if (entry.positions) for (let i = 0; i < entry.positions.length; i++) {
-				const thisTileSymbol = entry.positions[i];
-				const crossTileID = entry.crossTileIDs[i];
-				if (Math.abs(thisTileSymbol.x - scaledSymbolCoord.x) <= tolerance && Math.abs(thisTileSymbol.y - scaledSymbolCoord.y) <= tolerance && !zoomCrossTileIDs[crossTileID]) {
-					zoomCrossTileIDs[crossTileID] = true;
-					symbolInstance.crossTileID = crossTileID;
-					break;
-				}
+			if (entry.index) this.findMatchesForIndexedEntry(entry, symbolInstance, scaledSymbolCoord, tolerance, zoomCrossTileIDs);
+			else if (entry.positions) this.findMatchesForNonIndexedEntry(entry, symbolInstance, scaledSymbolCoord, tolerance, zoomCrossTileIDs);
+		}
+	}
+	/**
+	* Matches a symbol instance against an entry backed by a KDBush spatial index
+	* (used for keys with more than {@link KDBUSH_THRESHHOLD} symbols).
+	*
+	* Matches any symbol with the same key whose coordinates are within one grid
+	* unit (with a 4px grid, this covers a 12px by 12px area). The lowest-index
+	* unclaimed candidate is claimed in a single pass rather than sorting the
+	* whole result set on every query: `range()` can return many candidates where
+	* symbols are coincident (e.g. stacked point markers), so a per-query sort
+	* would dominate placement cost on dense layers.
+	*
+	* Once a symbol is marked duplicate against a parent symbol, no other symbol
+	* at the same zoom level may duplicate against the same parent (see issue #5993).
+	*/
+	findMatchesForIndexedEntry(entry, symbolInstance, scaledSymbolCoord, tolerance, zoomCrossTileIDs) {
+		const indexes = entry.index.range(scaledSymbolCoord.x - tolerance, scaledSymbolCoord.y - tolerance, scaledSymbolCoord.x + tolerance, scaledSymbolCoord.y + tolerance);
+		let bestIndex = Infinity;
+		for (const candidate of indexes) if (candidate < bestIndex && !zoomCrossTileIDs[entry.crossTileIDs[candidate]]) bestIndex = candidate;
+		if (bestIndex !== Infinity) {
+			const crossTileID = entry.crossTileIDs[bestIndex];
+			zoomCrossTileIDs[crossTileID] = true;
+			symbolInstance.crossTileID = crossTileID;
+		}
+	}
+	/**
+	* Matches a symbol instance against an entry that stores its positions as a
+	* plain array (used for keys with at most {@link KDBUSH_THRESHHOLD} symbols).
+	*
+	* Matches any symbol with the same key whose coordinates are within one grid
+	* unit (with a 4px grid, this covers a 12px by 12px area). Positions are
+	* stored in symbol-instance order, so the first unclaimed match is also the
+	* lowest-index one.
+	*
+	* Once a symbol is marked duplicate against a parent symbol, no other symbol
+	* at the same zoom level may duplicate against the same parent (see issue #5993).
+	*/
+	findMatchesForNonIndexedEntry(entry, symbolInstance, scaledSymbolCoord, tolerance, zoomCrossTileIDs) {
+		for (let i = 0; i < entry.positions.length; i++) {
+			const thisTileSymbol = entry.positions[i];
+			const crossTileID = entry.crossTileIDs[i];
+			if (Math.abs(thisTileSymbol.x - scaledSymbolCoord.x) <= tolerance && Math.abs(thisTileSymbol.y - scaledSymbolCoord.y) <= tolerance && !zoomCrossTileIDs[crossTileID]) {
+				zoomCrossTileIDs[crossTileID] = true;
+				symbolInstance.crossTileID = crossTileID;
+				break;
 			}
 		}
 	}
@@ -8423,7 +8551,7 @@ var CrossTileSymbolIndex = class {
 var _prelude_fragment_glsl_g_default = "#ifdef GL_ES\nprecision mediump float;\n#else\n#if !defined(lowp)\n#define lowp\n#endif\n#if !defined(mediump)\n#define mediump\n#endif\n#if !defined(highp)\n#define highp\n#endif\n#endif\nout highp vec4 fragColor;";
 //#endregion
 //#region src/shaders/glsl/_prelude.vertex.glsl.g.ts
-var _prelude_vertex_glsl_g_default = "#ifdef GL_ES\nprecision highp float;\n#else\n#if !defined(lowp)\n#define lowp\n#endif\n#if !defined(mediump)\n#define mediump\n#endif\n#if !defined(highp)\n#define highp\n#endif\n#endif\nvec2 unpack_float(const float packedValue) {int packedIntValue=int(packedValue);int v0=packedIntValue/256;return vec2(v0,packedIntValue-v0*256);}vec2 unpack_opacity(const uint packedOpacity) {return vec2(float(packedOpacity >> 1u)/127.0,float(packedOpacity & 1u));}vec4 decode_color(const vec2 encodedColor) {return vec4(unpack_float(encodedColor[0])/255.0,unpack_float(encodedColor[1])/255.0\n);}float unpack_mix_vec2(const vec2 packedValue,const float t) {return mix(packedValue[0],packedValue[1],t);}vec4 unpack_mix_color(const vec4 packedColors,const float t) {vec4 minColor=decode_color(vec2(packedColors[0],packedColors[1]));vec4 maxColor=decode_color(vec2(packedColors[2],packedColors[3]));return mix(minColor,maxColor,t);}vec2 get_pattern_pos(const vec2 pixel_coord_upper,const vec2 pixel_coord_lower,const vec2 pattern_size,const float tile_units_to_pixels,const vec2 pos) {vec2 offset=mod(mod(mod(pixel_coord_upper,pattern_size)*256.0,pattern_size)*256.0+pixel_coord_lower,pattern_size);return (tile_units_to_pixels*pos+offset)/pattern_size;}mat3 rotationMatrixFromAxisAngle(vec3 u,float angle) {float c=cos(angle);float s=sin(angle);float c2=1.0-c;return mat3(u.x*u.x*c2+      c,u.x*u.y*c2-u.z*s,u.x*u.z*c2+u.y*s,u.y*u.x*c2+u.z*s,u.y*u.y*c2+    c,u.y*u.z*c2-u.x*s,u.z*u.x*c2-u.y*s,u.z*u.y*c2+u.x*s,u.z*u.z*c2+    c\n);}\n#ifdef TERRAIN3D\nuniform sampler2D u_terrain;uniform float u_terrain_dim;uniform mat4 u_terrain_matrix;uniform vec4 u_terrain_unpack;uniform float u_terrain_exaggeration;uniform highp sampler2D u_depth;\n#endif\nconst highp vec4 bitSh=vec4(256.*256.*256.,256.*256.,256.,1.);const highp vec4 bitShifts=vec4(1.)/bitSh;highp float unpack(highp vec4 color) {return dot(color,bitShifts);}highp float depthOpacity(vec3 frag) {\n#ifdef TERRAIN3D\nhighp float d=unpack(texture(u_depth,frag.xy*0.5+0.5))+0.0001-frag.z;return 1.0-max(0.0,min(1.0,-d*500.0));\n#else\nreturn 1.0;\n#endif\n}float calculate_visibility(vec4 pos) {\n#ifdef TERRAIN3D\nvec3 frag=pos.xyz/pos.w;highp float d=depthOpacity(frag);if (d > 0.95) return 1.0;return (d+depthOpacity(frag+vec3(0.0,0.01,0.0)))/2.0;\n#else\nreturn 1.0;\n#endif\n}float ele(vec2 pos) {\n#ifdef TERRAIN3D\nvec4 rgb=(texture(u_terrain,pos)*255.0)*u_terrain_unpack;return rgb.r+rgb.g+rgb.b-u_terrain_unpack.a;\n#else\nreturn 0.0;\n#endif\n}float get_elevation(vec2 pos) {\n#ifdef TERRAIN3D\n#ifdef GLOBE\nif ((pos.y <-32767.5) || (pos.y > 32766.5)) {return 0.0;}\n#endif\nvec2 coord=(u_terrain_matrix*vec4(pos,0.0,1.0)).xy*u_terrain_dim+1.0;vec2 f=fract(coord);vec2 c=(floor(coord)+0.5)/(u_terrain_dim+2.0);float d=1.0/(u_terrain_dim+2.0);float tl=ele(c);float tr=ele(c+vec2(d,0.0));float bl=ele(c+vec2(0.0,d));float br=ele(c+vec2(d,d));float elevation=mix(mix(tl,tr,f.x),mix(bl,br,f.x),f.y);return elevation*u_terrain_exaggeration;\n#else\nreturn 0.0;\n#endif\n}const float PI=3.141592653589793;uniform mat4 u_projection_matrix;";
+var _prelude_vertex_glsl_g_default = "#ifdef GL_ES\nprecision highp float;\n#else\n#if !defined(lowp)\n#define lowp\n#endif\n#if !defined(mediump)\n#define mediump\n#endif\n#if !defined(highp)\n#define highp\n#endif\n#endif\nvec2 unpack_float(const float packedValue) {int packedIntValue=int(packedValue);int v0=packedIntValue/256;return vec2(v0,packedIntValue-v0*256);}vec2 unpack_opacity(const uint packedOpacity) {return vec2(float(packedOpacity >> 1u)/127.0,float(packedOpacity & 1u));}vec4 decode_color(const vec2 encodedColor) {return vec4(unpack_float(encodedColor[0])/255.0,unpack_float(encodedColor[1])/255.0\n);}float unpack_mix_vec2(const vec2 packedValue,const float t) {return mix(packedValue[0],packedValue[1],t);}vec4 unpack_mix_color(const vec4 packedColors,const float t) {vec4 minColor=decode_color(vec2(packedColors[0],packedColors[1]));vec4 maxColor=decode_color(vec2(packedColors[2],packedColors[3]));return mix(minColor,maxColor,t);}vec2 get_pattern_pos(const vec2 pixel_coord_upper,const vec2 pixel_coord_lower,const vec2 pattern_size,const float tile_units_to_pixels,const vec2 pos) {vec2 offset=mod(mod(mod(pixel_coord_upper,pattern_size)*256.0,pattern_size)*256.0+pixel_coord_lower,pattern_size);return (tile_units_to_pixels*pos+offset)/pattern_size;}mat3 rotationMatrixFromAxisAngle(vec3 u,float angle) {float c=cos(angle);float s=sin(angle);float c2=1.0-c;return mat3(u.x*u.x*c2+      c,u.x*u.y*c2-u.z*s,u.x*u.z*c2+u.y*s,u.y*u.x*c2+u.z*s,u.y*u.y*c2+    c,u.y*u.z*c2-u.x*s,u.z*u.x*c2-u.y*s,u.z*u.y*c2+u.x*s,u.z*u.z*c2+    c\n);}\n#ifdef TERRAIN3D\nuniform sampler2D u_terrain;uniform float u_terrain_dim;uniform mat4 u_terrain_matrix;uniform vec4 u_terrain_unpack;uniform float u_terrain_exaggeration;uniform highp sampler2D u_depth;\n#endif\nconst highp vec4 bitSh=vec4(256.*256.*256.,256.*256.,256.,1.);const highp vec4 bitShifts=vec4(1.)/bitSh;highp float unpack(highp vec4 color) {return dot(color,bitShifts);}highp float depthOpacity(vec3 frag) {\n#ifdef TERRAIN3D\nhighp float d=unpack(texture(u_depth,frag.xy*0.5+0.5))+0.0001-frag.z;return 1.0-max(0.0,min(1.0,-d*500.0));\n#else\nreturn 1.0;\n#endif\n}float calculate_visibility(vec4 pos) {\n#ifdef TERRAIN3D\nvec3 frag=pos.xyz/pos.w;highp float d=depthOpacity(frag);if (d > 0.95) return 1.0;return (d+depthOpacity(frag+vec3(0.0,0.01,0.0)))/2.0;\n#else\nreturn 1.0;\n#endif\n}float ele(ivec2 pos) {\n#ifdef TERRAIN3D\nvec4 rgb=(texelFetch(u_terrain,pos,0)*255.0)*u_terrain_unpack;return rgb.r+rgb.g+rgb.b-u_terrain_unpack.a;\n#else\nreturn 0.0;\n#endif\n}float get_elevation(vec2 pos) {\n#ifdef TERRAIN3D\n#ifdef GLOBE\nif ((pos.y <-32767.5) || (pos.y > 32766.5)) {return 0.0;}\n#endif\nvec2 coord=(u_terrain_matrix*vec4(pos,0.0,1.0)).xy*u_terrain_dim+1.0;vec2 f=fract(coord);ivec2 c=ivec2(floor(coord));ivec2 hi=textureSize(u_terrain,0)-1;float tl=ele(clamp(c,ivec2(0),hi));float tr=ele(clamp(c+ivec2(1,0),ivec2(0),hi));float bl=ele(clamp(c+ivec2(0,1),ivec2(0),hi));float br=ele(clamp(c+ivec2(1,1),ivec2(0),hi));float elevation=mix(mix(tl,tr,f.x),mix(bl,br,f.x),f.y);return elevation*u_terrain_exaggeration;\n#else\nreturn 0.0;\n#endif\n}const float PI=3.141592653589793;uniform mat4 u_projection_matrix;";
 //#endregion
 //#region src/shaders/glsl/background.fragment.glsl.g.ts
 var background_fragment_glsl_g_default = "uniform vec4 u_color;uniform float u_opacity;void main() {fragColor=u_color*u_opacity;\n#ifdef OVERDRAW_INSPECTOR\nfragColor=vec4(1.0);\n#endif\n}";
@@ -8459,7 +8587,7 @@ const shaders = {
 	heatmapTexture: prepare("uniform sampler2D u_image;uniform sampler2D u_color_ramp;uniform float u_opacity;in vec2 v_pos;void main() {float t=texture(u_image,v_pos).r;vec4 color=texture(u_color_ramp,vec2(t,0.5));fragColor=color*u_opacity;\n#ifdef OVERDRAW_INSPECTOR\nfragColor=vec4(0.0);\n#endif\n}", "uniform mat4 u_matrix;uniform vec2 u_world;layout(location=0) in vec2 a_pos;out vec2 v_pos;void main() {gl_Position=u_matrix*vec4(a_pos*u_world,0,1);v_pos.x=a_pos.x;v_pos.y=1.0-a_pos.y;}"),
 	collisionBox: prepare("flat in float v_placed;flat in float v_notUsed;void main() {float alpha=0.5;fragColor=vec4(1.0,0.0,0.0,1.0)*alpha;if (v_placed > 0.5) {fragColor=vec4(0.0,0.0,1.0,0.5)*alpha;}if (v_notUsed > 0.5) {fragColor*=.1;}}", "layout(location=0) in vec2 a_anchor_pos;layout(location=1) in vec2 a_placed;layout(location=2) in vec2 a_box_real;uniform vec2 u_pixel_extrude_scale;flat out float v_placed;flat out float v_notUsed;void main() {gl_Position=projectTileWithElevation(a_anchor_pos,get_elevation(a_anchor_pos));gl_Position.xy=((a_box_real+0.5)*u_pixel_extrude_scale*2.0-1.0)*vec2(1.0,-1.0)*gl_Position.w;if (gl_Position.z/gl_Position.w < 1.1) {gl_Position.z=0.5;}v_placed=a_placed.x;v_notUsed=a_placed.y;}"),
 	collisionCircle: prepare("flat in float v_radius;in vec2 v_extrude;flat in float v_collision;void main() {float alpha=0.5;float stroke_radius=0.9;float distance_to_center=length(v_extrude);float distance_to_edge=abs(distance_to_center-v_radius);float opacity_t=smoothstep(-stroke_radius,0.0,-distance_to_edge);vec4 color=mix(vec4(0.0,0.0,1.0,0.5),vec4(1.0,0.0,0.0,1.0),v_collision);fragColor=color*alpha*opacity_t;}", "layout(location=0) in vec2 a_pos;layout(location=1) in float a_radius;layout(location=2) in vec2 a_flags;uniform vec2 u_viewport_size;flat out float v_radius;out vec2 v_extrude;flat out float v_collision;void main() {float radius=a_radius;float collision=a_flags.x;float vertexIdx=a_flags.y;vec2 quadVertexOffset=vec2(mix(-1.0,1.0,float(vertexIdx >=2.0)),mix(-1.0,1.0,float(vertexIdx >=1.0 && vertexIdx <=2.0)));vec2 quadVertexExtent=quadVertexOffset*radius;float padding_factor=1.2;v_radius=radius;v_extrude=quadVertexExtent*padding_factor;v_collision=collision;gl_Position=vec4((a_pos/u_viewport_size*2.0-1.0)*vec2(1.0,-1.0),0.0,1.0)+vec4(quadVertexExtent*padding_factor/u_viewport_size*2.0,0.0,0.0);}"),
-	colorRelief: prepare("#ifdef GL_ES\nprecision highp float;\n#endif\nuniform sampler2D u_image;uniform vec4 u_unpack;uniform sampler2D u_elevation_stops;uniform sampler2D u_color_stops;uniform int u_color_ramp_size;uniform float u_opacity;in vec2 v_pos;float getElevation(vec2 coord) {vec4 data=texture(u_image,coord)*255.0;data.a=-1.0;return dot(data,u_unpack);}float getElevationStop(int stop) {float x=(float(stop)+0.5)/float(u_color_ramp_size);vec4 data=texture(u_elevation_stops,vec2(x,0))*255.0;data.a=-1.0;return dot(data,u_unpack);}void main() {float el=getElevation(v_pos);int r=(u_color_ramp_size-1);int l=0;float el_l=getElevationStop(l);float el_r=getElevationStop(r);while(r-l > 1){int m=(r+l)/2;float el_m=getElevationStop(m);if(el < el_m){r=m;el_r=el_m;}else\n{l=m;el_l=el_m;}}float x=(float(l)+(el-el_l)/(el_r-el_l)+0.5)/float(u_color_ramp_size);fragColor=u_opacity*texture(u_color_stops,vec2(x,0));\n#ifdef OVERDRAW_INSPECTOR\nfragColor=vec4(1.0);\n#endif\n}", "uniform vec2 u_dimension;layout(location=0) in vec2 a_pos;out vec2 v_pos;void main() {gl_Position=projectTile(a_pos,a_pos);highp vec2 epsilon=1.0/u_dimension;float scale=(u_dimension.x-2.0)/u_dimension.x;v_pos=(a_pos/8192.0)*scale+epsilon;if (a_pos.y <-32767.5) {v_pos.y=0.0;}if (a_pos.y > 32766.5) {v_pos.y=1.0;}}"),
+	colorRelief: prepare("#ifdef GL_ES\nprecision highp float;\n#endif\nuniform sampler2D u_image;uniform vec4 u_unpack;uniform sampler2D u_elevation_stops;uniform sampler2D u_color_stops;uniform int u_color_ramp_size;uniform float u_opacity;in vec2 v_pos;float getElevation(vec2 coord) {vec4 data=texture(u_image,coord)*255.0;data.a=-1.0;return dot(data,u_unpack);}float getElevationStop(int stop) {vec4 data=texelFetch(u_elevation_stops,ivec2(stop,0),0)*255.0;data.a=-1.0;return dot(data,u_unpack);}void main() {float el=getElevation(v_pos);int r=(u_color_ramp_size-1);int l=0;float el_l=getElevationStop(l);float el_r=getElevationStop(r);while(r-l > 1){int m=(r+l)/2;float el_m=getElevationStop(m);if(el < el_m){r=m;el_r=el_m;}else\n{l=m;el_l=el_m;}}float x=(float(l)+(el-el_l)/(el_r-el_l)+0.5)/float(u_color_ramp_size);fragColor=u_opacity*texture(u_color_stops,vec2(x,0));\n#ifdef OVERDRAW_INSPECTOR\nfragColor=vec4(1.0);\n#endif\n}", "uniform vec2 u_dimension;layout(location=0) in vec2 a_pos;out vec2 v_pos;void main() {gl_Position=projectTile(a_pos,a_pos);highp vec2 epsilon=1.0/u_dimension;float scale=(u_dimension.x-2.0)/u_dimension.x;v_pos=(a_pos/8192.0)*scale+epsilon;if (a_pos.y <-32767.5) {v_pos.y=0.0;}if (a_pos.y > 32766.5) {v_pos.y=1.0;}}"),
 	debug: prepare("uniform highp vec4 u_color;uniform sampler2D u_overlay;in vec2 v_uv;void main() {vec4 overlay_color=texture(u_overlay,v_uv);fragColor=mix(u_color,overlay_color,overlay_color.a);}", "layout(location=0) in vec2 a_pos;out vec2 v_uv;uniform float u_overlay_scale;void main() {v_uv=a_pos/8192.0;gl_Position=projectTileWithElevation(a_pos*u_overlay_scale,get_elevation(a_pos));}"),
 	depth: prepare(clipping_mask_fragment_glsl_g_default, "layout(location=0) in vec2 a_pos;void main() {\n#ifdef GLOBE\ngl_Position=projectTileFor3D(a_pos,0.0);\n#else\ngl_Position=u_projection_matrix*vec4(a_pos,0.0,1.0);\n#endif\n}"),
 	fill: prepare("#pragma maplibre: define highp vec4 color\n#pragma maplibre: define lowp float opacity\nvoid main() {\n#pragma maplibre: initialize highp vec4 color\n#pragma maplibre: initialize lowp float opacity\nfragColor=color*opacity;\n#ifdef OVERDRAW_INSPECTOR\nfragColor=vec4(1.0);\n#endif\n}", "uniform vec2 u_fill_translate;layout(location=0) in vec2 a_pos;\n#pragma maplibre: define highp vec4 color\n#pragma maplibre: define lowp float opacity\nvoid main() {\n#pragma maplibre: initialize highp vec4 color\n#pragma maplibre: initialize lowp float opacity\nif (opacity < 0.01) {gl_Position=vec4(-2.0,-2.0,-2.0,1.0);return;}gl_Position=projectTile(a_pos+u_fill_translate,a_pos);}"),
@@ -8468,7 +8596,7 @@ const shaders = {
 	fillPattern: prepare("#ifdef GL_ES\nprecision highp float;\n#endif\nuniform vec2 u_texsize;uniform float u_fade;uniform sampler2D u_image;in vec2 v_pos_a;in vec2 v_pos_b;\n#pragma maplibre: define lowp float opacity\n#pragma maplibre: define lowp vec4 pattern_from\n#pragma maplibre: define lowp vec4 pattern_to\nvoid main() {\n#pragma maplibre: initialize lowp float opacity\n#pragma maplibre: initialize mediump vec4 pattern_from\n#pragma maplibre: initialize mediump vec4 pattern_to\nvec2 pattern_tl_a=pattern_from.xy;vec2 pattern_br_a=pattern_from.zw;vec2 pattern_tl_b=pattern_to.xy;vec2 pattern_br_b=pattern_to.zw;vec2 imagecoord=mod(v_pos_a,1.0);vec2 pos=mix(pattern_tl_a/u_texsize,pattern_br_a/u_texsize,imagecoord);vec4 color1=texture(u_image,pos);vec2 imagecoord_b=mod(v_pos_b,1.0);vec2 pos2=mix(pattern_tl_b/u_texsize,pattern_br_b/u_texsize,imagecoord_b);vec4 color2=texture(u_image,pos2);fragColor=mix(color1,color2,u_fade)*opacity;\n#ifdef OVERDRAW_INSPECTOR\nfragColor=vec4(1.0);\n#endif\n}", "uniform vec2 u_pixel_coord_upper;uniform vec2 u_pixel_coord_lower;uniform vec3 u_scale;uniform vec2 u_fill_translate;layout(location=0) in vec2 a_pos;out vec2 v_pos_a;out vec2 v_pos_b;\n#pragma maplibre: define lowp float opacity\n#pragma maplibre: define lowp vec4 pattern_from\n#pragma maplibre: define lowp vec4 pattern_to\n#pragma maplibre: define lowp float pixel_ratio_from\n#pragma maplibre: define lowp float pixel_ratio_to\nvoid main() {\n#pragma maplibre: initialize lowp float opacity\n#pragma maplibre: initialize mediump vec4 pattern_from\n#pragma maplibre: initialize mediump vec4 pattern_to\n#pragma maplibre: initialize lowp float pixel_ratio_from\n#pragma maplibre: initialize lowp float pixel_ratio_to\nif (opacity < 0.01) {gl_Position=vec4(-2.0,-2.0,-2.0,1.0);return;}vec2 pattern_tl_a=pattern_from.xy;vec2 pattern_br_a=pattern_from.zw;vec2 pattern_tl_b=pattern_to.xy;vec2 pattern_br_b=pattern_to.zw;float tileZoomRatio=u_scale.x;float fromScale=u_scale.y;float toScale=u_scale.z;vec2 display_size_a=(pattern_br_a-pattern_tl_a)/pixel_ratio_from;vec2 display_size_b=(pattern_br_b-pattern_tl_b)/pixel_ratio_to;gl_Position=projectTile(a_pos+u_fill_translate,a_pos);v_pos_a=get_pattern_pos(u_pixel_coord_upper,u_pixel_coord_lower,fromScale*display_size_a,tileZoomRatio,a_pos);v_pos_b=get_pattern_pos(u_pixel_coord_upper,u_pixel_coord_lower,toScale*display_size_b,tileZoomRatio,a_pos);}"),
 	fillExtrusion: prepare("in vec4 v_color;void main() {fragColor=v_color;\n#ifdef OVERDRAW_INSPECTOR\nfragColor=vec4(1.0);\n#endif\n}", "uniform vec3 u_lightcolor;uniform lowp vec3 u_lightpos;uniform lowp vec3 u_lightpos_globe;uniform lowp float u_lightintensity;uniform float u_vertical_gradient;uniform lowp float u_opacity;uniform vec2 u_fill_translate;layout(location=0) in vec2 a_pos;layout(location=1) in ivec4 a_normal_ed;\n#ifdef TERRAIN3D\nlayout(location=2) in vec2 a_centroid;\n#endif\nout vec4 v_color;\n#pragma maplibre: define highp float base\n#pragma maplibre: define highp float height\n#pragma maplibre: define highp vec4 color\nvoid main() {\n#pragma maplibre: initialize highp float base\n#pragma maplibre: initialize highp float height\n#pragma maplibre: initialize highp vec4 color\nvec3 normal=vec3(a_normal_ed.xyz);\n#ifdef TERRAIN3D\nfloat height_terrain3d_offset=get_elevation(a_centroid);float base_terrain3d_offset=height_terrain3d_offset-(base > 0.0 ? 0.0 : 10.0);\n#else\nfloat height_terrain3d_offset=0.0;float base_terrain3d_offset=0.0;\n#endif\nbase=max(0.0,base)+base_terrain3d_offset;height=max(0.0,height)+height_terrain3d_offset;float t=float(a_normal_ed.x & 1);float elevation=t > 0.0 ? height : base;vec2 posInTile=a_pos+u_fill_translate;\n#ifdef GLOBE\nvec3 spherePos=projectToSphere(posInTile,a_pos);gl_Position=interpolateProjectionFor3D(posInTile,spherePos,elevation);\n#else\ngl_Position=u_projection_matrix*vec4(posInTile,elevation,1.0);\n#endif\nfloat colorvalue=color.r*0.2126+color.g*0.7152+color.b*0.0722;v_color=vec4(0.0,0.0,0.0,1.0);vec4 ambientlight=vec4(0.03,0.03,0.03,1.0);color+=ambientlight;vec3 normalForLighting=normal/16384.0;float directional=clamp(dot(normalForLighting,u_lightpos),0.0,1.0);\n#ifdef GLOBE\nmat3 rotMatrix=globeGetRotationMatrix(spherePos);normalForLighting=rotMatrix*normalForLighting;directional=mix(directional,clamp(dot(normalForLighting,u_lightpos_globe),0.0,1.0),u_projection_transition);\n#endif\ndirectional=mix((1.0-u_lightintensity),max((1.0-colorvalue+u_lightintensity),1.0),directional);if (normal.y !=0.0) {directional*=((1.0-u_vertical_gradient)+(u_vertical_gradient*clamp((t+base)*pow(height/150.0,0.5),mix(0.7,0.98,1.0-u_lightintensity),1.0)));}v_color.r+=clamp(color.r*directional*u_lightcolor.r,mix(0.0,0.3,1.0-u_lightcolor.r),1.0);v_color.g+=clamp(color.g*directional*u_lightcolor.g,mix(0.0,0.3,1.0-u_lightcolor.g),1.0);v_color.b+=clamp(color.b*directional*u_lightcolor.b,mix(0.0,0.3,1.0-u_lightcolor.b),1.0);v_color*=u_opacity;}"),
 	fillExtrusionPattern: prepare("uniform vec2 u_texsize;uniform float u_fade;uniform sampler2D u_image;in vec2 v_pos_a;in vec2 v_pos_b;in vec4 v_lighting;\n#pragma maplibre: define lowp float base\n#pragma maplibre: define lowp float height\n#pragma maplibre: define lowp vec4 pattern_from\n#pragma maplibre: define lowp vec4 pattern_to\n#pragma maplibre: define lowp float pixel_ratio_from\n#pragma maplibre: define lowp float pixel_ratio_to\nvoid main() {\n#pragma maplibre: initialize lowp float base\n#pragma maplibre: initialize lowp float height\n#pragma maplibre: initialize mediump vec4 pattern_from\n#pragma maplibre: initialize mediump vec4 pattern_to\n#pragma maplibre: initialize lowp float pixel_ratio_from\n#pragma maplibre: initialize lowp float pixel_ratio_to\nvec2 pattern_tl_a=pattern_from.xy;vec2 pattern_br_a=pattern_from.zw;vec2 pattern_tl_b=pattern_to.xy;vec2 pattern_br_b=pattern_to.zw;vec2 imagecoord=mod(v_pos_a,1.0);vec2 pos=mix(pattern_tl_a/u_texsize,pattern_br_a/u_texsize,imagecoord);vec4 color1=texture(u_image,pos);vec2 imagecoord_b=mod(v_pos_b,1.0);vec2 pos2=mix(pattern_tl_b/u_texsize,pattern_br_b/u_texsize,imagecoord_b);vec4 color2=texture(u_image,pos2);vec4 mixedColor=mix(color1,color2,u_fade);fragColor=mixedColor*v_lighting;\n#ifdef OVERDRAW_INSPECTOR\nfragColor=vec4(1.0);\n#endif\n}", "uniform vec2 u_pixel_coord_upper;uniform vec2 u_pixel_coord_lower;uniform float u_height_factor;uniform vec3 u_scale;uniform float u_vertical_gradient;uniform lowp float u_opacity;uniform vec2 u_fill_translate;uniform vec3 u_lightcolor;uniform lowp vec3 u_lightpos;uniform lowp vec3 u_lightpos_globe;uniform lowp float u_lightintensity;layout(location=0) in vec2 a_pos;layout(location=1) in ivec4 a_normal_ed;\n#ifdef TERRAIN3D\nlayout(location=2) in vec2 a_centroid;\n#endif\n#ifdef GLOBE\nout vec3 v_sphere_pos;\n#endif\nout vec2 v_pos_a;out vec2 v_pos_b;out vec4 v_lighting;\n#pragma maplibre: define lowp float base\n#pragma maplibre: define lowp float height\n#pragma maplibre: define lowp vec4 pattern_from\n#pragma maplibre: define lowp vec4 pattern_to\n#pragma maplibre: define lowp float pixel_ratio_from\n#pragma maplibre: define lowp float pixel_ratio_to\nvoid main() {\n#pragma maplibre: initialize lowp float base\n#pragma maplibre: initialize lowp float height\n#pragma maplibre: initialize mediump vec4 pattern_from\n#pragma maplibre: initialize mediump vec4 pattern_to\n#pragma maplibre: initialize lowp float pixel_ratio_from\n#pragma maplibre: initialize lowp float pixel_ratio_to\nvec2 pattern_tl_a=pattern_from.xy;vec2 pattern_br_a=pattern_from.zw;vec2 pattern_tl_b=pattern_to.xy;vec2 pattern_br_b=pattern_to.zw;float tileRatio=u_scale.x;float fromScale=u_scale.y;float toScale=u_scale.z;vec3 normal=vec3(a_normal_ed.xyz);float edgedistance=float(a_normal_ed.w);vec2 display_size_a=(pattern_br_a-pattern_tl_a)/pixel_ratio_from;vec2 display_size_b=(pattern_br_b-pattern_tl_b)/pixel_ratio_to;\n#ifdef TERRAIN3D\nfloat height_terrain3d_offset=get_elevation(a_centroid);float base_terrain3d_offset=height_terrain3d_offset-(base > 0.0 ? 0.0 : 10.0);\n#else\nfloat height_terrain3d_offset=0.0;float base_terrain3d_offset=0.0;\n#endif\nbase=max(0.0,base)+base_terrain3d_offset;height=max(0.0,height)+height_terrain3d_offset;float t=float(a_normal_ed.x & 1);float elevation=t > 0.0 ? height : base;vec2 posInTile=a_pos+u_fill_translate;\n#ifdef GLOBE\nvec3 spherePos=projectToSphere(posInTile,a_pos);vec3 elevatedPos=spherePos*(1.0+elevation/GLOBE_RADIUS);v_sphere_pos=elevatedPos;gl_Position=interpolateProjectionFor3D(posInTile,spherePos,elevation);\n#else\ngl_Position=u_projection_matrix*vec4(posInTile,elevation,1.0);\n#endif\nvec2 pos=a_normal_ed.x==1 && a_normal_ed.y==0 && a_normal_ed.z==16384\n? a_pos\n: vec2(edgedistance,elevation*u_height_factor);v_pos_a=get_pattern_pos(u_pixel_coord_upper,u_pixel_coord_lower,fromScale*display_size_a,tileRatio,pos);v_pos_b=get_pattern_pos(u_pixel_coord_upper,u_pixel_coord_lower,toScale*display_size_b,tileRatio,pos);v_lighting=vec4(0.0,0.0,0.0,1.0);float directional=clamp(dot(normal/16383.0,u_lightpos),0.0,1.0);directional=mix((1.0-u_lightintensity),max((0.5+u_lightintensity),1.0),directional);if (normal.y !=0.0) {directional*=((1.0-u_vertical_gradient)+(u_vertical_gradient*clamp((t+base)*pow(height/150.0,0.5),mix(0.7,0.98,1.0-u_lightintensity),1.0)));}v_lighting.rgb+=clamp(directional*u_lightcolor,mix(vec3(0.0),vec3(0.3),1.0-u_lightcolor),vec3(1.0));v_lighting*=u_opacity;}"),
-	hillshadePrepare: prepare("#ifdef GL_ES\nprecision highp float;\n#endif\nuniform sampler2D u_image;in vec2 v_pos;uniform vec2 u_dimension;uniform float u_zoom;uniform vec4 u_unpack;float getElevation(vec2 coord,float bias) {vec4 data=texture(u_image,coord)*255.0;data.a=-1.0;return dot(data,u_unpack);}void main() {vec2 epsilon=1.0/u_dimension;float tileSize=u_dimension.x-2.0;float a=getElevation(v_pos+vec2(-epsilon.x,-epsilon.y),0.0);float b=getElevation(v_pos+vec2(0,-epsilon.y),0.0);float c=getElevation(v_pos+vec2(epsilon.x,-epsilon.y),0.0);float d=getElevation(v_pos+vec2(-epsilon.x,0),0.0);float e=getElevation(v_pos,0.0);float f=getElevation(v_pos+vec2(epsilon.x,0),0.0);float g=getElevation(v_pos+vec2(-epsilon.x,epsilon.y),0.0);float h=getElevation(v_pos+vec2(0,epsilon.y),0.0);float i=getElevation(v_pos+vec2(epsilon.x,epsilon.y),0.0);float exaggerationFactor=u_zoom < 2.0 ? 0.4 : u_zoom < 4.5 ? 0.35 : 0.3;float exaggeration=u_zoom < 15.0 ? (u_zoom-15.0)*exaggerationFactor : 0.0;vec2 deriv=vec2((c+f+f+i)-(a+d+d+g),(g+h+h+i)-(a+b+b+c))*tileSize/pow(2.0,exaggeration+(28.2562-u_zoom));fragColor=clamp(vec4(deriv.x/8.0+0.5,deriv.y/8.0+0.5,1.0,1.0),0.0,1.0);\n#ifdef OVERDRAW_INSPECTOR\nfragColor=vec4(1.0);\n#endif\n}", "uniform mat4 u_matrix;uniform vec2 u_dimension;layout(location=0) in vec2 a_pos;layout(location=1) in vec2 a_texture_pos;out vec2 v_pos;void main() {gl_Position=u_matrix*vec4(a_pos,0,1);highp vec2 epsilon=1.0/u_dimension;float scale=(u_dimension.x-2.0)/u_dimension.x;v_pos=(a_texture_pos/8192.0)*scale+epsilon;}"),
+	hillshadePrepare: prepare("#ifdef GL_ES\nprecision highp float;\n#endif\nuniform sampler2D u_image;in vec2 v_pos;uniform vec2 u_dimension;uniform float u_zoom;uniform vec4 u_unpack;float getElevation(ivec2 texel) {vec4 data=texelFetch(u_image,texel,0)*255.0;data.a=-1.0;return dot(data,u_unpack);}void main() {ivec2 pos=ivec2(gl_FragCoord.xy)+ivec2(1);float tileSize=u_dimension.x-2.0;float a=getElevation(pos+ivec2(-1,-1));float b=getElevation(pos+ivec2(0,-1));float c=getElevation(pos+ivec2(1,-1));float d=getElevation(pos+ivec2(-1,0));float e=getElevation(pos);float f=getElevation(pos+ivec2(1,0));float g=getElevation(pos+ivec2(-1,1));float h=getElevation(pos+ivec2(0,1));float i=getElevation(pos+ivec2(1,1));float exaggerationFactor=u_zoom < 2.0 ? 0.4 : u_zoom < 4.5 ? 0.35 : 0.3;float exaggeration=u_zoom < 15.0 ? (u_zoom-15.0)*exaggerationFactor : 0.0;vec2 deriv=vec2((c+f+f+i)-(a+d+d+g),(g+h+h+i)-(a+b+b+c))*tileSize/pow(2.0,exaggeration+(28.2562-u_zoom));fragColor=clamp(vec4(deriv.x/8.0+0.5,deriv.y/8.0+0.5,1.0,1.0),0.0,1.0);\n#ifdef OVERDRAW_INSPECTOR\nfragColor=vec4(1.0);\n#endif\n}", "uniform mat4 u_matrix;uniform vec2 u_dimension;layout(location=0) in vec2 a_pos;layout(location=1) in vec2 a_texture_pos;out vec2 v_pos;void main() {gl_Position=u_matrix*vec4(a_pos,0,1);highp vec2 epsilon=1.0/u_dimension;float scale=(u_dimension.x-2.0)/u_dimension.x;v_pos=(a_texture_pos/8192.0)*scale+epsilon;}"),
 	hillshade: prepare("uniform sampler2D u_image;in vec2 v_pos;uniform vec2 u_latrange;uniform float u_exaggeration;uniform vec4 u_accent;uniform int u_method;uniform float u_altitudes[NUM_ILLUMINATION_SOURCES];uniform float u_azimuths[NUM_ILLUMINATION_SOURCES];uniform vec4 u_shadows[NUM_ILLUMINATION_SOURCES];uniform vec4 u_highlights[NUM_ILLUMINATION_SOURCES];\n#define PI 3.141592653589793\n#define STANDARD 0\n#define COMBINED 1\n#define IGOR 2\n#define MULTIDIRECTIONAL 3\n#define BASIC 4\nfloat get_aspect(vec2 deriv){return deriv.x !=0.0 ? atan(deriv.y,-deriv.x) : PI/2.0*(deriv.y > 0.0 ? 1.0 :-1.0);}void igor_hillshade(vec2 deriv){deriv=deriv*u_exaggeration*2.0;float aspect=get_aspect(deriv);float azimuth=u_azimuths[0]+PI;float slope_stength=atan(length(deriv))*2.0/PI;float aspect_strength=1.0-abs(mod((aspect+azimuth)/PI+0.5,2.0)-1.0);float shadow_strength=slope_stength*aspect_strength;float highlight_strength=slope_stength*(1.0-aspect_strength);fragColor=u_shadows[0]*shadow_strength+u_highlights[0]*highlight_strength;}void standard_hillshade(vec2 deriv){float azimuth=u_azimuths[0]+PI;float slope=atan(0.625*length(deriv));float aspect=get_aspect(deriv);float intensity=u_exaggeration;float base=1.875-intensity*1.75;float maxValue=0.5*PI;float scaledSlope=intensity !=0.5 ? ((pow(base,slope)-1.0)/(pow(base,maxValue)-1.0))*maxValue : slope;float accent=cos(scaledSlope);vec4 accent_color=(1.0-accent)*u_accent*clamp(intensity*2.0,0.0,1.0);float shade=abs(mod((aspect+azimuth)/PI+0.5,2.0)-1.0);vec4 shade_color=mix(u_shadows[0],u_highlights[0],shade)*sin(scaledSlope)*clamp(intensity*2.0,0.0,1.0);fragColor=accent_color*(1.0-shade_color.a)+shade_color;}void basic_hillshade(vec2 deriv){deriv=deriv*u_exaggeration*2.0;float azimuth=u_azimuths[0]+PI;float cos_az=cos(azimuth);float sin_az=sin(azimuth);float cos_alt=cos(u_altitudes[0]);float sin_alt=sin(u_altitudes[0]);float cang=(sin_alt-(deriv.y*cos_az*cos_alt-deriv.x*sin_az*cos_alt))/sqrt(1.0+dot(deriv,deriv));float shade=clamp(cang,0.0,1.0);if(shade > 0.5){fragColor=u_highlights[0]*(2.0*shade-1.0);}else\n{fragColor=u_shadows[0]*(1.0-2.0*shade);}}void multidirectional_hillshade(vec2 deriv){deriv=deriv*u_exaggeration*2.0;fragColor=vec4(0,0,0,0);for(int i=0; i < NUM_ILLUMINATION_SOURCES; i++){float cos_alt=cos(u_altitudes[i]);float sin_alt=sin(u_altitudes[i]);float cos_az=-cos(u_azimuths[i]);float sin_az=-sin(u_azimuths[i]);float cang=(sin_alt-(deriv.y*cos_az*cos_alt-deriv.x*sin_az*cos_alt))/sqrt(1.0+dot(deriv,deriv));float shade=clamp(cang,0.0,1.0);if(shade > 0.5){fragColor+=u_highlights[i]*(2.0*shade-1.0)/float(NUM_ILLUMINATION_SOURCES);}else\n{fragColor+=u_shadows[i]*(1.0-2.0*shade)/float(NUM_ILLUMINATION_SOURCES);}}}void combined_hillshade(vec2 deriv){deriv=deriv*u_exaggeration*2.0;float azimuth=u_azimuths[0]+PI;float cos_az=cos(azimuth);float sin_az=sin(azimuth);float cos_alt=cos(u_altitudes[0]);float sin_alt=sin(u_altitudes[0]);float cang=acos((sin_alt-(deriv.y*cos_az*cos_alt-deriv.x*sin_az*cos_alt))/sqrt(1.0+dot(deriv,deriv)));cang=clamp(cang,0.0,PI/2.0);float shade=cang*atan(length(deriv))*4.0/PI/PI;float highlight=(PI/2.0-cang)*atan(length(deriv))*4.0/PI/PI;fragColor=u_shadows[0]*shade+u_highlights[0]*highlight;}void main() {vec4 pixel=texture(u_image,v_pos);float scaleFactor=cos(radians((u_latrange[0]-u_latrange[1])*(1.0-v_pos.y)+u_latrange[1]));vec2 deriv=((pixel.rg*8.0)-4.0)/scaleFactor;if (u_method==BASIC) {basic_hillshade(deriv);} else if (u_method==COMBINED) {combined_hillshade(deriv);} else if (u_method==IGOR) {igor_hillshade(deriv);} else if (u_method==MULTIDIRECTIONAL) {multidirectional_hillshade(deriv);} else if (u_method==STANDARD) {standard_hillshade(deriv);} else {standard_hillshade(deriv);}\n#ifdef OVERDRAW_INSPECTOR\nfragColor=vec4(1.0);\n#endif\n}", "uniform mat4 u_matrix;layout(location=0) in vec2 a_pos;out vec2 v_pos;void main() {gl_Position=projectTile(a_pos,a_pos);v_pos=a_pos/8192.0;if (a_pos.y <-32767.5) {v_pos.y=0.0;}if (a_pos.y > 32766.5) {v_pos.y=1.0;}}"),
 	line: prepare("uniform lowp float u_device_pixel_ratio;flat in vec2 v_width2;in vec2 v_normal;in float v_gamma_scale;\n#ifdef GLOBE\nin float v_depth;\n#endif\n#pragma maplibre: define highp vec4 color\n#pragma maplibre: define lowp float blur\n#pragma maplibre: define lowp float opacity\nvoid main() {\n#pragma maplibre: initialize highp vec4 color\n#pragma maplibre: initialize lowp float blur\n#pragma maplibre: initialize lowp float opacity\nclipAntimeridian();float dist=length(v_normal)*v_width2.s;float blur2=(blur+1.0/u_device_pixel_ratio)*v_gamma_scale;float alpha=clamp(min(dist-(v_width2.t-blur2),v_width2.s-dist)/blur2,0.0,1.0);fragColor=color*(alpha*opacity);\n#ifdef GLOBE\nif (v_depth > 1.0) {discard;}\n#endif\n#ifdef OVERDRAW_INSPECTOR\nfragColor=vec4(1.0);\n#endif\n}", "\n#define scale 0.015873016\nlayout(location=0) in ivec2 a_pos_normal;layout(location=1) in uvec4 a_data;uniform vec2 u_translation;uniform mediump float u_ratio;uniform vec2 u_units_to_pixels;uniform lowp float u_device_pixel_ratio;out vec2 v_normal;flat out vec2 v_width2;out float v_gamma_scale;out highp float v_linesofar;\n#ifdef GLOBE\nout float v_depth;\n#endif\n#pragma maplibre: define highp vec4 color\n#pragma maplibre: define lowp float blur\n#pragma maplibre: define lowp float opacity\n#pragma maplibre: define mediump float gapwidth\n#pragma maplibre: define lowp float offset\n#pragma maplibre: define mediump float width\nvoid main() {\n#pragma maplibre: initialize highp vec4 color\n#pragma maplibre: initialize lowp float blur\n#pragma maplibre: initialize lowp float opacity\n#pragma maplibre: initialize mediump float gapwidth\n#pragma maplibre: initialize lowp float offset\n#pragma maplibre: initialize mediump float width\nif (opacity < 0.01) {gl_Position=vec4(-2.0,-2.0,-2.0,1.0);return;}float ANTIALIASING=1.0/u_device_pixel_ratio/2.0;vec2 a_extrude=vec2(ivec2(a_data.xy)-128);float a_direction=float(int(a_data.z & 3u)-1);v_linesofar=float((a_data.z >> 2u)+a_data.w*64u)*2.0;vec2 pos=vec2(a_pos_normal >> 1);mediump vec2 normal=vec2(a_pos_normal & 1);normal.y=normal.y*2.0-1.0;v_normal=normal;gapwidth=gapwidth/2.0;float halfwidth=width/2.0;offset=-1.0*offset;float inset=gapwidth+(gapwidth > 0.0 ? ANTIALIASING : 0.0);float outset=gapwidth+halfwidth*(gapwidth > 0.0 ? 2.0 : 1.0)+(halfwidth==0.0 ? 0.0 : ANTIALIASING);mediump vec2 dist=outset*a_extrude*scale;mediump float u=0.5*a_direction;mediump float t=1.0-abs(u);mediump vec2 offset2=offset*a_extrude*scale*normal.y*mat2(t,-u,u,t);float adjustedThickness=projectLineThickness(pos.y);vec4 projected_no_extrude=projectTile(pos+offset2/u_ratio*adjustedThickness+u_translation);vec4 projected_with_extrude=projectTile(pos+offset2/u_ratio*adjustedThickness+u_translation+dist/u_ratio*adjustedThickness);gl_Position=projected_with_extrude;\n#ifdef GLOBE\nv_depth=gl_Position.z/gl_Position.w;\n#endif\n#ifdef TERRAIN3D\nv_gamma_scale=1.0;\n#else\nfloat extrude_length_without_perspective=length(dist);float extrude_length_with_perspective=length((projected_with_extrude.xy-projected_no_extrude.xy)/projected_with_extrude.w*u_units_to_pixels);v_gamma_scale=extrude_length_without_perspective/extrude_length_with_perspective;\n#endif\nv_width2=vec2(outset,inset);}"),
 	lineGradient: prepare("uniform lowp float u_device_pixel_ratio;uniform sampler2D u_image;flat in vec2 v_width2;in vec2 v_normal;in float v_gamma_scale;in highp vec2 v_uv;\n#ifdef GLOBE\nin float v_depth;\n#endif\n#pragma maplibre: define lowp float blur\n#pragma maplibre: define lowp float opacity\nvoid main() {\n#pragma maplibre: initialize lowp float blur\n#pragma maplibre: initialize lowp float opacity\nclipAntimeridian();float dist=length(v_normal)*v_width2.s;float blur2=(blur+1.0/u_device_pixel_ratio)*v_gamma_scale;float alpha=clamp(min(dist-(v_width2.t-blur2),v_width2.s-dist)/blur2,0.0,1.0);vec4 color=texture(u_image,v_uv);fragColor=color*(alpha*opacity);\n#ifdef GLOBE\nif (v_depth > 1.0) {discard;}\n#endif\n#ifdef OVERDRAW_INSPECTOR\nfragColor=vec4(1.0);\n#endif\n}", "\n#define scale 0.015873016\nlayout(location=0) in ivec2 a_pos_normal;layout(location=1) in uvec4 a_data;layout(location=2) in float a_uv_x;layout(location=3) in float a_split_index;uniform vec2 u_translation;uniform mediump float u_ratio;uniform lowp float u_device_pixel_ratio;uniform vec2 u_units_to_pixels;uniform float u_image_height;out vec2 v_normal;flat out vec2 v_width2;out float v_gamma_scale;out highp vec2 v_uv;\n#ifdef GLOBE\nout float v_depth;\n#endif\n#pragma maplibre: define lowp float blur\n#pragma maplibre: define lowp float opacity\n#pragma maplibre: define mediump float gapwidth\n#pragma maplibre: define lowp float offset\n#pragma maplibre: define mediump float width\nvoid main() {\n#pragma maplibre: initialize lowp float blur\n#pragma maplibre: initialize lowp float opacity\n#pragma maplibre: initialize mediump float gapwidth\n#pragma maplibre: initialize lowp float offset\n#pragma maplibre: initialize mediump float width\nif (opacity < 0.01) {gl_Position=vec4(-2.0,-2.0,-2.0,1.0);return;}float ANTIALIASING=1.0/u_device_pixel_ratio/2.0;vec2 a_extrude=vec2(ivec2(a_data.xy)-128);float a_direction=float(int(a_data.z & 3u)-1);highp float texel_height=1.0/u_image_height;highp float half_texel_height=0.5*texel_height;v_uv=vec2(a_uv_x,a_split_index*texel_height-half_texel_height);vec2 pos=vec2(a_pos_normal >> 1);mediump vec2 normal=vec2(a_pos_normal & 1);normal.y=normal.y*2.0-1.0;v_normal=normal;gapwidth=gapwidth/2.0;float halfwidth=width/2.0;offset=-1.0*offset;float inset=gapwidth+(gapwidth > 0.0 ? ANTIALIASING : 0.0);float outset=gapwidth+halfwidth*(gapwidth > 0.0 ? 2.0 : 1.0)+(halfwidth==0.0 ? 0.0 : ANTIALIASING);mediump vec2 dist=outset*a_extrude*scale;mediump float u=0.5*a_direction;mediump float t=1.0-abs(u);mediump vec2 offset2=offset*a_extrude*scale*normal.y*mat2(t,-u,u,t);float adjustedThickness=projectLineThickness(pos.y);vec4 projected_no_extrude=projectTile(pos+offset2/u_ratio*adjustedThickness+u_translation);vec4 projected_with_extrude=projectTile(pos+offset2/u_ratio*adjustedThickness+u_translation+dist/u_ratio*adjustedThickness);gl_Position=projected_with_extrude;\n#ifdef GLOBE\nv_depth=gl_Position.z/gl_Position.w;\n#endif\n#ifdef TERRAIN3D\nv_gamma_scale=1.0;\n#else\nfloat extrude_length_without_perspective=length(dist);float extrude_length_with_perspective=length((projected_with_extrude.xy-projected_no_extrude.xy)/projected_with_extrude.w*u_units_to_pixels);v_gamma_scale=extrude_length_without_perspective/extrude_length_with_perspective;\n#endif\nv_width2=vec2(outset,inset);}"),
@@ -10816,6 +10944,145 @@ function sphereSurfacePointToCoordinates(surface) {
 	} else return new LngLat(0, latDegrees);
 }
 /**
+* Returns the globe orientation quaternion for the given map center and bearing.
+* The inverse of {@link lngLatBearingFromOrientation}.
+*/
+function orientationFromLngLatBearing(lngLat, bearing) {
+	return fromEuler(createVec4f64(), -lngLat.lng, -lngLat.lat, bearing);
+}
+/**
+* Given a globe orientation quaternion, returns the corresponding map center and bearing.
+* The inverse of {@link orientationFromLngLatBearing}.
+*/
+function lngLatBearingFromOrientation(q) {
+	const x = q[0], y = q[1], z = q[2], w = q[3];
+	return {
+		lng: -Math.atan2(2 * (w * x + y * z), 1 - 2 * (x * x + y * y)) * 180 / Math.PI,
+		lat: -Math.asin(clamp(2 * (w * y - z * x), -1, 1)) * 180 / Math.PI,
+		bearing: Math.atan2(2 * (w * z + x * y), 1 - 2 * (y * y + z * z)) * 180 / Math.PI
+	};
+}
+/** Kept just below a half turn so the center cannot land exactly on the far side of the globe. */
+const PAN_MAX_ANGLE = Math.PI * .98;
+/**
+* Returns the point on the globe that a drag towards `point` should aim at.
+*
+* Exact tracking breaks down at the silhouette: the ray meets the globe at `asin(D sin a) - a`,
+* whose slope runs away to infinity as the ray goes tangent, and past it there is no intersection
+* at all. So the exact curve is left {@link PAN_FALLOFF_BAND} early and continued with a hyperbola
+* matching it in value and slope, easing off and saturating short of the far side. Bell's virtual
+* trackball takes the same idea of easing a sphere into a hyperbola before the rim, though it fits
+* the curve differently: SGI's `trackball.c`, described in Henriksen, Sporring and Hornbæk,
+* "Virtual Trackballs Revisited", IEEE TVCG 10(2):206-216, 2004.
+*
+* The angle comes from atan2, so a ray pointing away from the globe is a wide angle the falloff
+* saturates rather than a case to reject.
+* @param tr - The transform being dragged.
+* @param point - The cursor position.
+*/
+function panSurfaceLocation(tr, point) {
+	const origin = tr.cameraPosition;
+	const distance = length$1(origin);
+	if (distance <= 1) return tr.screenPointToLocation(point);
+	const u = createVec3f64();
+	normalize(u, origin);
+	const direction = tr.getRayDirectionFromPixel(point);
+	const c = -dot(direction, u);
+	const lateral = createVec3f64();
+	scaleAndAdd(lateral, direction, u, c);
+	const s = length$1(lateral);
+	if (s < 1e-9) return tr.screenPointToLocation(point);
+	const angle = Math.atan2(s, c);
+	const handoverAngle = Math.asin(1 / distance) * .9;
+	if (angle < handoverAngle) return tr.screenPointToLocation(point);
+	const sinHandover = distance * Math.sin(handoverAngle);
+	const targetAtHandover = Math.asin(clamp(sinHandover, -1, 1)) - handoverAngle;
+	const slopeAtHandover = distance * Math.cos(handoverAngle) / Math.sqrt(Math.max(1 - sinHandover * sinHandover, 1e-12)) - 1;
+	const room = PAN_MAX_ANGLE - targetAtHandover;
+	const excess = angle - handoverAngle;
+	const target = targetAtHandover + room * (slopeAtHandover * excess) / (room + slopeAtHandover * excess);
+	const e = createVec3f64();
+	scale$2(e, lateral, 1 / s);
+	const surface = createVec3f64();
+	scale$2(surface, u, Math.cos(clamp(target, 0, PAN_MAX_ANGLE)));
+	scaleAndAdd(surface, surface, e, Math.sin(clamp(target, 0, PAN_MAX_ANGLE)));
+	normalize(surface, surface);
+	return sphereSurfacePointToCoordinates(surface);
+}
+/**
+* Rotates the globe so that the given location appears at the given screen point, by composing
+* versors, the unit quaternions that represent rotations. Unlike the bearing-preserving
+* {@link ITransform.setLocationAtPoint}, this stays smooth near and across the poles, and keeps
+* panning once the cursor leaves the globe.
+*
+* Note: the delta rotation's axis is in the surface-vector frame of
+* {@link angularCoordinatesToSurfaceVector}, while the orientation quaternion uses the Euler frame
+* of {@link orientationFromLngLatBearing}, hence the component swizzle where they combine. Zoom is
+* adjusted to keep the planet the same size, as `setLocationAtPoint` does.
+* @param tr - The transform to rotate.
+* @param lnglat - The location to bring under `point`.
+* @param point - The screen point that `lnglat` should appear at.
+* @param panDelta - The drag's pixel delta. Used to re-derive the previous cursor location through
+* {@link panSurfaceLocation}, since both ends of the rotation must come from the same mapping.
+* @param fixedBearing - Applies the swing only, keeping the bearing fixed, which is what dragging
+* the globe does. Pass `false` to apply the twist about the view axis as well, so that the grabbed
+* location tracks the cursor exactly and the bearing drifts with it.
+*/
+function versorSetLocationAtPoint(tr, lnglat, point, panDelta, fixedBearing = true) {
+	const pointLngLat = panSurfaceLocation(tr, point);
+	let sourceLngLat = lnglat;
+	if (panDelta) sourceLngLat = panSurfaceLocation(tr, point.sub(panDelta));
+	else if (!tr.isPointOnMapSurface(point)) return;
+	const vecToPixelCurrent = angularCoordinatesToSurfaceVector(pointLngLat);
+	const vecToTarget = angularCoordinatesToSurfaceVector(sourceLngLat);
+	const centerQuat = orientationFromLngLatBearing(tr.center, tr.bearing);
+	const w = cross(createVec3f64(), vecToTarget, vecToPixelCurrent);
+	const l = Math.sqrt(dot(w, w));
+	const t = Math.acos(clamp(dot(vecToTarget, vecToPixelCurrent), -1, 1)) / 2;
+	const s = Math.sin(t);
+	const delta = l ? fromValues(w[1] / l * s, -w[0] / l * s, w[2] / l * s, Math.cos(t)) : fromValues(0, 0, 0, 1);
+	const { lng: newCenterLng, lat: newCenterLat, bearing: newBearing } = lngLatBearingFromOrientation(multiply$1(createVec4f64(), centerQuat, delta));
+	const oldLat = tr.center.lat;
+	const finalLat = clamp(newCenterLat, -90, 90);
+	const finalLng = fixedBearing ? fixedBearingLongitude(tr, point, panDelta, newCenterLng) : newCenterLng;
+	tr.setCenter(new LngLat(wrap(finalLng, -180, 180), finalLat));
+	if (!fixedBearing) tr.setBearing(newBearing);
+	tr.setZoom(tr.zoom + getZoomAdjustment(oldLat, tr.center.lat));
+}
+/**
+* Returns the center longitude for a bearing-preserving drag.
+*
+* The swing longitude becomes ill-conditioned near the pole and the grabbed location slips away
+* from the cursor, so within the last ~12 degrees of latitude the cursor is treated as turning a
+* dial around the pole, blended in with a smoothstep anchored on {@link MAX_VALID_LATITUDE}, the
+* highest latitude the center can reach. The sweep comes from the raw pixel delta rather than a
+* round-tripped previous cursor position, which would lose its sign to cancellation at the pole,
+* and is damped within {@link DIAL_MIN_RADIUS_PIXELS} so it eases to nothing there instead of
+* being dropped, which would leave a spot where the drag could not move at all.
+* @param tr - The transform being dragged.
+* @param point - The cursor position.
+* @param panDelta - The drag's pixel delta, or undefined to use the swing longitude only.
+* @param newCenterLng - The swing target longitude.
+* @returns the center longitude to apply.
+*/
+function fixedBearingLongitude(tr, point, panDelta, newCenterLng) {
+	const oldLng = tr.center.lng;
+	const oldLat = tr.center.lat;
+	const poleLat = oldLat >= 0 ? 90 : -90;
+	const polePoint = tr.locationToScreenPoint(new LngLat(0, poleLat));
+	const rx = point.x - polePoint.x, ry = point.y - polePoint.y;
+	const r2 = rx * rx + ry * ry;
+	const tRamp = clamp(1 - (MAX_VALID_LATITUDE - Math.abs(oldLat)) / 12, 0, 1);
+	const dial = tRamp * tRamp * (3 - 2 * tRamp);
+	const dLngSwing = mod(newCenterLng - oldLng + 180, 360) - 180;
+	let dLngDial = 0;
+	if (dial > 0 && panDelta) {
+		const dTheta = (rx * panDelta.y - ry * panDelta.x) / Math.max(r2, 400);
+		dLngDial = (poleLat > 0 ? 1 : -1) * dTheta * 180 / Math.PI;
+	}
+	return oldLng + (1 - dial) * dLngSwing + dial * dLngDial;
+}
+/**
 * Given a normalized horizon plane in Ax+By+Cz+D=0 format, compute the center and radius of
 * the circle in that plain that contains the entire visible portion of the unit sphere from horizon
 * to horizon.
@@ -12578,12 +12845,17 @@ var VerticalPerspectiveCameraHelper = class VerticalPerspectiveCameraHelper {
 		tr.setCenter(new LngLat(exactCenter.lng + lngExactToHeuristic * heuristicFactor, exactCenter.lat + latExactToHeuristic * heuristicFactor).wrap());
 		tr.setZoom(oldZoom + getZoomAdjustment(oldCenterLat, tr.center.lat));
 	}
-	handleMapControlsPan(deltas, tr, _preZoomAroundLoc) {
+	/**
+	* Pans the globe by rotating it with a single quaternion that brings the grabbed location back
+	* under the cursor. This stays consistent near and across the poles, where the previous
+	* bearing-preserving mapping inverted and stalled (#5296).
+	* @param deltas - The deltas accumulated for this frame.
+	* @param tr - The transform to pan.
+	* @param preZoomAroundLoc - The location that was under the cursor before this frame.
+	*/
+	handleMapControlsPan(deltas, tr, preZoomAroundLoc) {
 		if (!deltas.panDelta) return;
-		const oldLat = tr.center.lat;
-		const oldZoom = tr.zoom;
-		tr.setCenter(computeGlobePanCenter(deltas.panDelta, tr).wrap());
-		tr.setZoom(oldZoom + getZoomAdjustment(oldLat, tr.center.lat));
+		versorSetLocationAtPoint(tr, preZoomAroundLoc, deltas.around, deltas.panDelta);
 	}
 	cameraForBoxAndBearing(options, padding, bounds, bearing, tr) {
 		const result = cameraForBoxAndBearing(options, padding, bounds, bearing, tr);
@@ -12916,6 +13188,7 @@ var Style = class extends Evented {
 		this.imageManager = new ImageManager();
 		this.imageManager.setEventedParent(this);
 		this.imageManager.setMissingImageResolver(map._missingStyleImageResolver);
+		this.patternAtlas = new PatternAtlas(this.imageManager);
 		const glyphLang = map._container?.lang || typeof document !== "undefined" && document.documentElement?.lang || void 0;
 		this.glyphManager = new GlyphManager(map._requestManager, options.localIdeographFontFamily, glyphLang);
 		this.lineAtlas = new LineAtlas(256, 512);
@@ -12937,12 +13210,10 @@ var Style = class extends Evented {
 		});
 	}
 	_setInitialValues() {
-		this._spritesImagesIds = {};
 		this._layers = {};
 		this._order = [];
 		this.tileManagers = {};
 		this.zoomHistory = new ZoomHistory();
-		this._availableImages = [];
 		this._imagesListDirty = false;
 		this._globalState = {};
 		this._serializedLayers = {};
@@ -13080,48 +13351,33 @@ var Style = class extends Evented {
 			}
 		}
 	}
-	_loadSprite(sprite, isUpdate = false, completion = void 0) {
+	async _loadSprite(sprite, isUpdate = false, completion = void 0) {
 		this.imageManager.setLoaded(false);
 		const abortController = new AbortController();
 		this._spriteRequest = abortController;
 		let err;
-		loadSprite(sprite, this.map._requestManager, this.map.getPixelRatio(), this._spriteRequest).then((images) => {
-			this._spriteRequest = null;
-			if (images) for (const spriteId in images) {
-				this._spritesImagesIds[spriteId] = [];
-				const imagesToRemove = this._spritesImagesIds[spriteId] ? this._spritesImagesIds[spriteId].filter((id) => !(id in images)) : [];
-				for (const id of imagesToRemove) {
-					this.imageManager.removeImage(id);
-					this._changedImages[id] = true;
-				}
-				for (const id in images[spriteId]) {
-					const imageId = spriteId === "default" ? id : `${spriteId}:${id}`;
-					this._spritesImagesIds[spriteId].push(imageId);
-					if (imageId in this.imageManager.images) this.imageManager.updateImage(imageId, images[spriteId][id], false);
-					else this.imageManager.addImage(imageId, images[spriteId][id]);
-					if (isUpdate) this._changedImages[imageId] = true;
-				}
+		try {
+			const images = await loadSprite(sprite, this.map._requestManager, this.map.getPixelRatio(), abortController);
+			if (!images) return;
+			for (const spriteId in images) {
+				const { loaded, removed } = this.imageManager.setSpriteImages(spriteId, images[spriteId]);
+				this._markImagesChanged(removed);
+				if (isUpdate) this._markImagesChanged(loaded);
 			}
-		}).catch((error) => {
-			this._spriteRequest = null;
+		} catch (error) {
 			err = error;
 			if (!abortController.signal.aborted) this.fire(new ErrorEvent(err));
-		}).finally(() => {
+		} finally {
+			this._spriteRequest = null;
 			this.imageManager.setLoaded(true);
-			this._availableImages = this.imageManager.listImages();
 			if (isUpdate) this._changed = true;
-			this.dispatcher.broadcast("SI", this._availableImages);
+			this.dispatcher.broadcast("SI", this.imageManager.listImages());
 			this.fire(new MapStyleDataEvent("data"));
-			if (completion) completion(err);
-		});
+			completion?.(err);
+		}
 	}
 	_unloadSprite() {
-		for (const id of Object.values(this._spritesImagesIds).flat()) {
-			this.imageManager.removeImage(id);
-			this._changedImages[id] = true;
-		}
-		this._spritesImagesIds = {};
-		this._availableImages = this.imageManager.listImages();
+		this._markImagesChanged(this.imageManager.removeAllSpriteImages());
 		this._imagesListDirty = true;
 		this._changed = true;
 		this.fire(new MapStyleDataEvent("data"));
@@ -13193,7 +13449,7 @@ var Style = class extends Evented {
 		const changed = this._changed;
 		if (changed) {
 			if (this._imagesListDirty) {
-				this.dispatcher.broadcast("SI", this._availableImages);
+				this.dispatcher.broadcast("SI", this.imageManager.listImages());
 				this._imagesListDirty = false;
 			}
 			const updatedIds = Object.keys(this._updatedLayers);
@@ -13218,9 +13474,10 @@ var Style = class extends Evented {
 			managersUsedBefore[id] = tileManager.used;
 			tileManager.used = false;
 		}
+		const availableImages = this.imageManager.listImages();
 		for (const layerId of this._order) {
 			const layer = this._layers[layerId];
-			layer.recalculate(parameters, this._availableImages);
+			layer.recalculate(parameters, availableImages);
 			if (!layer.isHidden(parameters.zoom) && layer.source) this.tileManagers[layer.source].used = true;
 		}
 		for (const id in managersUsedBefore) {
@@ -13382,8 +13639,14 @@ var Style = class extends Evented {
 		this.imageManager.removeImage(id);
 		this._afterImageUpdated(id);
 	}
+	/**
+	* Queues the tiles that depend on these images to be reloaded on the next update, which is
+	* needed whenever an image appears, disappears or changes size.
+	*/
+	_markImagesChanged(ids) {
+		for (const id of ids) this._changedImages[id] = true;
+	}
 	_afterImageUpdated(id) {
-		this._availableImages = this.imageManager.listImages();
 		this._changedImages[id] = true;
 		this._imagesListDirty = true;
 		this._changed = true;
@@ -13816,7 +14079,7 @@ var Style = class extends Evented {
 			}
 		}
 		const sourceResults = [];
-		params.availableImages = this._availableImages;
+		params.availableImages = this.imageManager.listImages();
 		const serializedLayers = this._serializedAllLayers();
 		const layersAsSet = params.layers instanceof Set ? params.layers : Array.isArray(params.layers) ? new Set(params.layers) : null;
 		const paramsStrict = {
@@ -14053,14 +14316,10 @@ var Style = class extends Evented {
 			this.fire(new ErrorEvent(/* @__PURE__ */ new Error(`Sprite "${id}" doesn't exists on this map.`)));
 			return;
 		}
-		if (this._spritesImagesIds[id]) for (const imageId of this._spritesImagesIds[id]) {
-			this.imageManager.removeImage(imageId);
-			this._changedImages[imageId] = true;
-		}
+		const changedImages = this.imageManager.removeSpriteImages(id);
+		this._markImagesChanged(changedImages);
 		internalSpriteRepresentation.splice(internalSpriteRepresentation.findIndex((sprite) => sprite.id === id), 1);
 		this.stylesheet.sprite = internalSpriteRepresentation.length > 0 ? internalSpriteRepresentation : void 0;
-		delete this._spritesImagesIds[id];
-		this._availableImages = this.imageManager.listImages();
 		this._imagesListDirty = true;
 		this._changed = true;
 		this.fire(new MapStyleDataEvent("data"));
@@ -14115,8 +14374,7 @@ var Style = class extends Evented {
 		if (this.imageManager) {
 			this.imageManager.setEventedParent(null);
 			this.imageManager.destroy();
-			this._availableImages = [];
-			this._spritesImagesIds = {};
+			this.patternAtlas.destroy();
 		}
 		if (this.glyphManager) this.glyphManager.destroy();
 		for (const layerId in this._layers) {
@@ -14447,9 +14705,9 @@ function patternUniformValues(crossfade, painter, tile) {
 	};
 }
 function bgPatternUniformValues(image, crossfade, painter, tile) {
-	const imagePosA = painter.imageManager.getPattern(image.from.toString());
-	const imagePosB = painter.imageManager.getPattern(image.to.toString());
-	const { width, height } = painter.imageManager.getPixelSize();
+	const imagePosA = painter.patternAtlas.getPattern(image.from.toString());
+	const imagePosB = painter.patternAtlas.getPattern(image.to.toString());
+	const { width, height } = painter.patternAtlas.getPixelSize();
 	const numTiles = Math.pow(2, tile.tileID.overscaledZ);
 	const tileSizeAtNearestZoom = tile.tileSize * Math.pow(2, painter.transform.tileZoom) / numTiles;
 	const pixelX = tileSizeAtNearestZoom * (tile.tileID.canonical.x + tile.tileID.wrap * numTiles);
@@ -17252,7 +17510,7 @@ function drawBackground(painter, tileManager, layer, coords, renderOptions) {
 	});
 	if (image) {
 		context.activeTexture.set(gl.TEXTURE0);
-		painter.imageManager.bind(painter.context);
+		painter.patternAtlas.bind(painter.context);
 	}
 	const crossfade = layer.getCrossfadeParameters();
 	for (const tileID of tileIDs) {
@@ -17933,6 +18191,7 @@ var Painter = class Painter {
 		this.options = options;
 		this.lineAtlas = style.lineAtlas;
 		this.imageManager = style.imageManager;
+		this.patternAtlas = style.patternAtlas;
 		this.glyphManager = style.glyphManager;
 		this.symbolFadeChange = style.placement.symbolFadeChange(now());
 		this.imageManager.beginFrame();
@@ -18140,8 +18399,8 @@ var Painter = class Painter {
 	isPatternMissing(image) {
 		if (!image) return false;
 		if (!image.from || !image.to) return true;
-		const imagePosA = this.imageManager.getPattern(image.from.toString());
-		const imagePosB = this.imageManager.getPattern(image.to.toString());
+		const imagePosA = this.patternAtlas.getPattern(image.from.toString());
+		const imagePosB = this.patternAtlas.getPattern(image.to.toString());
 		return !imagePosA || !imagePosB;
 	}
 	/**
@@ -18402,6 +18661,14 @@ const defaultRollInertiaOptions = extend({
 	deceleration: 1e3,
 	maxSpeed: 360
 }, defaultInertiaOptions);
+/**
+* The maximum age of a recorded gesture update, in milliseconds.
+*/
+const BUFFER_CUTOFF = 160;
+/**
+* The time window the gesture velocity is measured over, in milliseconds.
+*/
+const VELOCITY_WINDOW = 60;
 var HandlerInertia = class {
 	constructor(map) {
 		this._map = map;
@@ -18418,12 +18685,41 @@ var HandlerInertia = class {
 		});
 	}
 	_drainInertiaBuffer() {
-		const inertia = this._inertiaBuffer, currentTime = now(), cutoff = 160;
-		while (inertia.length > 0 && currentTime - inertia[0].time > cutoff) inertia.shift();
+		const inertia = this._inertiaBuffer, currentTime = now();
+		while (inertia.length > 0 && currentTime - inertia[0].time > BUFFER_CUTOFF) inertia.shift();
+	}
+	/**
+	* Returns the entries the velocity is measured from: everything recorded within
+	* {@link VELOCITY_WINDOW} before now, but never fewer than the last two, so that
+	* inertia also works below two recorded updates per window.
+	*/
+	_getVelocityEntries() {
+		const inertia = this._inertiaBuffer;
+		const windowStart = now() - VELOCITY_WINDOW;
+		let firstIndex = Math.max(0, inertia.length - 2);
+		while (firstIndex > 0 && inertia[firstIndex - 1].time >= windowStart) firstIndex--;
+		return inertia.slice(firstIndex);
 	}
+	/**
+	* Returns the ease which continues the gesture that has just ended.
+	*
+	* The velocity is measured over the time up to the release and not up to the last
+	* recorded movement, so that a gesture held still before being released has a lower
+	* velocity, down to no inertia at all. The delta of an entry happened before it was
+	* recorded, so the first entry only marks the start of the measured interval; anchors
+	* are the exception, as they describe the state at the moment of their entry.
+	*
+	* @param panInertiaOptions - overrides for the pan inertia defaults
+	* @returns the ease options, or `undefined` when the measured interval holds no
+	* movement, which terrain gestures produce by recording updates without any delta
+	*/
 	_onMoveEnd(panInertiaOptions) {
 		this._drainInertiaBuffer();
-		if (this._inertiaBuffer.length < 2) return;
+		const entries = this._getVelocityEntries();
+		if (entries.length < 2) {
+			this.clear();
+			return;
+		}
 		const deltas = {
 			zoom: 0,
 			bearing: 0,
@@ -18433,16 +18729,22 @@ var HandlerInertia = class {
 			pinchAround: void 0,
 			around: void 0
 		};
-		for (const { settings } of this._inertiaBuffer) {
+		for (const { settings } of entries) {
+			if (settings.around) deltas.around = settings.around;
+			if (settings.pinchAround) deltas.pinchAround = settings.pinchAround;
+		}
+		for (const { settings } of entries.slice(1)) {
 			deltas.zoom += settings.zoomDelta || 0;
 			deltas.bearing += settings.bearingDelta || 0;
 			deltas.pitch += settings.pitchDelta || 0;
 			deltas.roll += settings.rollDelta || 0;
 			if (settings.panDelta) deltas.pan._add(settings.panDelta);
-			if (settings.around) deltas.around = settings.around;
-			if (settings.pinchAround) deltas.pinchAround = settings.pinchAround;
 		}
-		const duration = this._inertiaBuffer[this._inertiaBuffer.length - 1].time - this._inertiaBuffer[0].time;
+		if (!deltas.pan.mag() && !deltas.zoom && !deltas.bearing && !deltas.pitch && !deltas.roll) {
+			this.clear();
+			return;
+		}
+		const duration = now() - entries[0].time;
 		const easeOptions = {};
 		if (deltas.pan.mag()) {
 			const result = calculateEasing(deltas.pan.mag(), duration, extend({}, defaultPanInertiaOptions, panInertiaOptions || {}));
@@ -26196,6 +26498,17 @@ function applyAnchorClass(element, anchor, prefix) {
 //#endregion
 //#region src/ui/marker.ts
 /**
+* Screen-pixel deltas applied when a focused draggable marker is moved with the arrow keys.
+*/
+const ARROW_KEY_DELTAS = {
+	ArrowLeft: [-1, 0],
+	ArrowRight: [1, 0],
+	ArrowUp: [0, -1],
+	ArrowDown: [0, 1]
+};
+const KEYBOARD_DRAG_SMALL_STEP = 1;
+const KEYBOARD_DRAG_LARGE_STEP = 10;
+/**
 * The event class for marker drag events (`dragstart`, `drag` and `dragend`).
 *
 * @group Event Related
@@ -26270,6 +26583,30 @@ var Marker = class extends Evented {
 		this._onKeyPress = (e) => {
 			if (e.code === "Space" || e.code === "Enter") this.togglePopup();
 		};
+		this._onKeyDown = (e) => {
+			if (!this._defaultMarker || !this._draggable || !this._map || !this._lngLat) return;
+			if (e.composedPath()[0] !== this._element) return;
+			if (e.altKey || e.ctrlKey || e.metaKey) return;
+			const delta = ARROW_KEY_DELTAS[e.key];
+			if (!delta) return;
+			e.preventDefault();
+			e.stopPropagation();
+			const step = e.shiftKey ? KEYBOARD_DRAG_LARGE_STEP : KEYBOARD_DRAG_SMALL_STEP;
+			const pos = this._map.project(this._lngLat);
+			this.setLngLat(this._map.unproject(new Point(pos.x + delta[0] * step, pos.y + delta[1] * step)));
+			if (!this._keyboardDragActive) {
+				this._keyboardDragActive = true;
+				this.fire(new MarkerDragEvent("dragstart"));
+			}
+			this.fire(new MarkerDragEvent("drag"));
+		};
+		this._onKeyUp = (e) => {
+			if (!ARROW_KEY_DELTAS[e.key]) return;
+			this._endKeyboardDrag();
+		};
+		this._onBlur = () => {
+			this._endKeyboardDrag();
+		};
 		this._onMapClick = (e) => {
 			const targetElement = e.originalEvent.target;
 			const element = this._element;
@@ -26340,6 +26677,8 @@ var Marker = class extends Evented {
 		this._subpixelPositioning = options?.subpixelPositioning || false;
 		this._isDragging = false;
 		this._roleManaged = false;
+		this._tabIndexManaged = false;
+		this._keyboardDragActive = false;
 		this._state = "inactive";
 		this._rotation = options?.rotation || 0;
 		this._rotationAlignment = options?.rotationAlignment || "auto";
@@ -26515,6 +26854,11 @@ var Marker = class extends Evented {
 			delete this._map;
 		}
 		this._element.removeEventListener("click", this._onClick);
+		this._element.removeEventListener("keydown", this._onKeyDown);
+		this._element.removeEventListener("keyup", this._onKeyUp);
+		this._element.removeEventListener("blur", this._onBlur);
+		this._element.removeEventListener("keypress", this._onKeyPress);
+		this._keyboardDragActive = false;
 		this._element.remove();
 		if (this._popup) this._popup.remove();
 		return this;
@@ -26584,7 +26928,6 @@ var Marker = class extends Evented {
 			this._popup.remove();
 			this._popup = null;
 			this._element.removeEventListener("keypress", this._onKeyPress);
-			if (!this._originalTabIndex) this._element.removeAttribute("tabindex");
 		}
 		if (popup) {
 			if (!("offset" in popup.options)) {
@@ -26602,10 +26945,9 @@ var Marker = class extends Evented {
 				} : this._offset;
 			}
 			this._popup = popup;
-			this._originalTabIndex = this._element.getAttribute("tabindex");
-			if (!this._originalTabIndex) this._element.setAttribute("tabindex", "0");
 			this._element.addEventListener("keypress", this._onKeyPress);
 		}
+		this._updateTabIndex();
 		this._updateAccessibilityRole();
 		return this;
 	}
@@ -26624,6 +26966,12 @@ var Marker = class extends Evented {
 		this._subpixelPositioning = value;
 		return this;
 	}
+	_endKeyboardDrag() {
+		if (this._keyboardDragActive) {
+			this._keyboardDragActive = false;
+			this.fire(new MarkerDragEvent("dragend"));
+		}
+	}
 	/**
 	* Returns the {@link Popup} instance that is bound to the {@link Marker}.
 	* @returns popup
@@ -26760,7 +27108,10 @@ var Marker = class extends Evented {
 		return this._element.classList.toggle(className);
 	}
 	/**
-	* Sets the `draggable` property and functionality of the marker
+	* Sets the `draggable` property and functionality of the marker.
+	* A draggable default marker is also keyboard focusable and movable with the
+	* arrow keys (see {@link MarkerOptions.draggable}); custom marker elements keep
+	* their focusability and keyboard behavior application-owned.
 	* @param shouldBeDraggable - Turns drag functionality on/off
 	*/
 	setDraggable(shouldBeDraggable) {
@@ -26775,6 +27126,19 @@ var Marker = class extends Evented {
 				this._map.off("touchstart", this._addDragHandler);
 			}
 		}
+		if (this._defaultMarker) {
+			if (this._draggable) {
+				this._element.addEventListener("keydown", this._onKeyDown);
+				this._element.addEventListener("keyup", this._onKeyUp);
+				this._element.addEventListener("blur", this._onBlur);
+			} else {
+				this._element.removeEventListener("keydown", this._onKeyDown);
+				this._element.removeEventListener("keyup", this._onKeyUp);
+				this._element.removeEventListener("blur", this._onBlur);
+				this._endKeyboardDrag();
+			}
+		}
+		this._updateTabIndex();
 		this._updateAccessibilityRole();
 		return this;
 	}
@@ -26786,6 +27150,24 @@ var Marker = class extends Evented {
 		return this._draggable;
 	}
 	/**
+	* Keep the marker element focusable while it has built-in keyboard behavior.
+	* A popup makes any marker element interactive; dragging only manages
+	* focusability for the default marker so custom elements stay
+	* application-owned (#7790). A tabindex supplied by the application is
+	* never added, changed, or removed here.
+	*/
+	_updateTabIndex() {
+		if (!!this._popup || this._defaultMarker && this._draggable) {
+			if (!this._element.hasAttribute("tabindex")) {
+				this._element.setAttribute("tabindex", "0");
+				this._tabIndexManaged = true;
+			}
+		} else if (this._tabIndexManaged) {
+			if (this._element.getAttribute("tabindex") === "0") this._element.removeAttribute("tabindex");
+			this._tabIndexManaged = false;
+		}
+	}
+	/**
 	* Keep the default marker role aligned with interactivity.
 	* Default markers need a role because `aria-label` is set in {@link Marker.addTo}.
 	* Non-interactive markers use `role=img`; interactive ones (draggable or with a popup) use `role=button`.