maplibre-gl 6.1.0 → 6.2.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.1.0/LICENSE.txt
+* @license 3-Clause BSD. Full text of license: https://github.com/maplibre/maplibre-gl-js/blob/v6.2.0/LICENSE.txt
 */
-import { $n as getAABB, $r as rotateX$1, $t as validateStyle, A as earthRadius, Ai as isOffscreenCanvasDistorted, Ar as wrap, At as SegmentVector, B as evaluateSizeForFeature, Bn as createMat4f64, Br as fromEuler, Bt as isRasterStyleLayer, C as altitudeFromMercatorZ, Ci as scale, Cn as addProtocol, Cr as scaleZoom, Ct as Uniform2f, D as mercatorYfromLat, Di as create$2, Dn as AbortError, Dr as translatePosition, Dt as UniformColorArray, E as mercatorXfromLng, Ei as fromRotation, En as config, Er as threePlaneIntersection, Et as UniformColor, F as isBackgroundStyleLayer, Fn as bezier, Fr as length, Ft as PosArray, G as ImagePosition, Gn as degreesToRadians, Gr as add, Gt as EvaluationParameters, Hn as createVec4f64, Hr as mul, Ht as Properties, I as isSymbolStyleLayer, In as clamp, Ir as scale$1, It as QuadTriangleArray, J as parseGlyphPbf, Jn as ensureError, Jr as dot, Jt as ZoomHistory, K as potpack, Kn as differenceOfAnglesDegrees, Kr as clone, L as SymbolBucket, Ln as clone$2, Lr as sqrLen, Lt as RasterBoundsArray, M as createStyleLayer, Mi as Point, Mn as angleToRotateBetweenVectors2D, Mr as pixelsToTileUnits, Mt as CollisionCircleLayoutArray, N as isCustomStyleLayer, Nn as arrayBufferToImage, Nr as EXTENT, Nt as LineStripIndexArray, O as mercatorZfromAltitude, Oi as invert, On as isAbortError, Or as uniqueId, Ot as UniformFloatArray, P as validateCustomStyleLayer, Pn as arrayBufferToImageBitmap, Pr as create$3, Pt as Pos3dArray, Qn as findLineIntersection, Qr as normalize, Qt as validateAndEmit, R as addDynamicAttributes, Rn as createIdentityMat4f32, Rr as transformMat4$2, Rt as TriangleIndexArray, S as MercatorCoordinate, Si as rotateZ, Sn as sameOrigin, Sr as rollPitchBearingToQuat, St as Uniform1i, T as lngFromMercatorX, Ti as create$4, Tn as removeProtocol, Tr as subscribe, Tt as Uniform4f, U as getAnchorAlignment, Un as deepEqual, Ur as scale$3, Ut as TRANSITION_SUFFIX, V as evaluateSizeForZoom, Vn as createVec3f64, Vr as slerp, Vt as DataConstantProperty, Wn as defaultEasing, Wr as transformMat4, Wt as Transitionable, X as collisionCircleLayout, Xn as extend, Xr as length$1, Xt as SPEC_SOURCE_TYPES, Yn as evaluateZoomSnap, Yr as len, Z as isLineStyleLayer, Zn as filterObject, Zr as negate, Zt as emitValidationErrors, _ as OverscaledTileID, _i as multiply, _n as getArrayBuffer, _r as radiansToDegrees, _t as RGBAImage, a as clipLine, ai as transformMat3, an as derefLayers, ar as isPointableEvent, at as NORTH_POLE_Y, b as compareTileId, bi as rotateX, bn as getVideo, br as remapSaturate, bt as toEvaluationFeature, ci as zero$1, cn as featureFilter, cr as isTouchableOrPointableType, ct as SubdivisionGranularitySetting, di as create$1, dn as latest, dr as mapObject, dt as Texture, ei as rotateY, en as validateStyleAndEmit, er as getAngleDelta, et as isFillExtrusionStyleLayer, f as GEOJSON_TILE_LAYER_NAME, fi as equals, fn as ErrorEvent, fr as mod, ft as isHillshadeStyleLayer, g as CanonicalTileID, gi as invert$1, gn as GLOBAL_DISPATCHER_ID, gr as pointPlaneSignedDistance, gt as AlphaImage, h as Bounds, hi as identity, hn as AJAXError, hr as pick, ht as renderColorRamp, ii as sub, ir as isImageBitmap, j as Actor, ji as offscreenCanvasSupported, jn as MAX_VALID_LATITUDE, jr as zoomScale, jt as CollisionBoxArray, k as LngLat, ki as rotate, kn as throwIfAborted, kr as warnOnce, kt as UniformMatrix4f, li as clone$1, lr as isWorker, lt as isColorReliefStyleLayer, mi as fromScaling, mn as Evented, mr as parseCacheControl, mt as isHeatmapStyleLayer, ni as scale$2, nn as ProjectionDefinition, oi as transformMat4$1, on as diff, or as isSafari, ot as SOUTH_POLE_Y, pi as exactEquals, pn as Event, pr as nextPowerOfTwo, pt as HEATMAP_FULL_RENDER_FBO_KEY, q as renderStyleImage, qn as distanceOfAnglesRadians, qr as cross, qt as codePointUsesLocalIdeographFontFamily, r as TextAnchorEnum, ri as scaleAndAdd, rn as ValidationError, rr as getRollPitchBearing, rt as isFillStyleLayer, s as TileCache, si as transformQuat, sn as emptyStyle, sr as isTouchableEvent, st as SubdivisionGranularityExpression, t as getAnchorJustification, ti as rotateZ$1, tn as Color, tr as getEdgeTiles, u as GeoJSONFeature, ui as copy, un as interpolateFactory, ur as lerp, v as UnwrappedTileID, vi as ortho, vn as getJSON, vr as rayPlaneIntersection, vt as isCircleStyleLayer, w as latFromMercatorY, wi as translate, wn as getProtocol, wr as sphericalToCartesian, wt as Uniform3f, x as isInBoundsForZoomLngLat, xi as rotateY$1, xn as makeRequest, xr as rollPitchBearingEqual, xt as Uniform1f, y as calculateTileKey, yi as perspective, yn as getReferrer, yr as readImageUsingVideoFrame, yt as polygonIntersectsPolygon, z as getOverlapMode, zn as createIdentityMat4f64, zr as zero, zt as createLayout } from "./maplibre-gl-shared-dev.mjs";
+import { $ as tileCoordinatesToMercatorCoordinates, $n as degreesToRadians, $r as clone, $t as EvaluationParameters, A as getOverlapMode, Ai as scale, An as sameOrigin, Ar as rollPitchBearingToQuat, At as Uniform1i, Bn as angleToRotateBetweenVectors2D, Br as pixelsToTileUnits, Bt as CollisionCircleLayoutArray, C as createStyleLayer, Ci as invert$1, Cn as AJAXError, Cr as pick, Ct as renderColorRamp, D as isSymbolStyleLayer, Di as rotateX, Dn as getReferrer, Dr as readImageUsingVideoFrame, Dt as polygonIntersectsPolygon, E as isBackgroundStyleLayer, Ei as perspective, En as getJSON, Er as rayPlaneIntersection, Et as isCircleStyleLayer, Fi as invert, Fn as AbortError, Fr as translatePosition, Ft as UniformColorArray, G as isFillExtrusionStyleLayer, Gn as clone$2, Gr as sqrLen, Gt as RasterBoundsArray, H as isLineStyleLayer, Hn as arrayBufferToImageBitmap, Hr as create$3, Ht as Pos3dArray, I as ImagePosition, Ii as rotate, In as isAbortError, Ir as uniqueId, It as UniformFloatArray, J as cameraDirectionFromPitchBearing, Jn as createMat4f64, Jr as slerp, Jt as isRasterStyleLayer, Kn as createIdentityMat4f32, Kr as zero, Kt as TriangleIndexArray, L as potpack, Li as isOffscreenCanvasDistorted, Ln as throwIfAborted, Lr as warnOnce, Lt as UniformMatrix4f, M as evaluateSizeForZoom, Mi as create$4, Mn as getProtocol, Mr as sphericalToCartesian, Mt as Uniform3f, Ni as fromRotation, Nn as removeProtocol, Nr as subscribe, Nt as Uniform4f, O as SymbolBucket, Oi as rotateY$1, On as getVideo, Or as remapSaturate, Ot as toEvaluationFeature, P as getAnchorAlignment, Pi as create$2, Pn as config, Pr as threePlaneIntersection, Pt as UniformColor, Q as projectToWorldCoordinates, Qn as defaultEasing, Qr as add, Qt as Transitionable, R as renderStyleImage, Ri as offscreenCanvasSupported, Rr as wrap, Rt as SegmentVector, S as Actor, Si as identity, Sn as Evented, Sr as parseCacheControl, St as isHeatmapStyleLayer, T as validateCustomStyleLayer, Ti as ortho, Tn as getArrayBuffer, Tr as radiansToDegrees, Tt as RGBAImage, Un as bezier, Ur as length, Ut as PosArray, V as collisionCircleLayout, Vn as arrayBufferToImage, Vr as EXTENT, Vt as LineStripIndexArray, Wn as clamp, Wr as scale$1, Wt as QuadTriangleArray, X as getMercatorHorizon, Xn as createVec4f64, Xr as scale$3, Xt as Properties, Y as cameraMercatorCoordinateFromCenterAndRotation, Yn as createVec3f64, Yr as mul, Yt as DataConstantProperty, Z as maxMercatorHorizonAngle, Zn as deepEqual, Zr as transformMat4, Zt as TRANSITION_SUFFIX, _ as OverscaledTileID, _i as copy, _r as isWorker, _t as isColorReliefStyleLayer, a as clipLine, ai as normalize, an as emitValidationErrors, ar as filterObject, at as mercatorXfromLng, b as compareTileId, bi as exactEquals, bn as ErrorEvent, br as mod, bt as isHillshadeStyleLayer, ci as rotateZ$1, cn as validateStyleAndEmit, cr as getAngleDelta, ct as LngLat, di as sub, dn as ValidationError, dr as getRollPitchBearing, dt as isFillStyleLayer, ei as cross, er as differenceOfAnglesDegrees, et as unprojectFromWorldCoordinates, f as GEOJSON_TILE_LAYER_NAME, fi as transformMat3, fr as isImageBitmap, g as CanonicalTileID, gi as clone$1, gn as featureFilter, gr as isTouchableOrPointableType, gt as SubdivisionGranularitySetting, h as Bounds, hi as zero$1, hn as emptyStyle, hr as isTouchableEvent, ht as SubdivisionGranularityExpression, ii as negate, in as SPEC_SOURCE_TYPES, ir as extend, it as lngFromMercatorX, j as evaluateSizeForFeature, ji as translate, jn as addProtocol, jr as scaleZoom, jt as Uniform2f, k as addDynamicAttributes, ki as rotateZ, kn as makeRequest, kr as rollPitchBearingEqual, kt as Uniform1f, li as scale$2, ln as Color, lr as getEdgeTiles, lt as earthRadius, mi as transformQuat, mn as diff, mr as isSafari, mt as SOUTH_POLE_Y, ni as len, nn as ZoomHistory, nr as ensureError, nt as altitudeFromMercatorZ, oi as rotateX$1, on as validateAndEmit, or as findLineIntersection, ot as mercatorYfromLat, pi as transformMat4$1, pn as derefLayers, pr as isPointableEvent, pt as NORTH_POLE_Y, q as calculateTileMatrix, qn as createIdentityMat4f64, qr as fromEuler, qt as createLayout, r as TextAnchorEnum, ri as length$1, rr as evaluateZoomSnap, rt as latFromMercatorY, s as TileCache, si as rotateY, sn as validateStyle, sr as getAABB, st as mercatorZfromAltitude, t as getAnchorJustification, ti as dot, tn as codePointUsesLocalIdeographFontFamily, tr as distanceOfAnglesRadians, tt as MercatorCoordinate, u as GeoJSONFeature, ui as scaleAndAdd, un as ProjectionDefinition, v as UnwrappedTileID, vi as create$1, vn as interpolateFactory, vr as lerp, w as isCustomStyleLayer, wi as multiply, wn as GLOBAL_DISPATCHER_ID, wr as pointPlaneSignedDistance, wt as AlphaImage, x as isInBoundsForZoomLngLat, xi as fromScaling, xn as Event, xr as nextPowerOfTwo, xt as HEATMAP_FULL_RENDER_FBO_KEY, y as calculateTileKey, yi as equals, yn as latest, yr as mapObject, yt as Texture, z as parseGlyphPbf, zi as Point, zn as MAX_VALID_LATITUDE, zr as zoomScale, zt as CollisionBoxArray } from "./maplibre-gl-shared-dev.mjs";
 //#region package.json
-var version$2 = "6.1.0";
+var version$2 = "6.2.0";
 //#endregion
 //#region src/util/browser.ts
 let linkEl;
@@ -709,7 +709,8 @@ async function loadSprite(originalSprite, requestManager, pixelRatio, abortContr
 	const jsonsMap = {};
 	const imagesMap = {};
 	for (const { id, url } of spriteArray) {
-		jsonsMap[id] = getJSON(await requestManager.transformRequest(normalizeSpriteURL(url, format, ".json"), "SpriteJSON"), abortController);
+		const jsonRequestParameters = await requestManager.transformRequest(normalizeSpriteURL(url, format, ".json"), "SpriteJSON");
+		jsonsMap[id] = getJSON(jsonRequestParameters, abortController);
 		const imageRequestParameters = await requestManager.transformRequest(normalizeSpriteURL(url, format, ".png"), "SpriteImage");
 		imagesMap[id] = ImageRequest.getImage(imageRequestParameters, abortController);
 	}
@@ -940,8 +941,8 @@ var ImageManager = class extends Evented {
 		if (pattern && pattern.position.version === image.version) return pattern.position;
 		if (!pattern) {
 			const bin = {
-				w: image.data.width + padding * 2,
-				h: image.data.height + padding * 2,
+				w: image.data.width + 2,
+				h: image.data.height + 2,
 				x: 0,
 				y: 0
 			};
@@ -1061,7 +1062,8 @@ var ImageManager = class extends Evented {
 async function loadGlyphRange(fontstack, range, urlTemplate, requestManager) {
 	const begin = range * 256;
 	const end = begin + 255;
-	const response = await getArrayBuffer(await requestManager.transformRequest(urlTemplate.replace("{fontstack}", fontstack).replace("{range}", `${begin}-${end}`), "Glyphs"), new AbortController());
+	const request = await requestManager.transformRequest(urlTemplate.replace("{fontstack}", fontstack).replace("{range}", `${begin}-${end}`), "Glyphs");
+	const response = await getArrayBuffer(request, new AbortController());
 	if (!response?.data) throw new Error(`Could not load glyph range. range: ${range}, ${begin}-${end}`);
 	const glyphs = {};
 	for (const glyph of parseGlyphPbf(response.data)) glyphs[glyph.id] = glyph;
@@ -1280,7 +1282,9 @@ var GlyphManager = class GlyphManager {
 	}
 	_warnOnMissingGlyphRange(glyph, range, id, err) {
 		const begin = range * 256;
-		warnOnce(`Unable to load glyph range ${range}, ${begin}-${begin + 255}. Rendering codepoint U+${id.toString(16).padStart(4, "0").toUpperCase()} locally instead. ${err}`);
+		const end = begin + 255;
+		const codePoint = id.toString(16).padStart(4, "0").toUpperCase();
+		warnOnce(`Unable to load glyph range ${range}, ${begin}-${end}. Rendering codepoint U+${codePoint} locally instead. ${err}`);
 	}
 	/**
 	* Returns whether the given codepoint should be rendered locally.
@@ -1315,8 +1319,8 @@ var GlyphManager = class GlyphManager {
 		return {
 			id,
 			bitmap: new AlphaImage({
-				width: char.width || 30 * textureScale,
-				height: char.height || 30 * textureScale
+				width: char.width || 60,
+				height: char.height || 60
 			}, char.data),
 			metrics: {
 				width: isControl ? 0 : char.glyphWidth / textureScale || 24,
@@ -1332,7 +1336,7 @@ var GlyphManager = class GlyphManager {
 		const fontFamilies = stack ? stack.split(",") : [];
 		fontFamilies.push(defaultGenericFontFamily);
 		const fontFamily = fontFamilies.map((fontName) => /[-\w]+/.test(fontName) ? fontName : `'${CSS.escape(fontName)}'`).join(",");
-		const fontSize = 24 * textureScale;
+		const fontSize = 48;
 		const fontWeight = this._fontWeight(fontFamilies[0]);
 		const fontStyle = this._fontStyle(fontFamilies[0]);
 		if (typeof document !== "undefined" && document.fonts?.load) try {
@@ -1342,8 +1346,8 @@ var GlyphManager = class GlyphManager {
 		}
 		return new GlyphManager.TinySDF({
 			fontSize,
-			buffer: 3 * textureScale,
-			radius: 8 * textureScale,
+			buffer: 6,
+			radius: 16,
 			cutoff: .25,
 			fontFamily,
 			fontWeight,
@@ -3185,9 +3189,7 @@ function getGeoJSONBounds(data) {
 		case "Feature":
 			coordinates = getCoordinatesFromGeometry(data.geometry);
 			break;
-		default:
-			coordinates = getCoordinatesFromGeometry(data);
-			break;
+		default: coordinates = getCoordinatesFromGeometry(data);
 	}
 	if (coordinates.length === 0) return bounds;
 	for (const coordinate of coordinates) {
@@ -3902,9 +3904,11 @@ var ImageSource = class extends Evented {
 			const maxTileY = Math.floor(maxY * tilesAtZoom);
 			const minTileXWrapped = (minTileX % tilesAtZoom + tilesAtZoom) % tilesAtZoom;
 			const maxTileXWrapped = maxTileX % tilesAtZoom;
+			const minWrap = Math.floor(minTileX / tilesAtZoom);
+			const maxWrap = Math.floor(maxTileX / tilesAtZoom);
 			ranges[z] = {
-				minWrap: Math.floor(minTileX / tilesAtZoom),
-				maxWrap: Math.floor(maxTileX / tilesAtZoom),
+				minWrap,
+				maxWrap,
 				minTileXWrapped,
 				maxTileXWrapped,
 				minTileY,
@@ -4564,7 +4568,8 @@ var Tile = class {
 				const evaluationFeature = toEvaluationFeature(feature, true);
 				if (!filter.filter(new EvaluationParameters(this.tileID.overscaledZ), evaluationFeature, this.tileID.canonical)) continue;
 			} else if (!filter.filter(new EvaluationParameters(this.tileID.overscaledZ), feature)) continue;
-			const geojsonFeature = new GeoJSONFeature(feature, z, x, y, featureIndex.getId(feature, sourceLayer));
+			const id = featureIndex.getId(feature, sourceLayer);
+			const geojsonFeature = new GeoJSONFeature(feature, z, x, y, id);
 			geojsonFeature.tile = coord;
 			result.push(geojsonFeature);
 		}
@@ -4755,86 +4760,6 @@ var SourceFeatureState = class {
 	}
 };
 //#endregion
-//#region src/geo/projection/mercator_utils.ts
-const maxMercatorHorizonAngle = 89.25;
-/**
-* Returns mercator coordinates in range 0..1 for given coordinates inside a specified tile.
-* @param inTileX - X coordinate in tile units - range [0..EXTENT].
-* @param inTileY - Y coordinate in tile units - range [0..EXTENT].
-* @param canonicalTileID - Tile canonical ID - mercator X, Y and zoom.
-* @returns Mercator coordinates of the specified point in range [0..1].
-*/
-function tileCoordinatesToMercatorCoordinates(inTileX, inTileY, canonicalTileID) {
-	const scale = 1 / (1 << canonicalTileID.z);
-	return new MercatorCoordinate(inTileX / EXTENT * scale + canonicalTileID.x * scale, inTileY / EXTENT * scale + canonicalTileID.y * scale);
-}
-/**
-* Convert from LngLat to world coordinates (Mercator coordinates scaled by world size).
-* @param worldSize - Mercator world size computed from zoom level and tile size.
-* @param lnglat - The location to convert.
-* @returns Point
-*/
-function projectToWorldCoordinates(worldSize, lnglat) {
-	const lat = clamp(lnglat.lat, -MAX_VALID_LATITUDE, MAX_VALID_LATITUDE);
-	return new Point(mercatorXfromLng(lnglat.lng) * worldSize, mercatorYfromLat(lat) * worldSize);
-}
-/**
-* Convert from world coordinates (mercator coordinates scaled by world size) to LngLat.
-* @param worldSize - Mercator world size computed from zoom level and tile size.
-* @param point - World coordinate.
-* @returns LngLat
-*/
-function unprojectFromWorldCoordinates(worldSize, point) {
-	return new MercatorCoordinate(point.x / worldSize, point.y / worldSize).toLngLat();
-}
-/**
-* Calculate pixel height of the visible horizon in relation to map-center (e.g. height/2),
-* multiplied by a static factor to simulate the earth-radius.
-* The calculated value is the horizontal line from the camera-height to sea-level.
-* @returns Horizon above center in pixels.
-*/
-function getMercatorHorizon(transform) {
-	return transform.cameraToCenterDistance * Math.min(Math.tan(degreesToRadians(90 - transform.pitch)) * .85, Math.tan(degreesToRadians(maxMercatorHorizonAngle - transform.pitch)));
-}
-function calculateTileMatrix(unwrappedTileID, worldSize) {
-	const canonical = unwrappedTileID.canonical;
-	const scale$5 = worldSize / zoomScale(canonical.z);
-	const unwrappedX = canonical.x + Math.pow(2, canonical.z) * unwrappedTileID.wrap;
-	const worldMatrix = /* @__PURE__ */ new Float64Array(16);
-	identity(worldMatrix);
-	translate(worldMatrix, worldMatrix, [
-		unwrappedX * scale$5,
-		canonical.y * scale$5,
-		0
-	]);
-	scale(worldMatrix, worldMatrix, [
-		scale$5 / EXTENT,
-		scale$5 / EXTENT,
-		1
-	]);
-	return worldMatrix;
-}
-function cameraMercatorCoordinateFromCenterAndRotation(center, elevation, pitch, bearing, distance) {
-	const centerMercator = MercatorCoordinate.fromLngLat(center, elevation);
-	const dMercator = distance * mercatorZfromAltitude(1, center.lat);
-	const { x, y, z } = cameraDirectionFromPitchBearing(pitch, bearing);
-	const dxMercator = dMercator * -x;
-	const dyMercator = dMercator * -y;
-	const dzMercator = dMercator * -z;
-	return new MercatorCoordinate(centerMercator.x + dxMercator, centerMercator.y + dyMercator, centerMercator.z + dzMercator);
-}
-function cameraDirectionFromPitchBearing(pitch, bearing) {
-	const pitchRadians = degreesToRadians(pitch);
-	const bearingRadians = degreesToRadians(bearing);
-	const z = Math.cos(-pitchRadians);
-	const h = Math.sin(pitchRadians);
-	return {
-		x: h * Math.sin(bearingRadians),
-		y: -h * Math.cos(bearingRadians),
-		z
-	};
-}
-//#endregion
 //#region src/geo/projection/covering_tiles.ts
 /**
 * A simple/heuristic function that returns whether the tile is visible under the current transform.
@@ -6912,12 +6837,13 @@ var CollisionIndex = class {
 			const featureKey = feature.key;
 			if (seenFeatures[featureKey.bucketInstanceId] === void 0) seenFeatures[featureKey.bucketInstanceId] = {};
 			if (seenFeatures[featureKey.bucketInstanceId][featureKey.featureIndex]) continue;
-			if (!polygonIntersectsPolygon(query, [
+			const bbox = [
 				new Point(feature.x1, feature.y1),
 				new Point(feature.x2, feature.y1),
 				new Point(feature.x2, feature.y2),
 				new Point(feature.x1, feature.y2)
-			])) continue;
+			];
+			if (!polygonIntersectsPolygon(query, bbox)) continue;
 			seenFeatures[featureKey.bucketInstanceId][featureKey.featureIndex] = true;
 			if (result[featureKey.bucketInstanceId] === void 0) result[featureKey.bucketInstanceId] = [];
 			result[featureKey.bucketInstanceId].push(featureKey.featureIndex);
@@ -7040,7 +6966,8 @@ var CollisionIndex = class {
 			distanceMultiplier = Math.pow(2, -zoomFraction);
 			distanceMultiplier *= this.transform.getPitchedTextCorrection(translatedAnchorX, translatedAnchorY, unwrappedTileID);
 			if (!shift) {
-				const perspectiveRatio = clamp(.5 + .5 * (projectedPoint.signedDistanceFromCamera / this.transform.cameraToCenterDistance), 0, 4);
+				const distanceRatio = projectedPoint.signedDistanceFromCamera / this.transform.cameraToCenterDistance;
+				const perspectiveRatio = clamp(.5 + .5 * distanceRatio, 0, 4);
 				distanceMultiplier *= perspectiveRatio;
 			}
 		}
@@ -7898,7 +7825,7 @@ var KDBush = class KDBush {
 			this.coords = new ArrayType(data, HEADER_SIZE + idsByteSize + padCoords, numItems * 2);
 			this._pos = 0;
 			this._finished = false;
-			new Uint8Array(data, 0, 2).set([219, (VERSION << 4) + arrayTypeIndex]);
+			new Uint8Array(data, 0, 2).set([219, 16 + arrayTypeIndex]);
 			new Uint16Array(data, 2, 1)[0] = nodeSize;
 			new Uint32Array(data, 4, 1)[0] = numItems;
 		}
@@ -8575,7 +8502,9 @@ var EdgeInsets = class EdgeInsets {
 	* @returns the point
 	*/
 	getCenter(width, height) {
-		return new Point(clamp((this.left + width - this.right) / 2, 0, width), clamp((this.top + height - this.bottom) / 2, 0, height));
+		const x = clamp((this.left + width - this.right) / 2, 0, width);
+		const y = clamp((this.top + height - this.bottom) / 2, 0, height);
+		return new Point(x, y);
 	}
 	equals(other) {
 		return this.top === other.top && this.bottom === other.bottom && this.left === other.left && this.right === other.right;
@@ -9247,7 +9176,8 @@ var MercatorCoveringTilesDetailsProvider = class {
 		]);
 	}
 	allowVariableZoom(transform, options) {
-		const maxConstantZoomPitch = clamp(78.5 - transform.fov * (Math.abs(Math.cos(transform.rollInRadians)) * transform.height + Math.abs(Math.sin(transform.rollInRadians)) * transform.width) / transform.height / 2, 0, 60);
+		const zfov = transform.fov * (Math.abs(Math.cos(transform.rollInRadians)) * transform.height + Math.abs(Math.sin(transform.rollInRadians)) * transform.width) / transform.height;
+		const maxConstantZoomPitch = clamp(78.5 - zfov / 2, 0, 60);
 		return !!options.terrain || transform.pitch > maxConstantZoomPitch;
 	}
 	allowWorldCopies() {
@@ -9381,7 +9311,9 @@ var Frustum = class Frustum {
 		const frustumCoords = clipSpaceCorners.map((v) => unprojectClipSpacePoint(v, invProj, worldSize, scale));
 		if (horizonPlane) adjustFarPlaneByHorizonPlane(frustumCoords, frustumPlanePointIndices[0], horizonPlane, flippedNearFar);
 		const frustumPlanes = frustumPlanePointIndices.map((p) => {
-			const n = normalize([], cross([], sub([], frustumCoords[p[0]], frustumCoords[p[1]]), sub([], frustumCoords[p[2]], frustumCoords[p[1]])));
+			const a = sub([], frustumCoords[p[0]], frustumCoords[p[1]]);
+			const b = sub([], frustumCoords[p[2]], frustumCoords[p[1]]);
+			const n = normalize([], cross([], a, b));
 			const d = -dot(n, frustumCoords[p[1]]);
 			return n.concat(d);
 		});
@@ -9475,12 +9407,15 @@ function getNormalizedNearPlane(frustumCoords, nearPlanePointsIndices) {
 * Returns the ideal distance between the frustum's near and far plane so that the far plane only lies as far as the horizon.
 */
 function getIdealNearFarPlaneDistance(horizonPlane, nearPlaneNormalized) {
-	const normalizedHorizonPlane = scale$3([], horizonPlane, 1 / len(horizonPlane));
+	const horizonPlaneLen = len(horizonPlane);
+	const normalizedHorizonPlane = scale$3([], horizonPlane, 1 / horizonPlaneLen);
 	const projectedViewDirection = sub([], nearPlaneNormalized, scale$2([], normalizedHorizonPlane, dot(nearPlaneNormalized, normalizedHorizonPlane)));
 	const projectedViewLength = len(projectedViewDirection);
 	if (projectedViewLength > 0) {
 		const horizonCircleRadius = Math.sqrt(1 - normalizedHorizonPlane[3] * normalizedHorizonPlane[3]);
-		return pointPlaneSignedDistance(nearPlaneNormalized, add([], scale$2([], normalizedHorizonPlane, -normalizedHorizonPlane[3]), scale$2([], projectedViewDirection, horizonCircleRadius / projectedViewLength)));
+		const horizonCircleCenter = scale$2([], normalizedHorizonPlane, -normalizedHorizonPlane[3]);
+		const pointFurthestOnHorizonCircle = add([], horizonCircleCenter, scale$2([], projectedViewDirection, horizonCircleRadius / projectedViewLength));
+		return pointPlaneSignedDistance(nearPlaneNormalized, pointFurthestOnHorizonCircle);
 	} else return null;
 }
 //#endregion
@@ -9687,7 +9622,7 @@ var MercatorTransform = class MercatorTransform {
 				zoom
 			};
 			let lngRange = this._helper._lngRange;
-			if (!this._helper._renderWorldCopies && lngRange === null) lngRange = [-179.9999999999, 179.9999999999];
+			if (!this._helper._renderWorldCopies && lngRange === null) lngRange = [-179.9999999999, 180 - 1e-10];
 			const worldSize = this.tileSize * zoomScale(result.zoom);
 			let minY = 0;
 			let maxY = worldSize;
@@ -9712,7 +9647,8 @@ var MercatorTransform = class MercatorTransform {
 			let modifiedX, modifiedY;
 			const scale = Math.max(scaleX || 0, scaleY || 0);
 			if (scale) {
-				result.center = unprojectFromWorldCoordinates(worldSize, new Point(scaleX ? (maxX + minX) / 2 : originalX, scaleY ? (maxY + minY) / 2 : originalY)).wrap();
+				const newPoint = new Point(scaleX ? (maxX + minX) / 2 : originalX, scaleY ? (maxY + minY) / 2 : originalY);
+				result.center = unprojectFromWorldCoordinates(worldSize, newPoint).wrap();
 				result.zoom += scaleZoom(scale);
 				return result;
 			}
@@ -9729,7 +9665,10 @@ var MercatorTransform = class MercatorTransform {
 				if (wrappedX - w2 < minX) modifiedX = minX + w2;
 				if (wrappedX + w2 > maxX) modifiedX = maxX - w2;
 			}
-			if (modifiedX !== void 0 || modifiedY !== void 0) result.center = unprojectFromWorldCoordinates(worldSize, new Point(modifiedX ?? originalX, modifiedY ?? originalY)).wrap();
+			if (modifiedX !== void 0 || modifiedY !== void 0) {
+				const newPoint = new Point(modifiedX ?? originalX, modifiedY ?? originalY);
+				result.center = unprojectFromWorldCoordinates(worldSize, newPoint).wrap();
+			}
 			return result;
 		};
 		this.applyConstrain = (lngLat, zoom) => {
@@ -10223,7 +10162,9 @@ function cameraForBoxAndBearing(options, padding, bounds, bearing, tr) {
 	}
 	const zoom = Math.min(scaleZoom(tr.scale * Math.min(scaleX, scaleY)), options.maxZoom);
 	const offset = Point.convert(options.offset);
-	const rotatedPaddingOffset = new Point((padding.left - padding.right) / 2, (padding.top - padding.bottom) / 2).rotate(degreesToRadians(bearing));
+	const paddingOffsetX = (padding.left - padding.right) / 2;
+	const paddingOffsetY = (padding.top - padding.bottom) / 2;
+	const rotatedPaddingOffset = new Point(paddingOffsetX, paddingOffsetY).rotate(degreesToRadians(bearing));
 	const offsetAtFinalZoom = offset.add(rotatedPaddingOffset).mult(tr.scale / zoomScale(zoom));
 	return {
 		center: unprojectFromWorldCoordinates(tr.worldSize, nwWorld.add(seWorld).div(2).sub(offsetAtFinalZoom)),
@@ -10599,7 +10540,9 @@ function getGlobeCircumferencePixels(transform) {
 	return 2 * Math.PI * radius;
 }
 function globeDistanceOfLocationsPixels(transform, a, b) {
-	const dot$2 = dot(angularCoordinatesToSurfaceVector(a), angularCoordinatesToSurfaceVector(b));
+	const vecA = angularCoordinatesToSurfaceVector(a);
+	const vecB = angularCoordinatesToSurfaceVector(b);
+	const dot$2 = dot(vecA, vecB);
 	const radians = Math.acos(dot$2);
 	const circumference = getGlobeCircumferencePixels(transform);
 	return radians / (2 * Math.PI) * circumference;
@@ -10665,7 +10608,8 @@ function sphereSurfacePointToCoordinates(surface) {
 		const projX = surface[0] / lengthXZ;
 		const projZ = surface[2] / lengthXZ;
 		const acosZ = Math.acos(projZ);
-		return new LngLat(wrap((projX > 0 ? acosZ : -acosZ) / Math.PI * 180, -180, 180), latDegrees);
+		const lngDegrees = (projX > 0 ? acosZ : -acosZ) / Math.PI * 180;
+		return new LngLat(wrap(lngDegrees, -180, 180), latDegrees);
 	} else return new LngLat(0, latDegrees);
 }
 /**
@@ -10711,7 +10655,8 @@ function planetScaleAtLatitude(latitudeDegrees) {
 */
 function getZoomAdjustment(oldLat, newLat) {
 	const oldCircumference = planetScaleAtLatitude(oldLat);
-	return scaleZoom(planetScaleAtLatitude(newLat) / oldCircumference);
+	const newCircumference = planetScaleAtLatitude(newLat);
+	return scaleZoom(newCircumference / oldCircumference);
 }
 function getDegreesPerPixel(worldSize, lat) {
 	return 360 / getGlobeCircumferencePixels({
@@ -10759,8 +10704,12 @@ function interpolateLngLatForGlobe(start, deltaLng, deltaLat, t) {
 		const valueStart = integrateSecX(samplePointStart);
 		const valueEnd = integrateSecX(samplePointEnd);
 		const newT = (valueT - valueStart) / (valueEnd - valueStart);
-		return new LngLat(start.lng + deltaLng * newT, interpolatedLat);
-	} else return new LngLat(start.lng + deltaLng * t, interpolatedLat);
+		const interpolatedLng = start.lng + deltaLng * newT;
+		return new LngLat(interpolatedLng, interpolatedLat);
+	} else {
+		const interpolatedLng = start.lng + deltaLng * t;
+		return new LngLat(interpolatedLng, interpolatedLat);
+	}
 }
 //#endregion
 //#region src/util/primitives/bounding_volume_cache.ts
@@ -11026,9 +10975,8 @@ var GlobeCoveringTilesDetailsProvider = class {
 		const tileMercatorSize = 1 / scale;
 		const tileCornerX = tileID.x / scale;
 		const tileCornerY = tileID.y / scale;
-		const worldSize = 1;
-		const halfWorld = .5 * worldSize;
-		let smallestDistance = 2 * worldSize;
+		const halfWorld = .5;
+		let smallestDistance = 2;
 		smallestDistance = Math.min(smallestDistance, distanceToTileWrapX(pointX, pointY, tileCornerX, tileCornerY, tileMercatorSize));
 		smallestDistance = Math.min(smallestDistance, distanceToTileWrapX(pointX, pointY, tileCornerX + halfWorld, -tileCornerY - tileMercatorSize, tileMercatorSize));
 		smallestDistance = Math.min(smallestDistance, distanceToTileWrapX(pointX, pointY, tileCornerX + halfWorld, 2 - tileCornerY - tileMercatorSize, tileMercatorSize));
@@ -11781,7 +11729,10 @@ var VerticalPerspectiveTransform = class VerticalPerspectiveTransform {
 	}
 	locationToScreenPoint(lnglat, terrain) {
 		const pos = angularCoordinatesToSurfaceVector(lnglat);
-		if (terrain) scale$2(pos, pos, 1 + terrain.getElevationForLngLatZoom(lnglat, this._helper._tileZoom) / earthRadius);
+		if (terrain) {
+			const elevation = terrain.getElevationForLngLatZoom(lnglat, this._helper._tileZoom);
+			scale$2(pos, pos, 1 + elevation / earthRadius);
+		}
 		return this._projectSurfacePointToScreen(pos);
 	}
 	/**
@@ -12222,7 +12173,9 @@ var GlobeTransform = class GlobeTransform {
 		return lerp(this._mercatorTransform.getCircleRadiusCorrection(), this._verticalPerspectiveTransform.getCircleRadiusCorrection(), this._globeness);
 	}
 	getPitchedTextCorrection(textAnchorX, textAnchorY, tileID) {
-		return lerp(this._mercatorTransform.getPitchedTextCorrection(textAnchorX, textAnchorY, tileID), this._verticalPerspectiveTransform.getPitchedTextCorrection(textAnchorX, textAnchorY, tileID), this._globeness);
+		const mercatorCorrection = this._mercatorTransform.getPitchedTextCorrection(textAnchorX, textAnchorY, tileID);
+		const verticalCorrection = this._verticalPerspectiveTransform.getPitchedTextCorrection(textAnchorX, textAnchorY, tileID);
+		return lerp(mercatorCorrection, verticalCorrection, this._globeness);
 	}
 	projectTileCoordinates(x, y, unwrappedTileID, getElevation) {
 		return this.currentTransform.projectTileCoordinates(x, y, unwrappedTileID, getElevation);
@@ -12535,7 +12488,8 @@ var VerticalPerspectiveCameraHelper = class VerticalPerspectiveCameraHelper {
 		const requestedMinZoom = typeof options.minZoom === "number" ? +options.minZoom : tr.minZoom;
 		const normalizedEffectiveMinZoom = Math.max(requestedMinZoom, tr.minZoom) + getZoomAdjustment(targetCenter.lat, 0);
 		const minZoomPreConstrain = Math.min(normalizedEffectiveMinZoom, normalizedStartZoom, normalizedTargetZoom) + getZoomAdjustment(0, targetCenter.lat);
-		const scaleOfMinZoom = zoomScale(tr.applyConstrain(targetCenter, minZoomPreConstrain).zoom + getZoomAdjustment(targetCenter.lat, 0) - normalizedStartZoom);
+		const normalizedMinZoom = tr.applyConstrain(targetCenter, minZoomPreConstrain).zoom + getZoomAdjustment(targetCenter.lat, 0);
+		const scaleOfMinZoom = zoomScale(normalizedMinZoom - normalizedStartZoom);
 		const deltaLng = differenceOfAnglesDegrees(startCenter.lng, targetCenter.lng);
 		const deltaLat = differenceOfAnglesDegrees(startCenter.lat, targetCenter.lat);
 		const easeFunc = (k, scale, centerFactor, _pointAtOffset) => {
@@ -13159,9 +13113,7 @@ var Style = class extends Evented {
 			case "setTransition":
 				operations.push(() => {});
 				break;
-			default:
-				unimplemented.push(op.command);
-				break;
+			default: unimplemented.push(op.command);
 		}
 		return {
 			operations,
@@ -14161,6 +14113,7 @@ var Program = class {
 		for (const name in this.attributes) {
 			const actual = gl.getAttribLocation(this.program, name);
 			if (actual >= 0) this.attributes[name] = actual;
+			else delete this.attributes[name];
 		}
 		if (!gl.getProgramParameter(this.program, gl.LINK_STATUS)) throw new Error(`Program failed to link: ${gl.getProgramInfoLog(this.program)}`);
 		gl.deleteShader(vertexShader);
@@ -14203,9 +14156,7 @@ var Program = class {
 			case gl.TRIANGLES:
 				primitiveSize = 3;
 				break;
-			case gl.LINE_STRIP:
-				primitiveSize = 1;
-				break;
+			case gl.LINE_STRIP: primitiveSize = 1;
 		}
 		for (const segment of segments.get()) {
 			segment.vaos ||= {};
@@ -14472,9 +14423,7 @@ const hillshadeUniformValues = (painter, tile, layer) => {
 		case "multidirectional":
 			method = 3;
 			break;
-		default:
-			method = 0;
-			break;
+		default: method = 0;
 	}
 	const illumination = layer.getIlluminationProperties();
 	for (let i = 0; i < illumination.directionRadians.length; i++) if (layer.paint.get("hillshade-illumination-anchor") === "viewport") illumination.directionRadians[i] += painter.transform.bearingInRadians;
@@ -16167,7 +16116,9 @@ function drawCircles(painter, tileManager, layer, coords, renderOptions) {
 		const tile = tileManager.getTile(coord);
 		const bucket = tile.getBucket(layer);
 		if (!bucket) continue;
-		const translateForUniforms = translatePosition(transform, tile, layer.paint.get("circle-translate"), layer.paint.get("circle-translate-anchor"));
+		const styleTranslate = layer.paint.get("circle-translate");
+		const styleTranslateAnchor = layer.paint.get("circle-translate-anchor");
+		const translateForUniforms = translatePosition(transform, tile, styleTranslate, styleTranslateAnchor);
 		const programConfiguration = bucket.programConfigurations.get(layer.id);
 		const program = painter.useProgram("circle", programConfiguration);
 		const layoutVertexBuffer = bucket.layoutVertexBuffer;
@@ -16447,7 +16398,8 @@ function updateGradientTexture(painter, tileManager, context, gl, layer, bucket,
 	if (layer.stepInterpolant) {
 		const sourceMaxZoom = tileManager.getSource().maxzoom;
 		const potentialOverzoom = coord.canonical.z === sourceMaxZoom ? Math.ceil(1 << painter.transform.maxZoom - coord.canonical.z) : 1;
-		textureResolution = clamp(nextPowerOfTwo(bucket.maxLineLength / EXTENT * 1024 * potentialOverzoom), 256, context.maxTextureSize);
+		const maxTextureCoverage = bucket.maxLineLength / EXTENT * 1024 * potentialOverzoom;
+		textureResolution = clamp(nextPowerOfTwo(maxTextureCoverage), 256, context.maxTextureSize);
 	}
 	layerGradient.gradient = renderColorRamp({
 		expression: layer.gradientExpression(),
@@ -17040,7 +16992,8 @@ function getCrossFadeValues(tile, parentTile, fadeDuration) {
 * Simple fade-in values for tile without a parent (i.e. edge tiles)
 */
 function getSelfFadeValues(tile, fadeDuration) {
-	const tileOpacity = clamp((now() - tile.timeAdded) / fadeDuration, 0, 1);
+	const timeSinceTile = (now() - tile.timeAdded) / fadeDuration;
+	const tileOpacity = clamp(timeSinceTile, 0, 1);
 	return {
 		tileOpacity,
 		fadeMix: {
@@ -17600,7 +17553,7 @@ var Painter = class Painter {
 		context.setDepthMode(DepthMode.disabled);
 		const stencilRefs = {};
 		for (const tileID of tileIDs) stencilRefs[tileID.key] = this.nextStencilID++;
-		this._renderTileMasks(stencilRefs, tileIDs, renderToTexture, true);
+		if (this.style.projection.useSubdivision) this._renderTileMasks(stencilRefs, tileIDs, renderToTexture, true);
 		this._renderTileMasks(stencilRefs, tileIDs, renderToTexture, false);
 		this._tileClippingMaskIDs = stencilRefs;
 	}
@@ -18152,7 +18105,7 @@ var Hash = class {
 			location = location.replace("&&", "&");
 			window.history.replaceState(window.history.state, null, location);
 		};
-		this._updateHash = throttle(this._updateHashUnthrottled, 30 * 1e3 / 100);
+		this._updateHash = throttle(this._updateHashUnthrottled, 3e4 / 100);
 		this._hashName = hashName && encodeURIComponent(hashName);
 	}
 	/**
@@ -19631,7 +19584,8 @@ var ScrollZoomHandler = class {
 			const t = (now() - currentEase.start) / currentEase.duration;
 			const speed = currentEase.easing(t + .01) - currentEase.easing(t);
 			const x = .27 / Math.sqrt(speed * speed + 1e-4) * .01;
-			easing = bezier(x, Math.sqrt(.27 * .27 - x * x), .25, 1);
+			const y = Math.sqrt(.0729 - x * x);
+			easing = bezier(x, y, .25, 1);
 		}
 		this._prevEase = {
 			start: now(),
@@ -21775,7 +21729,8 @@ var Terrain = class {
 		this._terrainSkirtLength = terrainSkirtLength;
 		this.qualityFactor = 2;
 		this.meshSize = 128;
-		this._demMatrixCache = {};
+		this._demMatrixCache = /* @__PURE__ */ new Map();
+		this._elevationSamplerCache = /* @__PURE__ */ new Map();
 		this.coordsIndex = [];
 		this._coordsTextureSize = 1024;
 	}
@@ -21821,12 +21776,8 @@ var Terrain = class {
 	getDEMElevation(tileID, x, y, extent = EXTENT) {
 		const normalized = tileID.normalizeCoordinates(x, y, extent);
 		if (!normalized) return 0;
-		const terrain = this.getTerrainData(normalized.tileID);
-		const dem = terrain.tile?.dem;
-		if (!dem) return 0;
-		const pos = transformMat4$2([], [normalized.x / extent * EXTENT, normalized.y / extent * EXTENT], terrain.u_terrain_matrix);
-		const coord = [pos[0] * dem.dim, pos[1] * dem.dim];
-		return dem.sampleBilinear(coord[0], coord[1]);
+		const sampler = this._getElevationSampler(normalized.tileID);
+		return sampler ? sampler(normalized.x, normalized.y, extent) : 0;
 	}
 	/**
 	* Get the elevation for given {@link LngLat} in respect of exaggeration.
@@ -21868,6 +21819,55 @@ var Terrain = class {
 		return this.getDEMElevation(tileID, x, y, extent) * this.exaggeration;
 	}
 	/**
+	* Clear CPU elevation samplers that may retain a previously selected DEM tile.
+	* @internal
+	*/
+	resetElevationCache() {
+		this._elevationSamplerCache.clear();
+	}
+	_getElevationSampler(tileID) {
+		const key = tileID.key;
+		const cachedSampler = this._elevationSamplerCache.get(key);
+		if (cachedSampler) return cachedSampler;
+		const sourceTile = this.tileManager.getSourceTile(tileID, true);
+		const dem = sourceTile?.dem;
+		if (!sourceTile || !dem) return null;
+		const matrix = this._getDEMTileMatrix(tileID, sourceTile);
+		const demPixelScaleX = matrix[0] * dem.dim;
+		const demPixelScaleY = matrix[5] * dem.dim;
+		const demPixelOffsetX = matrix[12] * dem.dim;
+		const demPixelOffsetY = matrix[13] * dem.dim;
+		const sampler = (x, y, extent) => {
+			const extentScale = extent === 8192 ? 1 : EXTENT / extent;
+			return dem.sampleBilinear(x * extentScale * demPixelScaleX + demPixelOffsetX, y * extentScale * demPixelScaleY + demPixelOffsetY);
+		};
+		this._elevationSamplerCache.set(key, sampler);
+		return sampler;
+	}
+	_getDEMTileMatrix(tileID, sourceTile) {
+		const matrixKey = `${sourceTile.tileID.key}/${tileID.key}`;
+		const cachedMatrix = this._demMatrixCache.get(matrixKey);
+		if (cachedMatrix) return cachedMatrix;
+		const maxzoom = this.tileManager.getSource().maxzoom;
+		let dz = tileID.canonical.z - sourceTile.tileID.canonical.z;
+		if (tileID.overscaledZ > tileID.canonical.z) if (tileID.canonical.z >= maxzoom) dz = tileID.canonical.z - maxzoom;
+		else warnOnce("cannot calculate elevation if elevation maxzoom > source.maxzoom");
+		const dx = tileID.canonical.x - (tileID.canonical.x >> dz << dz);
+		const dy = tileID.canonical.y - (tileID.canonical.y >> dz << dz);
+		const demMatrix = fromScaling(/* @__PURE__ */ new Float64Array(16), [
+			1 / (EXTENT << dz),
+			1 / (EXTENT << dz),
+			0
+		]);
+		translate(demMatrix, demMatrix, [
+			dx * EXTENT,
+			dy * EXTENT,
+			0
+		]);
+		this._demMatrixCache.set(matrixKey, demMatrix);
+		return demMatrix;
+	}
+	/**
 	* returns a Terrain Object for a tile. Unless the tile corresponds to data (e.g. tile is loading), return a flat dem object
 	* @param tileID - the tile to get the terrain for
 	* @returns the terrain data to use in the program
@@ -21902,34 +21902,12 @@ var Terrain = class {
 			sourceTile.demTexture.bind(context.gl.NEAREST, context.gl.CLAMP_TO_EDGE);
 			sourceTile.needsTerrainPrepare = false;
 		}
-		const matrixKey = sourceTile && sourceTile.toString() + sourceTile.tileID.key + tileID.key;
-		if (matrixKey && !this._demMatrixCache[matrixKey]) {
-			const maxzoom = this.tileManager.getSource().maxzoom;
-			let dz = tileID.canonical.z - sourceTile.tileID.canonical.z;
-			if (tileID.overscaledZ > tileID.canonical.z) if (tileID.canonical.z >= maxzoom) dz = tileID.canonical.z - maxzoom;
-			else warnOnce("cannot calculate elevation if elevation maxzoom > source.maxzoom");
-			const dx = tileID.canonical.x - (tileID.canonical.x >> dz << dz);
-			const dy = tileID.canonical.y - (tileID.canonical.y >> dz << dz);
-			const demMatrix = fromScaling(/* @__PURE__ */ new Float64Array(16), [
-				1 / (EXTENT << dz),
-				1 / (EXTENT << dz),
-				0
-			]);
-			translate(demMatrix, demMatrix, [
-				dx * EXTENT,
-				dy * EXTENT,
-				0
-			]);
-			this._demMatrixCache[matrixKey] = {
-				matrix: demMatrix,
-				coord: tileID
-			};
-		}
+		const terrainMatrix = sourceTile ? this._getDEMTileMatrix(tileID, sourceTile) : this._emptyDemMatrix;
 		return {
 			"u_depth": 2,
 			"u_terrain": 3,
 			"u_terrain_dim": sourceTile?.dem?.dim || 1,
-			"u_terrain_matrix": matrixKey ? this._demMatrixCache[matrixKey].matrix : this._emptyDemMatrix,
+			"u_terrain_matrix": terrainMatrix,
 			"u_terrain_unpack": sourceTile?.dem?.getUnpackVector() || this._emptyDemUnpack,
 			"u_terrain_exaggeration": this.exaggeration,
 			texture: (sourceTile?.demTexture || this._emptyDemTexture).texture,
@@ -21997,10 +21975,11 @@ var Terrain = class {
 			data[i + 2] = x >> 8 << 4 | y >> 8;
 			data[i + 3] = 0;
 		}
-		const texture = new Texture(context, new RGBAImage({
+		const image = new RGBAImage({
 			width: this._coordsTextureSize,
 			height: this._coordsTextureSize
-		}, new Uint8Array(data.buffer)), context.gl.RGBA, { premultiply: false });
+		}, new Uint8Array(data.buffer));
+		const texture = new Texture(context, image, context.gl.RGBA, { premultiply: false });
 		texture.bind(context.gl.NEAREST, context.gl.CLAMP_TO_EDGE);
 		this._coordsTexture = texture;
 		return texture;
@@ -22041,7 +22020,7 @@ var Terrain = class {
 		context.bindFramebuffer.set(this.getFramebuffer("depth").framebuffer);
 		gl.readPixels(p.x, this.painter.height / devicePixelRatio - p.y - 1, 1, 1, gl.RGBA, gl.UNSIGNED_BYTE, rgba);
 		context.bindFramebuffer.set(null);
-		return (rgba[0] / (256 * 256 * 256) + rgba[1] / (256 * 256) + rgba[2] / 256 + rgba[3]) / 256;
+		return (rgba[0] / 16777216 + rgba[1] / 65536 + rgba[2] / 256 + rgba[3]) / 256;
 	}
 	/**
 	* create a regular mesh which will be used by all terrain-tiles
@@ -22108,8 +22087,9 @@ var Terrain = class {
 		const worldSize = (1 << zoom) * EXTENT;
 		const mercatorX = mercatorCoordinate.x * worldSize;
 		const mercatorY = mercatorCoordinate.y * worldSize;
+		const tileX = Math.floor(mercatorX / EXTENT), tileY = Math.floor(mercatorY / EXTENT);
 		return {
-			tileID: new OverscaledTileID(zoom, 0, zoom, Math.floor(mercatorX / EXTENT), Math.floor(mercatorY / EXTENT)),
+			tileID: new OverscaledTileID(zoom, 0, zoom, tileX, tileY),
 			mercatorX,
 			mercatorY
 		};
@@ -24297,22 +24277,30 @@ var Map$1 = class extends Evented {
 			this._camera.terrain = this.terrain;
 			this._camera.transform.setMinElevationForCurrentTile(this.terrain.getMinTileElevationForLngLatZoom(this._camera.transform.center, this._camera.transform.tileZoom));
 			this._camera.transform.setElevation(this.terrain.getElevationForLngLatZoom(this._camera.transform.center, this._camera.transform.tileZoom));
-			this._terrainDataCallback = (e) => {
-				if (e.dataType === "style") this.terrain.tileManager.releaseAllRTT();
-				else if (e.dataType === "source" && e.tile) {
-					if (e.sourceId === options.source && !this._camera.elevationFreeze) {
-						this._camera.transform.setMinElevationForCurrentTile(this.terrain.getMinTileElevationForLngLatZoom(this._camera.transform.center, this._camera.transform.tileZoom));
-						if (this.getCenterClampedToGround()) this._camera.transform.setElevation(this.terrain.getElevationForLngLatZoom(this._camera.transform.center, this._camera.transform.tileZoom));
-					}
-					if (e.source?.type === "image") this.terrain.tileManager.releaseAllRTT();
-					else this.terrain.tileManager.releaseRTT(e.tile.tileID);
-				}
-			};
+			this._terrainDataCallback = (e) => this._handleTerrainDataEvent(e, options.source);
 			this.style.on("data", this._terrainDataCallback);
 		}
 		this.fire(new MapTerrainEvent({ terrain: options }));
 		return this;
 	}
+	_handleTerrainDataEvent(event, terrainSourceId) {
+		if (event.dataType === "style") {
+			this.terrain.tileManager.releaseAllRTT();
+			return;
+		}
+		const isTerrainSourceEvent = event.sourceId === terrainSourceId;
+		if (isTerrainSourceEvent) this.terrain.resetElevationCache();
+		if (isTerrainSourceEvent && event.tile && !this._camera.elevationFreeze) {
+			this._camera.transform.setMinElevationForCurrentTile(this.terrain.getMinTileElevationForLngLatZoom(this._camera.transform.center, this._camera.transform.tileZoom));
+			if (this.getCenterClampedToGround()) this._camera.transform.setElevation(this.terrain.getElevationForLngLatZoom(this._camera.transform.center, this._camera.transform.tileZoom));
+		}
+		if (!event.tile) return;
+		if (event.source?.type === "image") {
+			this.terrain.tileManager.releaseAllRTT();
+			return;
+		}
+		this.terrain.tileManager.releaseRTT(event.tile.tileID);
+	}
 	/**
 	* Get the terrain-options if terrain is loaded
 	* @returns the TerrainSpecification passed to setTerrain
@@ -25406,6 +25394,7 @@ var Map$1 = class extends Evented {
 		}
 		if (this.terrain) {
 			this.terrain.tileManager.update(this._camera.transform, this.terrain);
+			this.terrain.resetElevationCache();
 			this._camera.transform.setMinElevationForCurrentTile(this.terrain.getMinTileElevationForLngLatZoom(this._camera.transform.center, this._camera.transform.tileZoom));
 			if (!this._camera.elevationFreeze && this.getCenterClampedToGround()) this._camera.transform.setElevation(this.terrain.getElevationForLngLatZoom(this._camera.transform.center, this._camera.transform.tileZoom));
 		} else {
@@ -26304,7 +26293,6 @@ var Marker = class extends Evented {
 		}
 		if (popup) {
 			if (!("offset" in popup.options)) {
-				const markerHeight = 41 - 5.8 / 2;
 				const markerRadius = 13.5;
 				const linearOffset = Math.abs(markerRadius) / Math.SQRT2;
 				popup.options.offset = this._defaultMarker ? {
@@ -26312,10 +26300,10 @@ var Marker = class extends Evented {
 					"top-left": [0, 0],
 					"top-right": [0, 0],
 					"bottom": [0, -38.1],
-					"bottom-left": [linearOffset, (markerHeight - markerRadius + linearOffset) * -1],
-					"bottom-right": [-linearOffset, (markerHeight - markerRadius + linearOffset) * -1],
-					"left": [markerRadius, (markerHeight - markerRadius) * -1],
-					"right": [-13.5, (markerHeight - markerRadius) * -1]
+					"bottom-left": [linearOffset, (24.6 + linearOffset) * -1],
+					"bottom-right": [-linearOffset, (24.6 + linearOffset) * -1],
+					"left": [markerRadius, -24.6],
+					"right": [-13.5, -24.6]
 				} : this._offset;
 			}
 			this._popup = popup;
@@ -26841,7 +26829,8 @@ var GeolocateControl = class extends Evented {
 		this._updateCamera = (position) => {
 			const center = new LngLat(position.coords.longitude, position.coords.latitude);
 			const radius = position.coords.accuracy;
-			const options = extend({ bearing: this._map.getBearing() }, this.options.fitBoundsOptions);
+			const bearing = this._map.getBearing();
+			const options = extend({ bearing }, this.options.fitBoundsOptions);
 			const newBounds = LngLatBounds.fromLngLat(center, radius);
 			this._map.fitBounds(newBounds, options, { geolocateSource: true });
 		};