maplibre-gl 6.0.0-19 → 6.0.0-20

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.0.0-19/LICENSE.txt
+* @license 3-Clause BSD. Full text of license: https://github.com/maplibre/maplibre-gl-js/blob/v6.0.0-20/LICENSE.txt
 */
 import { $n as findLineIntersection, $r as rotateX$1, $t as validateStyle, A as earthRadius, Ai as isOffscreenCanvasDistorted, Ar as warnOnce, At as SegmentVector, B as evaluateSizeForFeature, Bn as createMat4f64, Br as zero, Bt as isRasterStyleLayer, C as altitudeFromMercatorZ, Ci as scale, Cn as addProtocol, Cr as rollPitchBearingToQuat, Ct as Uniform2f, D as mercatorYfromLat, Di as create$2, Dn as AbortError, Dr as threePlaneIntersection, Dt as UniformColorArray, E as mercatorXfromLng, Ei as fromRotation, En as config, Er as subscribe, Et as UniformColor, F as isBackgroundStyleLayer, Fn as bezier, Fr as create$3, Ft as PosArray, G as ImagePosition, Gn as degreesToRadians, Gr as transformMat4, Gt as EvaluationParameters, Hn as createVec4f64, Hr as slerp, Ht as Properties, I as isSymbolStyleLayer, In as clamp, Ir as length, It as QuadTriangleArray, J as parseGlyphPbf, Jn as easeCubicInOut, Jr as cross, Jt as ZoomHistory, K as potpack, Kn as differenceOfAnglesDegrees, Kr as add, L as SymbolBucket, Ln as clone$2, Lr as scale$1, Lt as RasterBoundsArray, M as createStyleLayer, Mi as Point, Mn as angleToRotateBetweenVectors2D, Mr as zoomScale, Mt as CollisionCircleLayoutArray, N as isCustomStyleLayer, Nn as arrayBufferToImage, Nr as pixelsToTileUnits, Nt as LineStripIndexArray, O as mercatorZfromAltitude, Oi as invert, On as isAbortError, Or as translatePosition, Ot as UniformFloatArray, P as validateCustomStyleLayer, Pn as arrayBufferToImageBitmap, Pr as EXTENT, Pt as Pos3dArray, Qn as filterObject, Qr as normalize, Qt as validateSky, R as addDynamicAttributes, Rn as createIdentityMat4f32, Rr as sqrLen, Rt as TriangleIndexArray, S as MercatorCoordinate, Si as rotateZ, Sn as sameOrigin, Sr as rollPitchBearingEqual, St as Uniform1i, T as lngFromMercatorX, Ti as create$4, Tn as removeProtocol, Tr as sphericalToCartesian, Tt as Uniform4f, U as getAnchorAlignment, Un as deepEqual, Ur as mul, Ut as TRANSITION_SUFFIX, V as evaluateSizeForZoom, Vn as createVec3f64, Vr as fromEuler, Vt as DataConstantProperty, Wn as defaultEasing, Wr as scale$3, Wt as Transitionable, X as collisionCircleLayout, Xn as evaluateZoomSnap, Xr as len, Xt as emitValidationErrors$1, Yn as ensureError, Yr as dot, Z as isLineStyleLayer, Zn as extend, Zr as length$1, Zt as validateLight, _ as OverscaledTileID, _i as multiply, _n as getArrayBuffer, _r as pointPlaneSignedDistance, _t as RGBAImage, a as clipLine, ai as transformMat3, an as diff, ar as isImageBitmap, at as NORTH_POLE_Y, b as compareTileId, bi as rotateX, bn as getVideo, br as readImageUsingVideoFrame, bt as toEvaluationFeature, ci as zero$1, cr as isTouchableEvent, ct as SubdivisionGranularitySetting, di as create$1, dn as v8, dr as lerp, dt as Texture, ei as rotateY, en as Color, er as getAABB, et as isFillExtrusionStyleLayer, f as GEOJSON_TILE_LAYER_NAME, fi as equals, fn as ErrorEvent, fr as mapObject, ft as isHillshadeStyleLayer, g as CanonicalTileID, gi as invert$1, gn as GLOBAL_DISPATCHER_ID, gr as pick, gt as AlphaImage, h as Bounds, hi as identity, hn as AJAXError, hr as parseCacheControl, ht as renderColorRamp, ii as sub, in as derefLayers, ir as getRollPitchBearing, j as Actor, ji as offscreenCanvasSupported, jn as MAX_VALID_LATITUDE, jr as wrap, jt as CollisionBoxArray, k as LngLat, ki as rotate, kn as throwIfAborted, kr as uniqueId, kt as UniformMatrix4f, li as clone$1, ln as interpolateFactory, lr as isTouchableOrPointableType, lt as isColorReliefStyleLayer, mi as fromScaling, mn as Evented, mr as nextPowerOfTwo, mt as isHeatmapStyleLayer, ni as scale$2, nn as ValidationError, nr as getEdgeTiles, oi as transformMat4$1, on as emptyStyle, or as isPointableEvent, ot as SOUTH_POLE_Y, pi as exactEquals, pn as Event, pr as mod, pt as HEATMAP_FULL_RENDER_FBO_KEY, q as renderStyleImage, qn as distanceOfAnglesRadians, qr as clone, qt as codePointUsesLocalIdeographFontFamily, r as TextAnchorEnum, ri as scaleAndAdd, rt as isFillStyleLayer, s as TileCache, si as transformQuat, sn as featureFilter, sr as isSafari, st as SubdivisionGranularityExpression, t as getAnchorJustification, ti as rotateZ$1, tn as ProjectionDefinition, tr as getAngleDelta, u as GeoJSONFeature, ui as copy, un as latest_default, ur as isWorker, v as UnwrappedTileID, vi as ortho, vn as getJSON, vr as radiansToDegrees, vt as isCircleStyleLayer, w as latFromMercatorY, wi as translate, wn as getProtocol, wr as scaleZoom, wt as Uniform3f, x as isInBoundsForZoomLngLat, xi as rotateY$1, xn as makeRequest, xr as remapSaturate, xt as Uniform1f, y as calculateTileKey, yi as perspective, yn as getReferrer, yr as rayPlaneIntersection, yt as polygonIntersectsPolygon, z as getOverlapMode, zn as createIdentityMat4f64, zr as transformMat4$2, zt as createLayout } from "./maplibre-gl-shared-dev.mjs";
 //#region package.json
-var version$2 = "6.0.0-19";
+var version$2 = "6.0.0-20";
 //#endregion
 //#region src/util/browser.ts
 let linkEl;
@@ -4737,18 +4737,18 @@ function getMercatorHorizon(transform) {
 }
 function calculateTileMatrix(unwrappedTileID, worldSize) {
 	const canonical = unwrappedTileID.canonical;
-	const scale$7 = worldSize / zoomScale(canonical.z);
+	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$7,
-		canonical.y * scale$7,
+		unwrappedX * scale$5,
+		canonical.y * scale$5,
 		0
 	]);
 	scale(worldMatrix, worldMatrix, [
-		scale$7 / EXTENT,
-		scale$7 / EXTENT,
+		scale$5 / EXTENT,
+		scale$5 / EXTENT,
 		1
 	]);
 	return worldMatrix;
@@ -10049,24 +10049,6 @@ var MercatorTransform = class MercatorTransform {
 	populateCache(coords) {
 		for (const coord of coords) this.calculatePosMatrix(coord);
 	}
-	getMatrixForModel(location, altitude) {
-		const modelAsMercatorCoordinate = MercatorCoordinate.fromLngLat(location, altitude);
-		const scale$5 = modelAsMercatorCoordinate.meterInMercatorCoordinateUnits();
-		const m = createIdentityMat4f64();
-		translate(m, m, [
-			modelAsMercatorCoordinate.x,
-			modelAsMercatorCoordinate.y,
-			modelAsMercatorCoordinate.z
-		]);
-		rotateZ(m, m, Math.PI);
-		rotateX(m, m, Math.PI / 2);
-		scale(m, m, [
-			-scale$5,
-			scale$5,
-			scale$5
-		]);
-		return m;
-	}
 	getProjectionDataForCustomLayer(applyGlobeMatrix = true) {
 		const tileID = new OverscaledTileID(0, 0, 0, 0, 0);
 		const rendererProjectionData = this.getProjectionData({
@@ -10075,13 +10057,13 @@ var MercatorTransform = class MercatorTransform {
 		});
 		const tileMatrix = calculateTileMatrix(tileID, this.worldSize);
 		multiply(tileMatrix, this._viewProjMatrix, tileMatrix);
-		const scale$6 = [
+		const scale$4 = [
 			EXTENT,
 			EXTENT,
 			this.worldSize / this._helper.pixelsPerMeter
 		];
 		const projectionMatrixScaled = createMat4f64();
-		scale(projectionMatrixScaled, tileMatrix, scale$6);
+		scale(projectionMatrixScaled, tileMatrix, scale$4);
 		return {
 			...rendererProjectionData,
 			tileMercatorCoords: [
@@ -10257,20 +10239,19 @@ var MercatorCameraHelper = class {
 		const targetCenter = constrained.center;
 		const targetZoom = constrained.zoom;
 		normalizeCenter(tr, targetCenter);
-		const from = projectToWorldCoordinates(tr.worldSize, options.locationAtOffset);
-		const delta = projectToWorldCoordinates(tr.worldSize, targetCenter).sub(from);
+		const startWorldSize = tr.worldSize;
+		const from = projectToWorldCoordinates(startWorldSize, options.locationAtOffset);
+		const delta = projectToWorldCoordinates(startWorldSize, targetCenter).sub(from);
 		const pixelPathLength = delta.mag();
 		const scaleOfZoom = zoomScale(targetZoom - startZoom);
-		const optionsMinZoom = typeof options.minZoom !== "undefined";
-		let scaleOfMinZoom;
-		if (optionsMinZoom) {
-			const minZoomPreConstrain = Math.min(+options.minZoom, startZoom, targetZoom);
-			const minZoom = tr.applyConstrain(targetCenter, minZoomPreConstrain).zoom;
-			scaleOfMinZoom = zoomScale(minZoom - startZoom);
-		}
+		const requestedMinZoom = typeof options.minZoom !== "undefined" ? +options.minZoom : tr.minZoom;
+		const effectiveMinZoom = Math.max(requestedMinZoom, tr.minZoom);
+		const minZoomPreConstrain = Math.min(effectiveMinZoom, startZoom, targetZoom);
+		const minZoom = tr.applyConstrain(targetCenter, minZoomPreConstrain).zoom;
+		const scaleOfMinZoom = zoomScale(minZoom - startZoom);
 		const easeFunc = (k, scale, centerFactor, pointAtOffset) => {
 			tr.setZoom(k === 1 ? targetZoom : startZoom + scaleZoom(scale));
-			const newCenter = k === 1 ? targetCenter : unprojectFromWorldCoordinates(tr.worldSize, from.add(delta.mult(centerFactor)).mult(scale));
+			const newCenter = k === 1 ? targetCenter : unprojectFromWorldCoordinates(startWorldSize, from.add(delta.mult(centerFactor)));
 			tr.setLocationAtPoint(tr.renderWorldCopies ? newCenter.wrap() : newCenter, pointAtOffset);
 		};
 		return {
@@ -12146,25 +12127,6 @@ var VerticalPerspectiveTransform = class VerticalPerspectiveTransform {
 		const horizonDisk = horizonPlaneToCenterAndRadius(horizonPlane);
 		return sphereSurfacePointToCoordinates(clampToSphere(horizonDisk.center, horizonDisk.radius, planeIntersection));
 	}
-	getMatrixForModel(location, altitude) {
-		const lnglat = LngLat.convert(location);
-		const scale$4 = 1 / earthRadius;
-		const m = createIdentityMat4f64();
-		rotateY$1(m, m, lnglat.lng / 180 * Math.PI);
-		rotateX(m, m, -lnglat.lat / 180 * Math.PI);
-		translate(m, m, [
-			0,
-			0,
-			1 + altitude / earthRadius
-		]);
-		rotateX(m, m, Math.PI * .5);
-		scale(m, m, [
-			scale$4,
-			scale$4,
-			scale$4
-		]);
-		return m;
-	}
 	getProjectionDataForCustomLayer(applyGlobeMatrix = true) {
 		const globeData = this.getProjectionData({
 			overscaledTileID: new OverscaledTileID(0, 0, 0, 0, 0),
@@ -12548,9 +12510,6 @@ var GlobeTransform = class GlobeTransform {
 	getRayDirectionFromPixel(p) {
 		return this._verticalPerspectiveTransform.getRayDirectionFromPixel(p);
 	}
-	getMatrixForModel(location, altitude) {
-		return this.currentTransform.getMatrixForModel(location, altitude);
-	}
 	getProjectionDataForCustomLayer(applyGlobeMatrix = true) {
 		const mercatorData = this._mercatorTransform.getProjectionDataForCustomLayer(applyGlobeMatrix);
 		if (!this.isGlobeRendering) return mercatorData;
@@ -12772,13 +12731,10 @@ var VerticalPerspectiveCameraHelper = class VerticalPerspectiveCameraHelper {
 		const normalizedStartZoom = startZoom + getZoomAdjustment(startCenter.lat, 0);
 		const normalizedTargetZoom = targetZoom + getZoomAdjustment(targetCenter.lat, 0);
 		const scaleOfZoom = zoomScale(normalizedTargetZoom - normalizedStartZoom);
-		const optionsMinZoom = typeof options.minZoom === "number";
-		let scaleOfMinZoom;
-		if (optionsMinZoom) {
-			const normalizedOptionsMinZoom = +options.minZoom + getZoomAdjustment(targetCenter.lat, 0);
-			const minZoomPreConstrain = Math.min(normalizedOptionsMinZoom, normalizedStartZoom, normalizedTargetZoom) + getZoomAdjustment(0, targetCenter.lat);
-			scaleOfMinZoom = zoomScale(tr.applyConstrain(targetCenter, minZoomPreConstrain).zoom + getZoomAdjustment(targetCenter.lat, 0) - normalizedStartZoom);
-		}
+		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 deltaLng = differenceOfAnglesDegrees(startCenter.lng, targetCenter.lng);
 		const deltaLat = differenceOfAnglesDegrees(startCenter.lat, targetCenter.lat);
 		const easeFunc = (k, scale, centerFactor, _pointAtOffset) => {
@@ -13959,7 +13915,7 @@ var Style = class extends Evented {
 		this.sky.updateTransitions(parameters);
 	}
 	_setProjectionInternal(name) {
-		const projectionObjects = createProjectionFromName(name, this.map.transformConstrain);
+		const projectionObjects = createProjectionFromName(name, this.map._camera?.transform.constrainOverride);
 		this.projection = projectionObjects.projection;
 		this.map.migrateProjection(projectionObjects.transform, projectionObjects.cameraHelper);
 		for (const key in this.tileManagers) this.tileManagers[key].reload();
@@ -16612,6 +16568,7 @@ function drawLayerOpacity(painter, opacity, prepareDrawLayerOpacityResult, layer
 	context.activeTexture.set(gl.TEXTURE0);
 	gl.bindTexture(gl.TEXTURE_2D, painter.layerOpacityFbo.colorAttachment.get());
 	painter.useProgram("layerOpacity").draw(context, gl.TRIANGLES, DepthMode.disabled, StencilMode.disabled, painter.colorModeForRenderPass(), CullFaceMode.disabled, layerOpacityUniformValues(opacity, 0), null, null, layer.id, painter.viewportBuffer, painter.quadTriangleIndexBuffer, painter.viewportSegments, layer.paint, painter.transform.zoom);
+	painter.currentStencilSource = void 0;
 }
 //#endregion
 //#region src/webgl/draw/draw_line.ts
@@ -17557,7 +17514,7 @@ function getMesh(context, sky) {
 function drawSky(painter, sky) {
 	const context = painter.context;
 	const gl = context.gl;
-	const skyUniforms = skyUniformValues(sky, painter.style.map.transform, painter.pixelRatio);
+	const skyUniforms = skyUniformValues(sky, painter.transform, painter.pixelRatio);
 	const depthMode = new DepthMode(gl.LEQUAL, DepthMode.ReadWrite, [0, 1]);
 	const stencilMode = StencilMode.disabled;
 	const colorMode = painter.colorModeForRenderPass();
@@ -18452,29 +18409,29 @@ var HandlerInertia = class {
 		if (deltas.pan.mag()) {
 			const result = calculateEasing(deltas.pan.mag(), duration, extend({}, defaultPanInertiaOptions, panInertiaOptions || {}));
 			const finalPan = deltas.pan.mult(result.amount / deltas.pan.mag());
-			const computedEaseOptions = this._map.cameraHelper.handlePanInertia(finalPan, this._map.transform);
+			const computedEaseOptions = this._map._camera.cameraHelper.handlePanInertia(finalPan, this._map._camera.transform);
 			easeOptions.center = computedEaseOptions.easingCenter;
 			easeOptions.offset = computedEaseOptions.easingOffset;
 			extendDuration(easeOptions, result);
 		}
 		if (deltas.zoom) {
 			const result = calculateEasing(deltas.zoom, duration, defaultZoomInertiaOptions);
-			easeOptions.zoom = evaluateZoomSnap(this._map.transform.zoom + result.amount, this._map.getZoomSnap(), result.amount);
+			easeOptions.zoom = evaluateZoomSnap(this._map.getZoom() + result.amount, this._map.getZoomSnap(), result.amount);
 			extendDuration(easeOptions, result);
 		}
 		if (deltas.bearing) {
 			const result = calculateEasing(deltas.bearing, duration, defaultBearingInertiaOptions);
-			easeOptions.bearing = this._map.transform.bearing + clamp(result.amount, -179, 179);
+			easeOptions.bearing = this._map.getBearing() + clamp(result.amount, -179, 179);
 			extendDuration(easeOptions, result);
 		}
 		if (deltas.pitch) {
 			const result = calculateEasing(deltas.pitch, duration, defaultPitchInertiaOptions);
-			easeOptions.pitch = this._map.transform.pitch + result.amount;
+			easeOptions.pitch = this._map.getPitch() + result.amount;
 			extendDuration(easeOptions, result);
 		}
 		if (deltas.roll) {
 			const result = calculateEasing(deltas.roll, duration, defaultRollInertiaOptions);
-			easeOptions.roll = this._map.transform.roll + clamp(result.amount, -179, 179);
+			easeOptions.roll = this._map.getRoll() + clamp(result.amount, -179, 179);
 			extendDuration(easeOptions, result);
 		}
 		if (easeOptions.zoom || easeOptions.bearing) {
@@ -18597,41 +18554,6 @@ var BlockableMapEventHandler = class {
 	disable() {}
 };
 //#endregion
-//#region src/ui/handler/transform-provider.ts
-/**
-* @internal
-* Shared utilities for the Handler classes to access the correct camera state.
-* If Camera.transformCameraUpdate is specified or terrain is enabled, the
-* "desired state" of camera may differ from the state used for rendering. The
-* handlers need the "desired state" to track accumulated changes.
-*/
-var TransformProvider = class {
-	constructor(map) {
-		this._map = map;
-	}
-	get transform() {
-		return this._map._requestedCameraState || this._map.transform;
-	}
-	get center() {
-		return {
-			lng: this.transform.center.lng,
-			lat: this.transform.center.lat
-		};
-	}
-	get zoom() {
-		return this.transform.zoom;
-	}
-	get pitch() {
-		return this.transform.pitch;
-	}
-	get bearing() {
-		return this.transform.bearing;
-	}
-	unproject(point) {
-		return this.transform.screenPointToLocation(Point.convert(point), this._map.terrain);
-	}
-};
-//#endregion
 //#region src/ui/handler/box_zoom.ts
 /**
 * The `BoxZoomHandler` allows the user to zoom the map to fit within a bounding box.
@@ -18641,9 +18563,9 @@ var TransformProvider = class {
 */
 var BoxZoomHandler = class {
 	/** @internal */
-	constructor(map, options) {
+	constructor(map, options, transformProvider) {
 		this._map = map;
-		this._tr = new TransformProvider(map);
+		this._tr = transformProvider;
 		this._el = map.getCanvasContainer();
 		this._container = map.getContainer();
 		this._clickTolerance = options.clickTolerance || 1;
@@ -18844,8 +18766,8 @@ var TapRecognizer = class {
 * A `TapZoomHandler` allows the user to zoom the map at a point by double tapping
 */
 var TapZoomHandler = class {
-	constructor(map) {
-		this._tr = new TransformProvider(map);
+	constructor(map, transformProvider) {
+		this._tr = transformProvider;
 		this._zoomIn = new TapRecognizer({
 			numTouches: 1,
 			numTaps: 2
@@ -19476,8 +19398,8 @@ const defaultOptions$5 = {
 */
 var KeyboardHandler = class {
 	/** @internal */
-	constructor(map) {
-		this._tr = new TransformProvider(map);
+	constructor(map, transformProvider) {
+		this._tr = transformProvider;
 		const stepOptions = defaultOptions$5;
 		this._panStep = stepOptions.panStep;
 		this._bearingStep = stepOptions.bearingStep;
@@ -19639,14 +19561,14 @@ const wheelEventTimeDiffAdjustment = 5;
 */
 var ScrollZoomHandler = class {
 	/** @internal */
-	constructor(map, triggerRenderFrame) {
+	constructor(map, triggerRenderFrame, transformProvider) {
 		this._onTimeout = (initialEvent) => {
 			this._type = "wheel";
 			this._delta -= this._lastValue;
 			if (!this._active) this._start(initialEvent);
 		};
 		this._map = map;
-		this._tr = new TransformProvider(map);
+		this._tr = transformProvider;
 		this._triggerRenderFrame = triggerRenderFrame;
 		this._delta = 0;
 		this._defaultZoomRate = defaultZoomRate$1;
@@ -19925,8 +19847,8 @@ var DoubleClickZoomHandler = class {
 */
 var ClickZoomHandler = class {
 	/** @internal */
-	constructor(map) {
-		this._tr = new TransformProvider(map);
+	constructor(map, transformProvider) {
+		this._tr = transformProvider;
 		this.reset();
 	}
 	reset() {
@@ -20362,6 +20284,41 @@ var CooperativeGesturesHandler = class {
 	}
 };
 //#endregion
+//#region src/ui/handler/transform-provider.ts
+/**
+* @internal
+* Shared utilities for the Handler classes to access the correct camera state.
+* If Camera.transformCameraUpdate is specified or terrain is enabled, the
+* "desired state" of camera may differ from the state used for rendering. The
+* handlers need the "desired state" to track accumulated changes.
+*/
+var TransformProvider = class {
+	constructor(camera) {
+		this._camera = camera;
+	}
+	get transform() {
+		return this._camera._requestedCameraState || this._camera.transform;
+	}
+	get center() {
+		return {
+			lng: this.transform.center.lng,
+			lat: this.transform.center.lat
+		};
+	}
+	get zoom() {
+		return this.transform.zoom;
+	}
+	get pitch() {
+		return this.transform.pitch;
+	}
+	get bearing() {
+		return this.transform.bearing;
+	}
+	unproject(point) {
+		return this.transform.screenPointToLocation(Point.convert(point), this._camera.terrain);
+	}
+};
+//#endregion
 //#region src/ui/handler_manager.ts
 const isMoving = (p) => p.zoom || p.drag || p.roll || p.pitch || p.rotate;
 var RenderFrameEvent = class extends Event {};
@@ -20383,7 +20340,7 @@ var HandlerManager = class {
 	get _ownerWindow() {
 		return this._el?.ownerDocument?.defaultView || window;
 	}
-	constructor(map, options) {
+	constructor(map, camera, options) {
 		this.handleWindowEvent = (e) => {
 			this.handleEvent(e, `${e.type}Window`);
 		};
@@ -20427,7 +20384,7 @@ var HandlerManager = class {
 				]);
 				this._triggerRenderFrame();
 			}
-			if (Object.keys(activeHandlers).length || hasChange(mergedHandlerResult)) this._map._stop(true);
+			if (Object.keys(activeHandlers).length || hasChange(mergedHandlerResult)) this._camera.stop(true);
 			this._updatingCamera = false;
 			const { cameraAnimation } = mergedHandlerResult;
 			if (cameraAnimation) {
@@ -20438,6 +20395,8 @@ var HandlerManager = class {
 			}
 		};
 		this._map = map;
+		this._camera = camera;
+		this._transformProvider = new TransformProvider(this._camera);
 		this._el = this._map.getCanvasContainer();
 		this._handlers = [];
 		this._handlersById = {};
@@ -20549,14 +20508,14 @@ var HandlerManager = class {
 		const map = this._map;
 		const el = map.getCanvasContainer();
 		this._add("mapEvent", new MapEventHandler(map, options));
-		const boxZoom = map.boxZoom = new BoxZoomHandler(map, options);
+		const boxZoom = map.boxZoom = new BoxZoomHandler(map, options, this._transformProvider);
 		this._add("boxZoom", boxZoom);
 		if (options.interactive && options.boxZoom) boxZoom.enable();
 		const cooperativeGestures = map.cooperativeGestures = new CooperativeGesturesHandler(map, options.cooperativeGestures);
 		this._add("cooperativeGestures", cooperativeGestures);
 		if (options.cooperativeGestures) cooperativeGestures.enable();
-		const tapZoom = new TapZoomHandler(map);
-		const clickZoom = new ClickZoomHandler(map);
+		const tapZoom = new TapZoomHandler(map, this._transformProvider);
+		const clickZoom = new ClickZoomHandler(map, this._transformProvider);
 		map.doubleClickZoom = new DoubleClickZoomHandler(clickZoom, tapZoom);
 		this._add("tapZoom", tapZoom);
 		this._add("clickZoom", clickZoom);
@@ -20588,10 +20547,10 @@ var HandlerManager = class {
 		this._add("touchZoom", touchZoom, ["touchPan", "touchRotate"]);
 		if (options.interactive && options.touchZoomRotate) map.touchZoomRotate.enable(options.touchZoomRotate);
 		this._add("blockableMapEvent", new BlockableMapEventHandler(map));
-		const scrollZoom = map.scrollZoom = new ScrollZoomHandler(map, () => this._triggerRenderFrame());
+		const scrollZoom = map.scrollZoom = new ScrollZoomHandler(map, () => this._triggerRenderFrame(), this._transformProvider);
 		this._add("scrollZoom", scrollZoom, ["mousePan"]);
 		if (options.interactive && options.scrollZoom) map.scrollZoom.enable(options.scrollZoom);
-		const keyboard = map.keyboard = new KeyboardHandler(map);
+		const keyboard = map.keyboard = new KeyboardHandler(map, this._transformProvider);
 		this._add("keyboard", keyboard);
 		if (options.interactive && options.keyboard) map.keyboard.enable();
 	}
@@ -20672,16 +20631,16 @@ var HandlerManager = class {
 	}
 	_updateMapTransform(combinedResult, combinedEventsInProgress, deactivatedHandlers) {
 		const map = this._map;
-		const tr = map._getTransformForUpdate();
+		const tr = this._camera.getTransformForUpdate();
 		const terrain = map.terrain;
 		if (!hasChange(combinedResult) && !(terrain && this._terrainMovement)) {
 			this._fireEvents(combinedEventsInProgress, deactivatedHandlers, true);
 			return;
 		}
-		map._stop(true);
+		this._camera.stop(true);
 		let { panDelta, zoomDelta, bearingDelta, pitchDelta, rollDelta, around, pinchAround } = combinedResult;
 		if (pinchAround !== void 0) around = pinchAround;
-		around ||= map.transform.centerPoint;
+		around ||= this._camera.transform.centerPoint;
 		if (terrain && !tr.isPointOnMapSurface(around)) around = tr.centerPoint;
 		const deltasForHelper = {
 			panDelta,
@@ -20691,7 +20650,7 @@ var HandlerManager = class {
 			bearingDelta,
 			around
 		};
-		if (this._map.cameraHelper.useGlobeControls && !tr.isPointOnMapSurface(around)) around = tr.centerPoint;
+		if (this._camera.cameraHelper.useGlobeControls && !tr.isPointOnMapSurface(around)) around = tr.centerPoint;
 		const preZoomAroundLoc = around.distSqr(tr.centerPoint) < .01 ? tr.center : tr.screenPointToLocation(panDelta ? around.sub(panDelta) : around);
 		this._handleMapControls({
 			terrain,
@@ -20701,13 +20660,13 @@ var HandlerManager = class {
 			combinedEventsInProgress,
 			panDelta
 		});
-		map._applyUpdatedTransform(tr);
+		this._camera.applyUpdatedTransform(tr);
 		this._map._update();
 		if (!combinedResult.noInertia) this._inertia.record(combinedResult);
 		this._fireEvents(combinedEventsInProgress, deactivatedHandlers, true);
 	}
 	_handleMapControls({ terrain, tr, deltasForHelper, preZoomAroundLoc, combinedEventsInProgress, panDelta }) {
-		const cameraHelper = this._map.cameraHelper;
+		const cameraHelper = this._camera.cameraHelper;
 		cameraHelper.handleMapControlsRollPitchBearingZoom(deltasForHelper, tr);
 		if (!terrain) {
 			cameraHelper.handleMapControlsPan(deltasForHelper, tr, preZoomAroundLoc);
@@ -20716,14 +20675,14 @@ var HandlerManager = class {
 		if (cameraHelper.useGlobeControls) {
 			if (!this._terrainMovement && (combinedEventsInProgress.drag || combinedEventsInProgress.zoom)) {
 				this._terrainMovement = true;
-				this._map._elevationFreeze = true;
+				this._camera.elevationFreeze = true;
 			}
 			cameraHelper.handleMapControlsPan(deltasForHelper, tr, preZoomAroundLoc);
 			return;
 		}
 		if (!this._terrainMovement && (combinedEventsInProgress.drag || combinedEventsInProgress.zoom)) {
 			this._terrainMovement = true;
-			this._map._elevationFreeze = true;
+			this._camera.elevationFreeze = true;
 			cameraHelper.handleMapControlsPan(deltasForHelper, tr, preZoomAroundLoc);
 			return;
 		}
@@ -20763,11 +20722,11 @@ var HandlerManager = class {
 		const stillMoving = isMoving(this._eventsInProgress);
 		const finishedMoving = (wasMoving || nowMoving) && !stillMoving;
 		if (finishedMoving && this._terrainMovement) {
-			this._map._elevationFreeze = false;
+			this._camera.elevationFreeze = false;
 			this._terrainMovement = false;
-			const tr = this._map._getTransformForUpdate();
+			const tr = this._camera.getTransformForUpdate();
 			if (this._map.getCenterClampedToGround()) tr.recalculateZoomAndCenter(this._map.terrain);
-			this._map._applyUpdatedTransform(tr);
+			this._camera.applyUpdatedTransform(tr);
 		}
 		if (allowEndAnimation && finishedMoving) {
 			this._updatingCamera = true;
@@ -20802,7 +20761,7 @@ var HandlerManager = class {
 //#endregion
 //#region src/ui/camera.ts
 var Camera = class extends Evented {
-	constructor(transform, cameraHelper, options) {
+	constructor(options) {
 		super();
 		this._renderFrameCallback = () => {
 			const t = Math.min((now() - this._easeStart) / this._easeOptions.duration, 1);
@@ -20810,244 +20769,80 @@ var Camera = class extends Evented {
 			if (t < 1 && this._easeFrameId) this._easeFrameId = this._requestRenderFrame(this._renderFrameCallback);
 			else this.stop();
 		};
+		this.transform = new MercatorTransform();
+		this.cameraHelper = new MercatorCameraHelper();
+		if (options.minZoom !== void 0) this.transform.setMinZoom(options.minZoom);
+		if (options.maxZoom !== void 0) this.transform.setMaxZoom(options.maxZoom);
+		if (options.minPitch !== void 0) this.transform.setMinPitch(options.minPitch);
+		if (options.maxPitch !== void 0) this.transform.setMaxPitch(options.maxPitch);
+		if (options.renderWorldCopies !== void 0) this.transform.setRenderWorldCopies(options.renderWorldCopies);
+		if (options.transformConstrain !== null) this.transform.setConstrainOverride(options.transformConstrain);
 		this._moving = false;
 		this._zooming = false;
-		this.transform = transform;
 		this._bearingSnap = options.bearingSnap;
 		this._zoomSnap = options.zoomSnap;
-		this.cameraHelper = cameraHelper;
+		this._requestRenderFrame = options.requestRenderFrame;
+		this._cancelRenderFrame = options.cancelRenderFrame;
+		this.terrain = options.terrain;
+		this._centerClampedToGround = options.centerClampedToGround ?? true;
+		this.transformCameraUpdate = options.transformCameraUpdate ?? null;
+		this._stopHandlers = options.stopHandlers ?? (() => {});
 		this.on("moveend", () => {
 			delete this._requestedCameraState;
 		});
 	}
-	/**
-	* @internal
-	* Creates a new specialized transform instance from a projection instance and migrates
-	* to this new transform, carrying over all the properties of the old transform (center, pitch, etc.).
-	* When the style's projection is changed (or first set), this function should be called.
-	*/
 	migrateProjection(newTransform, newCameraHelper) {
 		newTransform.apply(this.transform, true);
 		this.transform = newTransform;
 		this.cameraHelper = newCameraHelper;
 	}
-	/**
-	* Returns the map's geographical centerpoint.
-	*
-	* @returns The map's geographical centerpoint.
-	* @example
-	* Return a LngLat object such as `{lng: 0, lat: 0}`
-	* ```ts
-	* let center = map.getCenter();
-	* // access longitude and latitude values directly
-	* let {lng, lat} = map.getCenter();
-	* ```
-	*/
 	getCenter() {
 		return new LngLat(this.transform.center.lng, this.transform.center.lat);
 	}
-	/**
-	* Sets the map's geographical centerpoint. Equivalent to `jumpTo({center: center})`.
-	*
-	* Triggers the following events: `movestart` and `moveend`.
-	*
-	* @param center - The centerpoint to set.
-	* @param eventData - Additional properties to be added to event objects of events triggered by this method.
-	* @example
-	* ```ts
-	* map.setCenter([-74, 38]);
-	* ```
-	*/
 	setCenter(center, eventData) {
 		return this.jumpTo({ center }, eventData);
 	}
-	/**
-	* Returns the elevation of the map's center point.
-	*
-	* @returns The elevation of the map's center point, in meters above sea level.
-	*/
 	getCenterElevation() {
 		return this.transform.elevation;
 	}
-	/**
-	* Sets the elevation of the map's center point, in meters above sea level. Equivalent to `jumpTo({elevation: elevation})`.
-	*
-	* Triggers the following events: `movestart` and `moveend`.
-	*
-	* @param elevation - The elevation to set, in meters above sea level.
-	* @param eventData - Additional properties to be added to event objects of events triggered by this method.
-	*/
 	setCenterElevation(elevation, eventData) {
 		this.jumpTo({ elevation }, eventData);
 		return this;
 	}
-	/**
-	* Returns the value of `centerClampedToGround`.
-	*
-	* If true, the elevation of the center point will automatically be set to the terrain elevation
-	* (or zero if terrain is not enabled). If false, the elevation of the center point will default
-	* to sea level and will not automatically update. Defaults to true. Needs to be set to false to
-	* keep the camera above ground when pitch \> 90 degrees.
-	*/
 	getCenterClampedToGround() {
 		return this._centerClampedToGround;
 	}
-	/**
-	* Sets the value of `centerClampedToGround`.
-	*
-	* If true, the elevation of the center point will automatically be set to the terrain elevation
-	* (or zero if terrain is not enabled). If false, the elevation of the center point will default
-	* to sea level and will not automatically update. Defaults to true. Needs to be set to false to
-	* keep the camera above ground when pitch \> 90 degrees.
-	*/
 	setCenterClampedToGround(centerClampedToGround) {
 		this._centerClampedToGround = centerClampedToGround;
 	}
-	/**
-	* Pans the map by the specified offset.
-	*
-	* Triggers the following events: `movestart` and `moveend`.
-	*
-	* @param offset - `x` and `y` coordinates by which to pan the map.
-	* @param options - Options object
-	* @param eventData - Additional properties to be added to event objects of events triggered by this method.
-	* @see [Navigate the map with game-like controls](https://maplibre.org/maplibre-gl-js/docs/examples/navigate-the-map-with-game-like-controls/)
-	*/
 	panBy(offset, options, eventData) {
 		offset = Point.convert(offset).mult(-1);
 		return this.panTo(this.transform.center, extend({ offset }, options), eventData);
 	}
-	/**
-	* Pans the map to the specified location with an animated transition.
-	*
-	* Triggers the following events: `movestart` and `moveend`.
-	*
-	* @param lnglat - The location to pan the map to.
-	* @param options - Options describing the destination and animation of the transition.
-	* @param eventData - Additional properties to be added to event objects of events triggered by this method.
-	* @example
-	* ```ts
-	* map.panTo([-74, 38]);
-	* // Specify that the panTo animation should last 5000 milliseconds.
-	* map.panTo([-74, 38], {duration: 5000});
-	* ```
-	* @see [Update a feature in realtime](https://maplibre.org/maplibre-gl-js/docs/examples/update-a-feature-in-realtime/)
-	*/
 	panTo(lnglat, options, eventData) {
 		return this.easeTo(extend({ center: lnglat }, options), eventData);
 	}
-	/**
-	* Returns the map's current zoom level.
-	*
-	* @returns The map's current zoom level.
-	* @example
-	* ```ts
-	* map.getZoom();
-	* ```
-	*/
 	getZoom() {
 		return this.transform.zoom;
 	}
-	/**
-	* Sets the map's zoom level. Equivalent to `jumpTo({zoom: zoom})`.
-	*
-	* Triggers the following events: `movestart`, `move`, `moveend`, `zoomstart`, `zoom`, and `zoomend`.
-	*
-	* @param zoom - The zoom level to set (0-20).
-	* @param eventData - Additional properties to be added to event objects of events triggered by this method.
-	* @example
-	* Zoom to the zoom level 5 without an animated transition
-	* ```ts
-	* map.setZoom(5);
-	* ```
-	*/
 	setZoom(zoom, eventData) {
 		this.jumpTo({ zoom }, eventData);
 		return this;
 	}
-	/**
-	* Zooms the map to the specified zoom level, with an animated transition.
-	*
-	* Triggers the following events: `movestart`, `move`, `moveend`, `zoomstart`, `zoom`, and `zoomend`.
-	*
-	* @param zoom - The zoom level to transition to.
-	* @param options - Options object
-	* @param eventData - Additional properties to be added to event objects of events triggered by this method.
-	* @example
-	* ```ts
-	* // Zoom to the zoom level 5 without an animated transition
-	* map.zoomTo(5);
-	* // Zoom to the zoom level 8 with an animated transition
-	* map.zoomTo(8, {
-	*   duration: 2000,
-	*   offset: [100, 50]
-	* });
-	* ```
-	*/
 	zoomTo(zoom, options, eventData) {
 		return this.easeTo(extend({ zoom }, options), eventData);
 	}
-	/**
-	* Incrementally increases the map's zoom level by 1, first snapping to the nearest `zoomSnap` increment.
-	*
-	* Triggers the following events: `movestart`, `move`, `moveend`, `zoomstart`, `zoom`, and `zoomend`.
-	*
-	* @param options - Options object
-	* @param eventData - Additional properties to be added to event objects of events triggered by this method.
-	* @example
-	* Zoom the map in one level with a custom animation duration
-	* ```ts
-	* map.zoomIn({duration: 1000});
-	* ```
-	*/
 	zoomIn(options, eventData) {
 		this.zoomTo(evaluateZoomSnap(this.getZoom() + 1, this._zoomSnap), options, eventData);
 		return this;
 	}
-	/**
-	* Decreases the map's zoom level by 1, first snapping to the nearest `zoomSnap` increment.
-	*
-	* Triggers the following events: `movestart`, `move`, `moveend`, `zoomstart`, `zoom`, and `zoomend`.
-	*
-	* @param options - Options object
-	* @param eventData - Additional properties to be added to event objects of events triggered by this method.
-	* @example
-	* Zoom the map out one level with a custom animation offset
-	* ```ts
-	* map.zoomOut({offset: [80, 60]});
-	* ```
-	*/
 	zoomOut(options, eventData) {
 		this.zoomTo(evaluateZoomSnap(this.getZoom() - 1, this._zoomSnap), options, eventData);
 		return this;
 	}
-	/**
-	* Returns the map's current vertical field of view, in degrees.
-	*
-	* @returns The map's current vertical field of view.
-	* @defaultValue 36.87
-	* @example
-	* ```ts
-	* const verticalFieldOfView = map.getVerticalFieldOfView();
-	* ```
-	*/
 	getVerticalFieldOfView() {
 		return this.transform.fov;
 	}
-	/**
-	* Sets the map's vertical field of view, in degrees.
-	*
-	* Triggers the following events: `movestart`, `move`, and `moveend`.
-	*
-	* @param fov - The vertical field of view to set, in degrees (0-180).
-	* @param eventData - Additional properties to be added to event objects of events triggered by this method.
-	* @defaultValue 36.87
-	* @example
-	* Change vertical field of view to 30 degrees
-	* ```ts
-	* map.setVerticalFieldOfView(30);
-	* ```
-	*/
 	setVerticalFieldOfView(fov, eventData) {
 		if (fov != this.transform.fov) {
 			this.transform.setFov(fov);
@@ -21055,113 +20850,34 @@ var Camera = class extends Evented {
 		}
 		return this;
 	}
-	/**
-	* Returns the map's current bearing. The bearing is the compass direction that is "up"; for example, a bearing
-	* of 90° orients the map so that east is up.
-	*
-	* @returns The map's current bearing.
-	* @see [Navigate the map with game-like controls](https://maplibre.org/maplibre-gl-js/docs/examples/navigate-the-map-with-game-like-controls/)
-	*/
 	getBearing() {
 		return this.transform.bearing;
 	}
-	/**
-	* Sets the map's zoom snap level.
-	*
-	* @param snap - The zoom snap level to set.
-	*/
 	setZoomSnap(snap) {
 		this._zoomSnap = snap;
 		return this;
 	}
-	/**
-	* Returns the map's current zoom snap level.
-	*
-	* @returns The map's current zoom snap level.
-	*/
 	getZoomSnap() {
 		return this._zoomSnap;
 	}
-	/**
-	* Sets the map's bearing (rotation). The bearing is the compass direction that is "up"; for example, a bearing
-	* of 90° orients the map so that east is up.
-	*
-	* Equivalent to `jumpTo({bearing: bearing})`.
-	*
-	* Triggers the following events: `movestart`, `moveend`, and `rotate`.
-	*
-	* @param bearing - The desired bearing.
-	* @param eventData - Additional properties to be added to event objects of events triggered by this method.
-	* @example
-	* Rotate the map to 90 degrees
-	* ```ts
-	* map.setBearing(90);
-	* ```
-	*/
 	setBearing(bearing, eventData) {
 		this.jumpTo({ bearing }, eventData);
 		return this;
 	}
-	/**
-	* Returns the current padding applied around the map viewport.
-	*
-	* @returns The current padding around the map viewport.
-	*/
 	getPadding() {
 		return this.transform.padding;
 	}
-	/**
-	* Sets the padding in pixels around the viewport.
-	*
-	* Equivalent to `jumpTo({padding: padding})`.
-	*
-	* Triggers the following events: `movestart` and `moveend`.
-	*
-	* @param padding - The desired padding.
-	* @param eventData - Additional properties to be added to event objects of events triggered by this method.
-	* @example
-	* Sets a left padding of 300px, and a top padding of 50px
-	* ```ts
-	* map.setPadding({ left: 300, top: 50 });
-	* ```
-	*/
 	setPadding(padding, eventData) {
 		this.jumpTo({ padding }, eventData);
 		return this;
 	}
-	/**
-	* Rotates the map to the specified bearing, with an animated transition. The bearing is the compass direction
-	* that is "up"; for example, a bearing of 90° orients the map so that east is up.
-	*
-	* Triggers the following events: `movestart`, `moveend`, and `rotate`.
-	*
-	* @param bearing - The desired bearing.
-	* @param options - Options object
-	* @param eventData - Additional properties to be added to event objects of events triggered by this method.
-	*/
 	rotateTo(bearing, options, eventData) {
 		return this.easeTo(extend({ bearing }, options), eventData);
 	}
-	/**
-	* Rotates the map so that north is up (0° bearing), with an animated transition.
-	*
-	* Triggers the following events: `movestart`, `moveend`, and `rotate`.
-	*
-	* @param options - Options object
-	* @param eventData - Additional properties to be added to event objects of events triggered by this method.
-	*/
 	resetNorth(options, eventData) {
 		this.rotateTo(0, extend({ duration: 1e3 }, options), eventData);
 		return this;
 	}
-	/**
-	* Rotates and pitches the map so that north is up (0° bearing) and pitch and roll are 0°, with an animated transition.
-	*
-	* Triggers the following events: `movestart`, `move`, `moveend`, `pitchstart`, `pitch`, `pitchend`, `rollstart`, `roll`, `rollend`, and `rotate`.
-	*
-	* @param options - Options object
-	* @param eventData - Additional properties to be added to event objects of events triggered by this method.
-	*/
 	resetNorthPitch(options, eventData) {
 		this.easeTo(extend({
 			bearing: 0,
@@ -21171,75 +20887,24 @@ var Camera = class extends Evented {
 		}, options), eventData);
 		return this;
 	}
-	/**
-	* Snaps the map so that north is up (0° bearing), if the current bearing is close enough to it (i.e. within the
-	* `bearingSnap` threshold).
-	*
-	* Triggers the following events: `movestart`, `moveend`, and `rotate`.
-	*
-	* @param options - Options object
-	* @param eventData - Additional properties to be added to event objects of events triggered by this method.
-	*/
 	snapToNorth(options, eventData) {
 		if (Math.abs(this.getBearing()) < this._bearingSnap) return this.resetNorth(options, eventData);
 		return this;
 	}
-	/**
-	* Returns the map's current pitch (tilt).
-	*
-	* @returns The map's current pitch, measured in degrees away from the plane of the screen.
-	*/
 	getPitch() {
 		return this.transform.pitch;
 	}
-	/**
-	* Sets the map's pitch (tilt). Equivalent to `jumpTo({pitch: pitch})`.
-	*
-	* Triggers the following events: `movestart`, `moveend`, `pitchstart`, and `pitchend`.
-	*
-	* @param pitch - The pitch to set, measured in degrees away from the plane of the screen (0-60).
-	* @param eventData - Additional properties to be added to event objects of events triggered by this method.
-	*/
 	setPitch(pitch, eventData) {
 		this.jumpTo({ pitch }, eventData);
 		return this;
 	}
-	/**
-	* Returns the map's current roll angle.
-	*
-	* @returns The map's current roll, measured in degrees about the camera boresight.
-	*/
 	getRoll() {
 		return this.transform.roll;
 	}
-	/**
-	* Sets the map's roll angle. Equivalent to `jumpTo({roll: roll})`.
-	*
-	* Triggers the following events: `movestart`, `moveend`, `rollstart`, and `rollend`.
-	*
-	* @param roll - The roll to set, measured in degrees about the camera boresight
-	* @param eventData - Additional properties to be added to event objects of events triggered by this method.
-	*/
 	setRoll(roll, eventData) {
 		this.jumpTo({ roll }, eventData);
 		return this;
 	}
-	/**
-	* @param bounds - Calculate the center for these bounds in the viewport and use
-	* the highest zoom level up to and including {@link Map.getMaxZoom} that fits
-	* in the viewport. LngLatBounds represent a box that is always axis-aligned with bearing 0.
-	* Bounds will be taken in `[sw, ne]` order. Southwest point will always be to the left of the northeast point.
-	* @param options - Options object
-	* @returns If map is able to fit to provided bounds, returns `center`, `zoom`, and `bearing`.
-	* If map is unable to fit, method will warn and return undefined.
-	* @example
-	* ```ts
-	* let bbox = [[-79, 43], [-73, 45]];
-	* let newCameraTransform = map.cameraForBounds(bbox, {
-	*   padding: {top: 10, bottom:25, left: 15, right: 5}
-	* });
-	* ```
-	*/
 	cameraForBounds(bounds, options) {
 		bounds = LngLatBounds.convert(bounds).adjustAntiMeridian();
 		const bearing = options?.bearing || 0;
@@ -21295,51 +20960,9 @@ var Camera = class extends Evented {
 		if (result && this._zoomSnap) result.zoom = evaluateZoomSnap(result.zoom, this._zoomSnap, -1);
 		return result;
 	}
-	/**
-	* Pans and zooms the map to contain its visible area within the specified geographical bounds.
-	* This function will also reset the map's bearing to 0 if bearing is nonzero.
-	*
-	* Triggers the following events: `movestart` and `moveend`.
-	*
-	* @param bounds - Center these bounds in the viewport and use the highest
-	* zoom level up to and including {@link Map.getMaxZoom} that fits them in the viewport.
-	* Bounds will be taken in `[sw, ne]` order. Southwest point will always be to the left of the northeast point.
-	* @param options - Options supports all properties from {@link AnimationOptions} and {@link CameraOptions} in addition to the fields below.
-	* @param eventData - Additional properties to be added to event objects of events triggered by this method.
-	* @example
-	* ```ts
-	* let bbox = [[-79, 43], [-73, 45]];
-	* map.fitBounds(bbox, {
-	*   padding: {top: 10, bottom:25, left: 15, right: 5}
-	* });
-	* ```
-	* @see [Fit a map to a bounding box](https://maplibre.org/maplibre-gl-js/docs/examples/fit-a-map-to-a-bounding-box/)
-	*/
 	fitBounds(bounds, options, eventData) {
 		return this._fitInternal(this.cameraForBounds(bounds, options), options, eventData);
 	}
-	/**
-	* Pans, rotates and zooms the map to to fit the box made by points p0 and p1
-	* once the map is rotated to the specified bearing. To zoom without rotating,
-	* pass in the current map bearing.
-	*
-	* Triggers the following events: `movestart`, `move`, `moveend`, `zoomstart`, `zoom`, `zoomend` and `rotate`.
-	*
-	* @param p0 - First point on screen, in pixel coordinates
-	* @param p1 - Second point on screen, in pixel coordinates
-	* @param bearing - Desired map bearing at end of animation, in degrees
-	* @param options - Options object
-	* @param eventData - Additional properties to be added to event objects of events triggered by this method.
-	* @example
-	* ```ts
-	* let p0 = [220, 400];
-	* let p1 = [500, 900];
-	* map.fitScreenCoordinates(p0, p1, map.getBearing(), {
-	*   padding: {top: 10, bottom:25, left: 15, right: 5}
-	* });
-	* ```
-	* @see Used by {@link BoxZoomHandler}
-	*/
 	fitScreenCoordinates(p0, p1, bearing, options, eventData) {
 		return this._fitInternal(this._cameraForBoxAndBearing(this.transform.screenPointToLocation(Point.convert(p0)), this.transform.screenPointToLocation(Point.convert(p1)), bearing, options), options, eventData);
 	}
@@ -21349,35 +20972,10 @@ var Camera = class extends Evented {
 		delete options.padding;
 		return options.linear ? this.easeTo(options, eventData) : this.flyTo(options, eventData);
 	}
-	/**
-	* Changes any combination of center, zoom, bearing, pitch, and roll, without
-	* an animated transition. The map will retain its current values for any
-	* details not specified in `options`.
-	*
-	* Triggers the following events: `movestart`, `move`, `moveend`, `zoomstart`, `zoom`, `zoomend`, `pitchstart`,
-	* `pitch`, `pitchend`, `rollstart`, `roll`, `rollend` and `rotate`.
-	*
-	* @param options - Options object
-	* @param eventData - Additional properties to be added to event objects of events triggered by this method.
-	* @example
-	* ```ts
-	* // jump to coordinates at current zoom
-	* map.jumpTo({center: [0, 0]});
-	* // jump with zoom, pitch, and bearing options
-	* map.jumpTo({
-	*   center: [0, 0],
-	*   zoom: 8,
-	*   pitch: 45,
-	*   bearing: 90
-	* });
-	* ```
-	* @see [Jump to a series of locations](https://maplibre.org/maplibre-gl-js/docs/examples/jump-to-a-series-of-locations/)
-	* @see [Update a feature in realtime](https://maplibre.org/maplibre-gl-js/docs/examples/update-a-feature-in-realtime/)
-	*/
 	jumpTo(options, eventData) {
 		this.stop();
 		if ("zoom" in options && this._zoomSnap) options.zoom = evaluateZoomSnap(options.zoom, this._zoomSnap);
-		const tr = this._getTransformForUpdate();
+		const tr = this.getTransformForUpdate();
 		let bearingChanged = false, pitchChanged = false;
 		let rollChanged = false;
 		const oldZoom = tr.zoom;
@@ -21398,7 +20996,7 @@ var Camera = class extends Evented {
 			tr.setRoll(+options.roll);
 		}
 		if (options.padding != null && !tr.isPaddingEqual(options.padding)) tr.setPadding(options.padding);
-		this._applyUpdatedTransform(tr);
+		this.applyUpdatedTransform(tr);
 		this.fire(new MapMovementEvent("movestart", eventData)).fire(new MapMovementEvent("move", eventData));
 		if (zoomChanged) this.fire(new MapMovementEvent("zoomstart", eventData)).fire(new MapMovementEvent("zoom", eventData)).fire(new MapMovementEvent("zoomend", eventData));
 		if (bearingChanged) this.fire(new MapMovementEvent("rotatestart", eventData)).fire(new MapMovementEvent("rotate", eventData)).fire(new MapMovementEvent("rotateend", eventData));
@@ -21406,25 +21004,6 @@ var Camera = class extends Evented {
 		if (rollChanged) this.fire(new MapMovementEvent("rollstart", eventData)).fire(new MapMovementEvent("roll", eventData)).fire(new MapMovementEvent("rollend", eventData));
 		return this.fire(new MapMovementEvent("moveend", eventData));
 	}
-	/**
-	* Given a camera 'from' position and a position to look at (`to`), calculates zoom and camera rotation and returns them as {@link CameraOptions}.
-	* @param from - The camera to look from
-	* @param altitudeFrom - The altitude of the camera to look from
-	* @param to - The center to look at
-	* @param altitudeTo - Optional altitude of the center to look at. If none given the ground height will be used.
-	* @returns the calculated camera options
-	* @example
-	* ```ts
-	* // Calculate options to look from (1°, 0°, 1000m) to (1°, 1°, 0m)
-	* const cameraLngLat = new LngLat(1, 0);
-	* const cameraAltitude = 1000;
-	* const targetLngLat = new LngLat(1, 1);
-	* const targetAltitude = 0;
-	* const cameraOptions = map.calculateCameraOptionsFromTo(cameraLngLat, cameraAltitude, targetLngLat, targetAltitude);
-	* // Apply calculated options
-	* map.jumpTo(cameraOptions);
-	* ```
-	*/
 	calculateCameraOptionsFromTo(from, altitudeFrom, to, altitudeTo = 0) {
 		const fromMercator = MercatorCoordinate.fromLngLat(from, altitudeFrom);
 		const toMercator = MercatorCoordinate.fromLngLat(to, altitudeTo);
@@ -21446,27 +21025,6 @@ var Camera = class extends Evented {
 			bearing
 		};
 	}
-	/**
-	* Given a camera position and rotation, calculates zoom and center point and returns them as {@link CameraOptions}.
-	* @param cameraLngLat - The lng, lat of the camera to look from
-	* @param cameraAlt - The altitude of the camera to look from, in meters above sea level
-	* @param bearing - Bearing of the camera, in degrees
-	* @param pitch - Pitch of the camera, in degrees
-	* @param roll - Roll of the camera, in degrees
-	* @returns the calculated camera options
-	* @example
-	* ```ts
-	* // Calculate options to look from camera position(1°, 0°, 1000m) with bearing = 90°, pitch = 30°, and roll = 45°
-	* const cameraLngLat = new LngLat(1, 0);
-	* const cameraAltitude = 1000;
-	* const bearing = 90;
-	* const pitch = 30;
-	* const roll = 45;
-	* const cameraOptions = map.calculateCameraOptionsFromCameraLngLatAltRotation(cameraLngLat, cameraAltitude, bearing, pitch, roll);
-	* // Apply calculated options
-	* map.jumpTo(cameraOptions);
-	* ```
-	*/
 	calculateCameraOptionsFromCameraLngLatAltRotation(cameraLngLat, cameraAlt, bearing, pitch, roll) {
 		const centerInfo = this.transform.calculateCenterFromCameraLngLatAlt(cameraLngLat, cameraAlt, bearing, pitch);
 		return {
@@ -21478,24 +21036,6 @@ var Camera = class extends Evented {
 			roll
 		};
 	}
-	/**
-	* Changes any combination of `center`, `zoom`, `bearing`, `pitch`, `roll`, and `padding` with an animated transition
-	* between old and new values. The map will retain its current values for any
-	* details not specified in `options`.
-	*
-	* !!! note "Reduced Motion"
-	*     The transition will happen instantly if the user has enabled
-	*     the `reduced motion` accessibility feature enabled in their operating system,
-	*     unless `options` includes `essential: true`.
-	*
-	* Triggers the following events: `movestart`, `move`, `moveend`, `zoomstart`, `zoom`, `zoomend`, `pitchstart`,
-	* `pitch`, `pitchend`, `rollstart`, `roll`, `rollend`, and `rotate`.
-	*
-	* @param options - Options describing the destination and animation of the transition.
-	* Accepts {@link CameraOptions} and {@link AnimationOptions}.
-	* @param eventData - Additional properties to be added to event objects of events triggered by this method.
-	* @see [Navigate the map with game-like controls](https://maplibre.org/maplibre-gl-js/docs/examples/navigate-the-map-with-game-like-controls/)
-	*/
 	easeTo(options, eventData) {
 		this._stop(false, options.easeId);
 		options = extend({
@@ -21505,7 +21045,7 @@ var Camera = class extends Evented {
 		}, options);
 		if ("zoom" in options && this._zoomSnap) options.zoom = evaluateZoomSnap(options.zoom, this._zoomSnap);
 		if (options.animate === false || !options.essential && browser.prefersReducedMotion) options.duration = 0;
-		const tr = this._getTransformForUpdate();
+		const tr = this.getTransformForUpdate();
 		const startBearing = this.getBearing(), startPitch = tr.pitch, startRoll = tr.roll, bearing = "bearing" in options ? this._normalizeBearing(options.bearing, startBearing) : startBearing, pitch = "pitch" in options ? +options.pitch : startPitch, roll = "roll" in options ? this._normalizeBearing(options.roll, startRoll) : startRoll, padding = "padding" in options ? options.padding : tr.padding;
 		const offsetAsPoint = Point.convert(options.offset);
 		let around, aroundPoint;
@@ -21543,7 +21083,7 @@ var Camera = class extends Evented {
 		this._ease((k) => {
 			easeHandler.easeFunc(k);
 			if (this.terrain && !options.freezeElevation) this._updateElevation(k);
-			this._applyUpdatedTransform(tr);
+			this.applyUpdatedTransform(tr);
 			this._fireMoveEvents(eventData);
 		}, (interruptingEaseId) => {
 			if (this.terrain && options.freezeElevation) this._finalizeElevation();
@@ -21563,7 +21103,7 @@ var Camera = class extends Evented {
 		this._elevationCenter = center;
 		this._elevationStart = this.transform.elevation;
 		this._elevationTarget = this.terrain.getElevationForLngLatZoom(center, this.transform.tileZoom);
-		this._elevationFreeze = true;
+		this.elevationFreeze = true;
 	}
 	_updateElevation(k) {
 		if (this._elevationStart === void 0 || this._elevationCenter === void 0) this._prepareElevation(this.transform.center);
@@ -21578,7 +21118,7 @@ var Camera = class extends Evented {
 		this.transform.setElevation(interpolateFactory.number(this._elevationStart, this._elevationTarget, k));
 	}
 	_finalizeElevation() {
-		this._elevationFreeze = false;
+		this.elevationFreeze = false;
 		if (this.getCenterClampedToGround()) this.transform.recalculateZoomAndCenter(this.terrain);
 	}
 	/**
@@ -21590,7 +21130,7 @@ var Camera = class extends Evented {
 	* It may differ from the state used for rendering (`this.transform`).
 	* @returns Transform to apply changes to
 	*/
-	_getTransformForUpdate() {
+	getTransformForUpdate() {
 		if (!this.transformCameraUpdate && !this.terrain) return this.transform;
 		this._requestedCameraState ||= this.transform.clone();
 		return this._requestedCameraState;
@@ -21627,7 +21167,7 @@ var Camera = class extends Evented {
 	* If the camera is inside terrain, it gets elevated.
 	* Call `transformCameraUpdate` if present, and then apply the "approved" changes.
 	*/
-	_applyUpdatedTransform(tr) {
+	applyUpdatedTransform(tr) {
 		const modifiers = [];
 		modifiers.push((tr) => this._elevateCameraIfInsideTerrain(tr));
 		if (this.transformCameraUpdate) modifiers.push((tr) => this.transformCameraUpdate(tr));
@@ -21672,42 +21212,6 @@ var Camera = class extends Evented {
 		if (wasRolling) this.fire(new MapMovementEvent("rollend", eventData));
 		this.fire(new MapMovementEvent("moveend", eventData));
 	}
-	/**
-	* Changes any combination of center, zoom, bearing, pitch, and roll, animating the transition along a curve that
-	* evokes flight. The animation seamlessly incorporates zooming and panning to help
-	* the user maintain her bearings even after traversing a great distance.
-	*
-	* !!! note "Reduced Motion"
-	*     The animation will be skipped, and this will behave equivalently to `jumpTo`
-	*     if the user has the `reduced motion` accessibility feature enabled in their operating system,
-	*     unless 'options' includes `essential: true`.
-	*
-	* Triggers the following events: `movestart`, `move`, `moveend`, `zoomstart`, `zoom`, `zoomend`, `pitchstart`,
-	* `pitch`, `pitchend`, `rollstart`, `roll`, `rollend`, and `rotate`.
-	*
-	* @param options - Options describing the destination and animation of the transition.
-	* Accepts {@link CameraOptions}, {@link AnimationOptions},
-	* and the following additional options.
-	* @param eventData - Additional properties to be added to event objects of events triggered by this method.
-	* @example
-	* ```ts
-	* // fly with default options to null island
-	* map.flyTo({center: [0, 0], zoom: 9});
-	* // using flyTo options
-	* map.flyTo({
-	*   center: [0, 0],
-	*   zoom: 9,
-	*   speed: 0.2,
-	*   curve: 1,
-	*   easing(t) {
-	*     return t;
-	*   }
-	* });
-	* ```
-	* @see [Fly to a location](https://maplibre.org/maplibre-gl-js/docs/examples/fly-to-a-location/)
-	* @see [Slowly fly to a location](https://maplibre.org/maplibre-gl-js/docs/examples/slowly-fly-to-a-location/)
-	* @see [Fly to a location based on scroll position](https://maplibre.org/maplibre-gl-js/docs/examples/fly-to-a-location-based-on-scroll-position/)
-	*/
 	flyTo(options, eventData) {
 		if (!options.essential && browser.prefersReducedMotion) {
 			const coercedOptions = pick(options, [
@@ -21729,7 +21233,7 @@ var Camera = class extends Evented {
 			easing: defaultEasing
 		}, options);
 		if ("zoom" in options && this._zoomSnap) options.zoom = evaluateZoomSnap(options.zoom, this._zoomSnap);
-		const tr = this._getTransformForUpdate(), startBearing = tr.bearing, startPitch = tr.pitch, startRoll = tr.roll, startPadding = tr.padding;
+		const tr = this.getTransformForUpdate(), startBearing = tr.bearing, startPitch = tr.pitch, startRoll = tr.roll, startPadding = tr.padding;
 		const bearing = "bearing" in options ? this._normalizeBearing(options.bearing, startBearing) : startBearing;
 		const pitch = "pitch" in options ? +options.pitch : startPitch;
 		const roll = "roll" in options ? this._normalizeBearing(options.roll, startRoll) : startRoll;
@@ -21752,10 +21256,8 @@ var Camera = class extends Evented {
 		const w0 = Math.max(tr.width, tr.height);
 		const w1 = w0 / flyToHandler.scaleOfZoom;
 		const u1 = flyToHandler.pixelPathLength;
-		if (typeof flyToHandler.scaleOfMinZoom === "number") {
-			const wMax = w0 / flyToHandler.scaleOfMinZoom;
-			rho = Math.sqrt(wMax / u1 * 2);
-		}
+		const wMax = w0 / flyToHandler.scaleOfMinZoom;
+		rho = Math.min(rho, Math.sqrt(wMax / u1 * 2));
 		const rho2 = rho * rho;
 		/**
 		* rᵢ: Returns the zoom-out factor at one end of the animation.
@@ -21816,7 +21318,7 @@ var Camera = class extends Evented {
 			}
 			flyToHandler.easeFunc(k, scale, centerFactor, pointAtOffset);
 			if (this.terrain && !options.freezeElevation) this._updateElevation(k);
-			this._applyUpdatedTransform(tr);
+			this.applyUpdatedTransform(tr);
 			this._fireMoveEvents(eventData);
 		}, () => {
 			if (this.terrain && options.freezeElevation) this._finalizeElevation();
@@ -21827,11 +21329,8 @@ var Camera = class extends Evented {
 	isEasing() {
 		return !!this._easeFrameId;
 	}
-	/**
-	* Stops any animated transition underway.
-	*/
-	stop() {
-		return this._stop();
+	stop(allowGestures) {
+		return this._stop(allowGestures);
 	}
 	_stop(allowGestures, easeId) {
 		if (this._easeFrameId) {
@@ -21844,7 +21343,7 @@ var Camera = class extends Evented {
 			delete this._onEaseEnd;
 			onEaseEnd.call(this, easeId);
 		}
-		if (!allowGestures) this.handlers?.stop(false);
+		if (!allowGestures) this._stopHandlers();
 		return this;
 	}
 	_ease(frame, finish, options) {
@@ -21866,17 +21365,14 @@ var Camera = class extends Evented {
 		if (Math.abs(bearing + 360 - currentBearing) < diff) bearing += 360;
 		return bearing;
 	}
-	/**
-	* Gets the elevation at a given location, in meters above sea level.
-	* Returns null if terrain is not enabled.
-	* If terrain is enabled with some exaggeration value, the value returned here will be reflective of (multiplied by) that exaggeration value.
-	* This method should be used for proper positioning of custom 3d objects, as explained [here](https://maplibre.org/maplibre-gl-js/docs/examples/adding-3d-models-using-threejs-on-terrain/)
-	* @param lngLatLike - `[x, y]` or LngLat coordinates of the location
-	* @returns elevation in meters
-	*/
-	queryTerrainElevation(lngLatLike) {
-		if (!this.terrain) return null;
-		return this.terrain.getElevationForLngLat(LngLat.convert(lngLatLike), this.transform);
+	isMoving() {
+		return this._moving;
+	}
+	isZooming() {
+		return this._zooming;
+	}
+	isRotating() {
+		return this._rotating;
 	}
 };
 //#endregion
@@ -23033,7 +22529,7 @@ const defaultOptions$4 = {
 * ```
 * @see [Display a map](https://maplibre.org/maplibre-gl-js/docs/examples/display-a-map/)
 */
-var Map$1 = class extends Camera {
+var Map$1 = class extends Evented {
 	/**
 	* @internal
 	* The window that owns the map container element, for cross-window support.
@@ -23043,30 +22539,7 @@ var Map$1 = class extends Camera {
 		return this._container?.ownerDocument?.defaultView || window;
 	}
 	constructor(options) {
-		const resolvedOptions = {
-			...defaultOptions$4,
-			...options,
-			canvasContextAttributes: {
-				...defaultOptions$4.canvasContextAttributes,
-				...options.canvasContextAttributes
-			}
-		};
-		if (resolvedOptions.minZoom != null && resolvedOptions.maxZoom != null && resolvedOptions.minZoom > resolvedOptions.maxZoom) throw new Error("maxZoom must be greater than or equal to minZoom");
-		if (resolvedOptions.minPitch != null && resolvedOptions.maxPitch != null && resolvedOptions.minPitch > resolvedOptions.maxPitch) throw new Error("maxPitch must be greater than or equal to minPitch");
-		if (resolvedOptions.minPitch != null && resolvedOptions.minPitch < defaultMinPitch) throw new Error(`minPitch must be greater than or equal to ${defaultMinPitch}`);
-		if (resolvedOptions.maxPitch != null && resolvedOptions.maxPitch > maxPitchThreshold) throw new Error(`maxPitch must be less than or equal to ${maxPitchThreshold}`);
-		const transform = new MercatorTransform();
-		const cameraHelper = new MercatorCameraHelper();
-		if (resolvedOptions.minZoom !== void 0) transform.setMinZoom(resolvedOptions.minZoom);
-		if (resolvedOptions.maxZoom !== void 0) transform.setMaxZoom(resolvedOptions.maxZoom);
-		if (resolvedOptions.minPitch !== void 0) transform.setMinPitch(resolvedOptions.minPitch);
-		if (resolvedOptions.maxPitch !== void 0) transform.setMaxPitch(resolvedOptions.maxPitch);
-		if (resolvedOptions.renderWorldCopies !== void 0) transform.setRenderWorldCopies(resolvedOptions.renderWorldCopies);
-		if (resolvedOptions.transformConstrain !== null) transform.setConstrainOverride(resolvedOptions.transformConstrain);
-		super(transform, cameraHelper, {
-			bearingSnap: resolvedOptions.bearingSnap,
-			zoomSnap: resolvedOptions.zoomSnap
-		});
+		super();
 		this._idleTriggered = false;
 		this._crossFadingFactor = 1;
 		this._renderTaskQueue = new TaskQueue();
@@ -23119,14 +22592,40 @@ var Map$1 = class extends Camera {
 		this._onWindowOnline = () => {
 			this._update();
 		};
+		const resolvedOptions = {
+			...defaultOptions$4,
+			...options,
+			canvasContextAttributes: {
+				...defaultOptions$4.canvasContextAttributes,
+				...options.canvasContextAttributes
+			}
+		};
+		if (resolvedOptions.minZoom != null && resolvedOptions.maxZoom != null && resolvedOptions.minZoom > resolvedOptions.maxZoom) throw new Error("maxZoom must be greater than or equal to minZoom");
+		if (resolvedOptions.minPitch != null && resolvedOptions.maxPitch != null && resolvedOptions.minPitch > resolvedOptions.maxPitch) throw new Error("maxPitch must be greater than or equal to minPitch");
+		if (resolvedOptions.minPitch != null && resolvedOptions.minPitch < defaultMinPitch) throw new Error(`minPitch must be greater than or equal to ${defaultMinPitch}`);
+		if (resolvedOptions.maxPitch != null && resolvedOptions.maxPitch > maxPitchThreshold) throw new Error(`maxPitch must be less than or equal to ${maxPitchThreshold}`);
+		this._camera = new Camera({
+			minZoom: resolvedOptions.minZoom,
+			maxZoom: resolvedOptions.maxZoom,
+			minPitch: resolvedOptions.minPitch,
+			maxPitch: resolvedOptions.maxPitch,
+			bearingSnap: resolvedOptions.bearingSnap,
+			zoomSnap: resolvedOptions.zoomSnap,
+			renderWorldCopies: resolvedOptions.renderWorldCopies,
+			centerClampedToGround: resolvedOptions.centerClampedToGround,
+			terrain: this.terrain,
+			transformConstrain: resolvedOptions.transformConstrain,
+			requestRenderFrame: (callback) => this._requestRenderFrame(callback),
+			cancelRenderFrame: (id) => this._cancelRenderFrame(id),
+			transformCameraUpdate: resolvedOptions.transformCameraUpdate,
+			stopHandlers: () => this._handlers?.stop(false)
+		});
+		this._camera.setEventedParent(this);
 		this._interactive = resolvedOptions.interactive;
 		this._maxTileCacheSize = resolvedOptions.maxTileCacheSize;
 		this._maxTileCacheZoomLevels = resolvedOptions.maxTileCacheZoomLevels;
 		this._canvasContextAttributes = { ...resolvedOptions.canvasContextAttributes };
 		this._trackResize = resolvedOptions.trackResize === true;
-		this._bearingSnap = resolvedOptions.bearingSnap;
-		this._zoomSnap = resolvedOptions.zoomSnap;
-		this._centerClampedToGround = resolvedOptions.centerClampedToGround;
 		this._terrainSkirtLength = resolvedOptions.terrainSkirtLength;
 		this._refreshExpiredTiles = resolvedOptions.refreshExpiredTiles === true;
 		this._fadeDuration = resolvedOptions.fadeDuration;
@@ -23140,8 +22639,6 @@ var Map$1 = class extends Camera {
 		this._overridePixelRatio = resolvedOptions.pixelRatio;
 		this._maxCanvasSize = resolvedOptions.maxCanvasSize;
 		this._zoomLevelsToOverscale = resolvedOptions.zoomLevelsToOverscale;
-		this.transformCameraUpdate = resolvedOptions.transformCameraUpdate;
-		this.transformConstrain = resolvedOptions.transformConstrain;
 		this.cancelPendingTileRequestsWhileZooming = resolvedOptions.cancelPendingTileRequestsWhileZooming === true;
 		this.setAnisotropicFilterPitch(resolvedOptions.anisotropicFilterPitch);
 		if (resolvedOptions.reduceMotion !== void 0) browser.prefersReducedMotion = resolvedOptions.reduceMotion;
@@ -23160,11 +22657,11 @@ var Map$1 = class extends Camera {
 			this._update(true);
 		});
 		this.once("idle", () => this._idleTriggered = true);
+		this._handlers = new HandlerManager(this, this._camera, resolvedOptions);
 		if (typeof window !== "undefined") {
 			this._ownerWindow.addEventListener("online", this._onWindowOnline, false);
 			this._setupResizeObserver();
 		}
-		this.handlers = new HandlerManager(this, resolvedOptions);
 		const hashName = typeof resolvedOptions.hash === "string" && resolvedOptions.hash || void 0;
 		this._hash = resolvedOptions.hash ? new Hash(hashName).addTo(this) : void 0;
 		if (!this._hash?._onHashChange()) {
@@ -23190,7 +22687,7 @@ var Map$1 = class extends Camera {
 		if (resolvedOptions.maplibreLogo) this.addControl(new LogoControl(), resolvedOptions.logoPosition);
 		this.on("style.load", () => {
 			if (!shouldConstrainUsingMercatorTransform) this._resizeTransform();
-			if (this.transform.unmodified) {
+			if (this._camera.transform.unmodified) {
 				const coercedOptions = pick(this.style.stylesheet, [
 					"center",
 					"zoom",
@@ -23222,109 +22719,727 @@ var Map$1 = class extends Camera {
 		return this._mapId;
 	}
 	/**
-	* Sets a global state property that can be retrieved with the [`global-state` expression](https://maplibre.org/maplibre-style-spec/expressions/#global-state).
-	* If the value is null, it resets the property to its default value defined in the [`state` style property](https://maplibre.org/maplibre-style-spec/root/#state).
-	*
-	* @param propertyName - The name of the state property to set.
-	* @param value - The value of the state property to set.
+	* Sets a global state property that can be retrieved with the [`global-state` expression](https://maplibre.org/maplibre-style-spec/expressions/#global-state).
+	* If the value is null, it resets the property to its default value defined in the [`state` style property](https://maplibre.org/maplibre-style-spec/root/#state).
+	*
+	* @param propertyName - The name of the state property to set.
+	* @param value - The value of the state property to set.
+	*/
+	setGlobalStateProperty(propertyName, value) {
+		this.style.setGlobalStateProperty(propertyName, value);
+		return this._update(true);
+	}
+	/**
+	* Returns the global map state
+	*
+	* @returns The map state object.
+	*/
+	getGlobalState() {
+		return this.style.getGlobalState();
+	}
+	/**
+	* Adds an {@link IControl} to the map, calling `control.onAdd(this)`.
+	*
+	* An {@link ErrorEvent} will be fired if the control is invalid.
+	*
+	* @param control - The {@link IControl} to add.
+	* @param position - position on the map to which the control will be added.
+	* Valid values are `'top-left'`, `'top-right'`, `'bottom-left'`, and `'bottom-right'`. Defaults to `'top-right'`.
+	* @example
+	* Add zoom and rotation controls to the map.
+	* ```ts
+	* map.addControl(new NavigationControl());
+	* ```
+	* @see [Display map navigation controls](https://maplibre.org/maplibre-gl-js/docs/examples/display-map-navigation-controls/)
+	*/
+	addControl(control, position) {
+		if (position === void 0) if (control.getDefaultPosition) position = control.getDefaultPosition();
+		else position = "top-right";
+		if (!control?.onAdd) return this.fire(new ErrorEvent(/* @__PURE__ */ new Error("Invalid argument to map.addControl(). Argument must be a control with onAdd and onRemove methods.")));
+		const controlElement = control.onAdd(this);
+		this._controls.push(control);
+		const positionContainer = this._controlPositions[position];
+		if (position.includes("bottom")) positionContainer.insertBefore(controlElement, positionContainer.firstChild);
+		else positionContainer.appendChild(controlElement);
+		return this;
+	}
+	/**
+	* Removes the control from the map.
+	*
+	* An {@link ErrorEvent} will be fired if the control is invalid.
+	*
+	* @param control - The {@link IControl} to remove.
+	* @example
+	* ```ts
+	* // Define a new navigation control.
+	* let navigation = new NavigationControl();
+	* // Add zoom and rotation controls to the map.
+	* map.addControl(navigation);
+	* // Remove zoom and rotation controls from the map.
+	* map.removeControl(navigation);
+	* ```
+	*/
+	removeControl(control) {
+		if (!control?.onRemove) return this.fire(new ErrorEvent(/* @__PURE__ */ new Error("Invalid argument to map.removeControl(). Argument must be a control with onAdd and onRemove methods.")));
+		const ci = this._controls.indexOf(control);
+		if (ci > -1) this._controls.splice(ci, 1);
+		control.onRemove(this);
+		return this;
+	}
+	/**
+	* Checks if a control exists on the map.
+	*
+	* @param control - The {@link IControl} to check.
+	* @returns true if map contains control.
+	* @example
+	* ```ts
+	* // Define a new navigation control.
+	* let navigation = new NavigationControl();
+	* // Add zoom and rotation controls to the map.
+	* map.addControl(navigation);
+	* // Check that the navigation control exists on the map.
+	* map.hasControl(navigation);
+	* ```
+	*/
+	hasControl(control) {
+		return this._controls.includes(control);
+	}
+	/**
+	* Returns an array of `OverscaledTileID` objects that cover the current viewport for a given tile size.
+	* This method is useful for determining which tiles are visible in the current viewport.
+	*
+	* @param options - Options for calculating the covering tiles.
+	* @returns An array of `OverscaledTileID` objects.
+	* @example
+	* ```ts
+	* // Get the tiles to cover the view for a 512x512px tile source
+	* const tiles = map.coveringTiles({tileSize: 512});
+	* ```
+	*/
+	coveringTiles(options) {
+		return coveringTiles(this._camera.transform, options);
+	}
+	/**
+	* Sets the callback used to defer camera updates or apply arbitrary constraints.
+	* If specified, this Camera instance can be used as a stateless component in React etc.
+	*/
+	setTransformCameraUpdate(value) {
+		this._camera.transformCameraUpdate = value;
+	}
+	/**
+	* Returns the map's geographical centerpoint.
+	*
+	* @returns The map's geographical centerpoint.
+	* @example
+	* Return a LngLat object such as `{lng: 0, lat: 0}`
+	* ```ts
+	* let center = map.getCenter();
+	* // access longitude and latitude values directly
+	* let {lng, lat} = map.getCenter();
+	* ```
+	*/
+	getCenter() {
+		return new LngLat(this._camera.transform.center.lng, this._camera.transform.center.lat);
+	}
+	/**
+	* Sets the map's geographical centerpoint. Equivalent to `jumpTo({center: center})`.
+	*
+	* Triggers the following events: `movestart` and `moveend`.
+	*
+	* @param center - The centerpoint to set.
+	* @param eventData - Additional properties to be added to event objects of events triggered by this method.
+	* @example
+	* ```ts
+	* map.setCenter([-74, 38]);
+	* ```
+	*/
+	setCenter(center, eventData) {
+		this._camera.setCenter(center, eventData);
+		return this;
+	}
+	/**
+	* Returns the elevation of the map's center point.
+	*
+	* @returns The elevation of the map's center point, in meters above sea level.
+	*/
+	getCenterElevation() {
+		return this._camera.transform.elevation;
+	}
+	/**
+	* Sets the elevation of the map's center point, in meters above sea level. Equivalent to `jumpTo({elevation: elevation})`.
+	*
+	* Triggers the following events: `movestart` and `moveend`.
+	*
+	* @param elevation - The elevation to set, in meters above sea level.
+	* @param eventData - Additional properties to be added to event objects of events triggered by this method.
+	*/
+	setCenterElevation(elevation, eventData) {
+		this._camera.setCenterElevation(elevation, eventData);
+		return this;
+	}
+	/**
+	* Sets the value of `centerClampedToGround`.
+	*
+	* If true, the elevation of the center point will automatically be set to the terrain elevation
+	* (or zero if terrain is not enabled). If false, the elevation of the center point will default
+	* to sea level and will not automatically update. Defaults to true. Needs to be set to false to
+	* keep the camera above ground when pitch \> 90 degrees.
+	*/
+	setCenterClampedToGround(centerClampedToGround) {
+		this._camera.setCenterClampedToGround(centerClampedToGround);
+	}
+	/**
+	* Pans the map by the specified offset.
+	*
+	* Triggers the following events: `movestart` and `moveend`.
+	*
+	* @param offset - `x` and `y` coordinates by which to pan the map.
+	* @param options - Options object
+	* @param eventData - Additional properties to be added to event objects of events triggered by this method.
+	* @see [Navigate the map with game-like controls](https://maplibre.org/maplibre-gl-js/docs/examples/navigate-the-map-with-game-like-controls/)
+	*/
+	panBy(offset, options, eventData) {
+		this._camera.panBy(offset, options, eventData);
+		return this;
+	}
+	/**
+	* Pans the map to the specified location with an animated transition.
+	*
+	* Triggers the following events: `movestart` and `moveend`.
+	*
+	* @param lnglat - The location to pan the map to.
+	* @param options - Options describing the destination and animation of the transition.
+	* @param eventData - Additional properties to be added to event objects of events triggered by this method.
+	* @example
+	* ```ts
+	* map.panTo([-74, 38]);
+	* // Specify that the panTo animation should last 5000 milliseconds.
+	* map.panTo([-74, 38], {duration: 5000});
+	* ```
+	* @see [Update a feature in realtime](https://maplibre.org/maplibre-gl-js/docs/examples/update-a-feature-in-realtime/)
+	*/
+	panTo(lnglat, options, eventData) {
+		this._camera.panTo(lnglat, options, eventData);
+		return this;
+	}
+	/**
+	* Returns the map's current zoom level.
+	*
+	* @returns The map's current zoom level.
+	* @example
+	* ```ts
+	* map.getZoom();
+	* ```
+	*/
+	getZoom() {
+		return this._camera.transform.zoom;
+	}
+	/**
+	* Sets the map's zoom level. Equivalent to `jumpTo({zoom: zoom})`.
+	*
+	* Triggers the following events: `movestart`, `move`, `moveend`, `zoomstart`, `zoom`, and `zoomend`.
+	*
+	* @param zoom - The zoom level to set (0-20).
+	* @param eventData - Additional properties to be added to event objects of events triggered by this method.
+	* @example
+	* Zoom to the zoom level 5 without an animated transition
+	* ```ts
+	* map.setZoom(5);
+	* ```
+	*/
+	setZoom(zoom, eventData) {
+		this._camera.setZoom(zoom, eventData);
+		return this;
+	}
+	/**
+	* Zooms the map to the specified zoom level, with an animated transition.
+	*
+	* Triggers the following events: `movestart`, `move`, `moveend`, `zoomstart`, `zoom`, and `zoomend`.
+	*
+	* @param zoom - The zoom level to transition to.
+	* @param options - Options object
+	* @param eventData - Additional properties to be added to event objects of events triggered by this method.
+	* @example
+	* ```ts
+	* // Zoom to the zoom level 5 without an animated transition
+	* map.zoomTo(5);
+	* // Zoom to the zoom level 8 with an animated transition
+	* map.zoomTo(8, {
+	*   duration: 2000,
+	*   offset: [100, 50]
+	* });
+	* ```
+	*/
+	zoomTo(zoom, options, eventData) {
+		this._camera.zoomTo(zoom, options, eventData);
+		return this;
+	}
+	/**
+	* Incrementally increases the map's zoom level by 1, first snapping to the nearest `zoomSnap` increment.
+	*
+	* Triggers the following events: `movestart`, `move`, `moveend`, `zoomstart`, `zoom`, and `zoomend`.
+	*
+	* @param options - Options object
+	* @param eventData - Additional properties to be added to event objects of events triggered by this method.
+	* @example
+	* Zoom the map in one level with a custom animation duration
+	* ```ts
+	* map.zoomIn({duration: 1000});
+	* ```
+	*/
+	zoomIn(options, eventData) {
+		this._camera.zoomIn(options, eventData);
+		return this;
+	}
+	/**
+	* Decreases the map's zoom level by 1, first snapping to the nearest `zoomSnap` increment.
+	*
+	* Triggers the following events: `movestart`, `move`, `moveend`, `zoomstart`, `zoom`, and `zoomend`.
+	*
+	* @param options - Options object
+	* @param eventData - Additional properties to be added to event objects of events triggered by this method.
+	* @example
+	* Zoom the map out one level with a custom animation offset
+	* ```ts
+	* map.zoomOut({offset: [80, 60]});
+	* ```
+	*/
+	zoomOut(options, eventData) {
+		this._camera.zoomOut(options, eventData);
+		return this;
+	}
+	/**
+	* Returns the map's current vertical field of view, in degrees.
+	*
+	* @returns The map's current vertical field of view.
+	* @defaultValue 36.87
+	* @example
+	* ```ts
+	* const verticalFieldOfView = map.getVerticalFieldOfView();
+	* ```
+	*/
+	getVerticalFieldOfView() {
+		return this._camera.transform.fov;
+	}
+	/**
+	* Sets the map's vertical field of view, in degrees.
+	*
+	* Triggers the following events: `movestart`, `move`, and `moveend`.
+	*
+	* @param fov - The vertical field of view to set, in degrees (0-180).
+	* @param eventData - Additional properties to be added to event objects of events triggered by this method.
+	* @defaultValue 36.87
+	* @example
+	* Change vertical field of view to 30 degrees
+	* ```ts
+	* map.setVerticalFieldOfView(30);
+	* ```
+	*/
+	setVerticalFieldOfView(fov, eventData) {
+		this._camera.setVerticalFieldOfView(fov, eventData);
+		return this;
+	}
+	/**
+	* Returns the map's current bearing. The bearing is the compass direction that is "up"; for example, a bearing
+	* of 90° orients the map so that east is up.
+	*
+	* @returns The map's current bearing.
+	* @see [Navigate the map with game-like controls](https://maplibre.org/maplibre-gl-js/docs/examples/navigate-the-map-with-game-like-controls/)
+	*/
+	getBearing() {
+		return this._camera.transform.bearing;
+	}
+	/**
+	* Sets the map's bearing (rotation). The bearing is the compass direction that is "up"; for example, a bearing
+	* of 90° orients the map so that east is up.
+	*
+	* Equivalent to `jumpTo({bearing: bearing})`.
+	*
+	* Triggers the following events: `movestart`, `moveend`, and `rotate`.
+	*
+	* @param bearing - The desired bearing.
+	* @param eventData - Additional properties to be added to event objects of events triggered by this method.
+	* @example
+	* Rotate the map to 90 degrees
+	* ```ts
+	* map.setBearing(90);
+	* ```
+	*/
+	setBearing(bearing, eventData) {
+		this._camera.setBearing(bearing, eventData);
+		return this;
+	}
+	/**
+	* Returns the map's current zoom snap level.
+	*
+	* @returns The map's current zoom snap level.
+	*/
+	getZoomSnap() {
+		return this._camera.getZoomSnap();
+	}
+	/**
+	* Sets the map's zoom snap level.
+	*
+	* @param snap - The zoom snap level to set.
+	*/
+	setZoomSnap(snap) {
+		this._camera.setZoomSnap(snap);
+		return this;
+	}
+	/**
+	* Returns the current padding applied around the map viewport.
+	*
+	* @returns The current padding around the map viewport.
+	*/
+	getPadding() {
+		return this._camera.transform.padding;
+	}
+	/**
+	* Sets the padding in pixels around the viewport.
+	*
+	* Equivalent to `jumpTo({padding: padding})`.
+	*
+	* Triggers the following events: `movestart` and `moveend`.
+	*
+	* @param padding - The desired padding.
+	* @param eventData - Additional properties to be added to event objects of events triggered by this method.
+	* @example
+	* Sets a left padding of 300px, and a top padding of 50px
+	* ```ts
+	* map.setPadding({ left: 300, top: 50 });
+	* ```
+	*/
+	setPadding(padding, eventData) {
+		this._camera.setPadding(padding, eventData);
+		return this;
+	}
+	/**
+	* Rotates the map to the specified bearing, with an animated transition. The bearing is the compass direction
+	* that is "up"; for example, a bearing of 90° orients the map so that east is up.
+	*
+	* Triggers the following events: `movestart`, `moveend`, and `rotate`.
+	*
+	* @param bearing - The desired bearing.
+	* @param options - Options object
+	* @param eventData - Additional properties to be added to event objects of events triggered by this method.
+	*/
+	rotateTo(bearing, options, eventData) {
+		this._camera.rotateTo(bearing, options, eventData);
+		return this;
+	}
+	/**
+	* Rotates the map so that north is up (0° bearing), with an animated transition.
+	*
+	* Triggers the following events: `movestart`, `moveend`, and `rotate`.
+	*
+	* @param options - Options object
+	* @param eventData - Additional properties to be added to event objects of events triggered by this method.
+	*/
+	resetNorth(options, eventData) {
+		this._camera.resetNorth(options, eventData);
+		return this;
+	}
+	/**
+	* Rotates and pitches the map so that north is up (0° bearing) and pitch and roll are 0°, with an animated transition.
+	*
+	* Triggers the following events: `movestart`, `move`, `moveend`, `pitchstart`, `pitch`, `pitchend`, `rollstart`, `roll`, `rollend`, and `rotate`.
+	*
+	* @param options - Options object
+	* @param eventData - Additional properties to be added to event objects of events triggered by this method.
+	*/
+	resetNorthPitch(options, eventData) {
+		this._camera.resetNorthPitch(options, eventData);
+		return this;
+	}
+	/**
+	* Snaps the map so that north is up (0° bearing), if the current bearing is close enough to it (i.e. within the
+	* `bearingSnap` threshold).
+	*
+	* Triggers the following events: `movestart`, `moveend`, and `rotate`.
+	*
+	* @param options - Options object
+	* @param eventData - Additional properties to be added to event objects of events triggered by this method.
+	*/
+	snapToNorth(options, eventData) {
+		this._camera.snapToNorth(options, eventData);
+		return this;
+	}
+	/**
+	* Returns the map's current pitch (tilt).
+	*
+	* @returns The map's current pitch, measured in degrees away from the plane of the screen.
+	*/
+	getPitch() {
+		return this._camera.transform.pitch;
+	}
+	/**
+	* Sets the map's pitch (tilt). Equivalent to `jumpTo({pitch: pitch})`.
+	*
+	* Triggers the following events: `movestart`, `moveend`, `pitchstart`, and `pitchend`.
+	*
+	* @param pitch - The pitch to set, measured in degrees away from the plane of the screen (0-60).
+	* @param eventData - Additional properties to be added to event objects of events triggered by this method.
+	*/
+	setPitch(pitch, eventData) {
+		this._camera.setPitch(pitch, eventData);
+		return this;
+	}
+	/**
+	* Returns the map's current roll angle.
+	*
+	* @returns The map's current roll, measured in degrees about the camera boresight.
+	*/
+	getRoll() {
+		return this._camera.transform.roll;
+	}
+	/**
+	* Sets the map's roll angle. Equivalent to `jumpTo({roll: roll})`.
+	*
+	* Triggers the following events: `movestart`, `moveend`, `rollstart`, and `rollend`.
+	*
+	* @param roll - The roll to set, measured in degrees about the camera boresight
+	* @param eventData - Additional properties to be added to event objects of events triggered by this method.
+	*/
+	setRoll(roll, eventData) {
+		this._camera.setRoll(roll, eventData);
+		return this;
+	}
+	/**
+	* @param bounds - Calculate the center for these bounds in the viewport and use
+	* the highest zoom level up to and including {@link Map.getMaxZoom} that fits
+	* in the viewport. LngLatBounds represent a box that is always axis-aligned with bearing 0.
+	* Bounds will be taken in `[sw, ne]` order. Southwest point will always be to the left of the northeast point.
+	* @param options - Options object
+	* @returns If map is able to fit to provided bounds, returns `center`, `zoom`, and `bearing`.
+	* If map is unable to fit, method will warn and return undefined.
+	* @example
+	* ```ts
+	* let bbox = [[-79, 43], [-73, 45]];
+	* let newCameraTransform = map.cameraForBounds(bbox, {
+	*   padding: {top: 10, bottom:25, left: 15, right: 5}
+	* });
+	* ```
 	*/
-	setGlobalStateProperty(propertyName, value) {
-		this.style.setGlobalStateProperty(propertyName, value);
-		return this._update(true);
+	cameraForBounds(bounds, options) {
+		return this._camera.cameraForBounds(bounds, options);
 	}
 	/**
-	* Returns the global map state
+	* Pans and zooms the map to contain its visible area within the specified geographical bounds.
+	* This function will also reset the map's bearing to 0 if bearing is nonzero.
 	*
-	* @returns The map state object.
+	* Triggers the following events: `movestart` and `moveend`.
+	*
+	* @param bounds - Center these bounds in the viewport and use the highest
+	* zoom level up to and including {@link Map.getMaxZoom} that fits them in the viewport.
+	* Bounds will be taken in `[sw, ne]` order. Southwest point will always be to the left of the northeast point.
+	* @param options - Options supports all properties from {@link AnimationOptions} and {@link CameraOptions} in addition to the fields below.
+	* @param eventData - Additional properties to be added to event objects of events triggered by this method.
+	* @example
+	* ```ts
+	* let bbox = [[-79, 43], [-73, 45]];
+	* map.fitBounds(bbox, {
+	*   padding: {top: 10, bottom:25, left: 15, right: 5}
+	* });
+	* ```
+	* @see [Fit a map to a bounding box](https://maplibre.org/maplibre-gl-js/docs/examples/fit-a-map-to-a-bounding-box/)
 	*/
-	getGlobalState() {
-		return this.style.getGlobalState();
+	fitBounds(bounds, options, eventData) {
+		this._camera.fitBounds(bounds, options, eventData);
+		return this;
 	}
 	/**
-	* Adds an {@link IControl} to the map, calling `control.onAdd(this)`.
+	* Pans, rotates and zooms the map to to fit the box made by points p0 and p1
+	* once the map is rotated to the specified bearing. To zoom without rotating,
+	* pass in the current map bearing.
 	*
-	* An {@link ErrorEvent} will be fired if the control is invalid.
+	* Triggers the following events: `movestart`, `move`, `moveend`, `zoomstart`, `zoom`, `zoomend` and `rotate`.
 	*
-	* @param control - The {@link IControl} to add.
-	* @param position - position on the map to which the control will be added.
-	* Valid values are `'top-left'`, `'top-right'`, `'bottom-left'`, and `'bottom-right'`. Defaults to `'top-right'`.
+	* @param p0 - First point on screen, in pixel coordinates
+	* @param p1 - Second point on screen, in pixel coordinates
+	* @param bearing - Desired map bearing at end of animation, in degrees
+	* @param options - Options object
+	* @param eventData - Additional properties to be added to event objects of events triggered by this method.
 	* @example
-	* Add zoom and rotation controls to the map.
 	* ```ts
-	* map.addControl(new NavigationControl());
+	* let p0 = [220, 400];
+	* let p1 = [500, 900];
+	* map.fitScreenCoordinates(p0, p1, map.getBearing(), {
+	*   padding: {top: 10, bottom:25, left: 15, right: 5}
+	* });
 	* ```
-	* @see [Display map navigation controls](https://maplibre.org/maplibre-gl-js/docs/examples/display-map-navigation-controls/)
+	* @see Used by {@link BoxZoomHandler}
 	*/
-	addControl(control, position) {
-		if (position === void 0) if (control.getDefaultPosition) position = control.getDefaultPosition();
-		else position = "top-right";
-		if (!control?.onAdd) return this.fire(new ErrorEvent(/* @__PURE__ */ new Error("Invalid argument to map.addControl(). Argument must be a control with onAdd and onRemove methods.")));
-		const controlElement = control.onAdd(this);
-		this._controls.push(control);
-		const positionContainer = this._controlPositions[position];
-		if (position.includes("bottom")) positionContainer.insertBefore(controlElement, positionContainer.firstChild);
-		else positionContainer.appendChild(controlElement);
+	fitScreenCoordinates(p0, p1, bearing, options, eventData) {
+		this._camera.fitScreenCoordinates(p0, p1, bearing, options, eventData);
 		return this;
 	}
 	/**
-	* Removes the control from the map.
+	* Changes any combination of center, zoom, bearing, pitch, and roll, without
+	* an animated transition. The map will retain its current values for any
+	* details not specified in `options`.
 	*
-	* An {@link ErrorEvent} will be fired if the control is invalid.
+	* Triggers the following events: `movestart`, `move`, `moveend`, `zoomstart`, `zoom`, `zoomend`, `pitchstart`,
+	* `pitch`, `pitchend`, `rollstart`, `roll`, `rollend` and `rotate`.
 	*
-	* @param control - The {@link IControl} to remove.
+	* @param options - Options object
+	* @param eventData - Additional properties to be added to event objects of events triggered by this method.
 	* @example
 	* ```ts
-	* // Define a new navigation control.
-	* let navigation = new NavigationControl();
-	* // Add zoom and rotation controls to the map.
-	* map.addControl(navigation);
-	* // Remove zoom and rotation controls from the map.
-	* map.removeControl(navigation);
+	* // jump to coordinates at current zoom
+	* map.jumpTo({center: [0, 0]});
+	* // jump with zoom, pitch, and bearing options
+	* map.jumpTo({
+	*   center: [0, 0],
+	*   zoom: 8,
+	*   pitch: 45,
+	*   bearing: 90
+	* });
 	* ```
+	* @see [Jump to a series of locations](https://maplibre.org/maplibre-gl-js/docs/examples/jump-to-a-series-of-locations/)
+	* @see [Update a feature in realtime](https://maplibre.org/maplibre-gl-js/docs/examples/update-a-feature-in-realtime/)
 	*/
-	removeControl(control) {
-		if (!control?.onRemove) return this.fire(new ErrorEvent(/* @__PURE__ */ new Error("Invalid argument to map.removeControl(). Argument must be a control with onAdd and onRemove methods.")));
-		const ci = this._controls.indexOf(control);
-		if (ci > -1) this._controls.splice(ci, 1);
-		control.onRemove(this);
+	jumpTo(options, eventData) {
+		this._camera.jumpTo(options, eventData);
 		return this;
 	}
 	/**
-	* Checks if a control exists on the map.
-	*
-	* @param control - The {@link IControl} to check.
-	* @returns true if map contains control.
+	* Given a camera position and rotation, calculates zoom and center point and returns them as {@link CameraOptions}.
+	* @param cameraLngLat - The lng, lat of the camera to look from
+	* @param cameraAlt - The altitude of the camera to look from, in meters above sea level
+	* @param bearing - Bearing of the camera, in degrees
+	* @param pitch - Pitch of the camera, in degrees
+	* @param roll - Roll of the camera, in degrees
+	* @returns the calculated camera options
 	* @example
 	* ```ts
-	* // Define a new navigation control.
-	* let navigation = new NavigationControl();
-	* // Add zoom and rotation controls to the map.
-	* map.addControl(navigation);
-	* // Check that the navigation control exists on the map.
-	* map.hasControl(navigation);
+	* // Calculate options to look from camera position(1°, 0°, 1000m) with bearing = 90°, pitch = 30°, and roll = 45°
+	* const cameraLngLat = new LngLat(1, 0);
+	* const cameraAltitude = 1000;
+	* const bearing = 90;
+	* const pitch = 30;
+	* const roll = 45;
+	* const cameraOptions = map.calculateCameraOptionsFromCameraLngLatAltRotation(cameraLngLat, cameraAltitude, bearing, pitch, roll);
+	* // Apply calculated options
+	* map.jumpTo(cameraOptions);
 	* ```
 	*/
-	hasControl(control) {
-		return this._controls.includes(control);
+	calculateCameraOptionsFromCameraLngLatAltRotation(cameraLngLat, cameraAlt, bearing, pitch, roll) {
+		return this._camera.calculateCameraOptionsFromCameraLngLatAltRotation(cameraLngLat, cameraAlt, bearing, pitch, roll);
 	}
 	/**
-	* Returns an array of `OverscaledTileID` objects that cover the current viewport for a given tile size.
-	* This method is useful for determining which tiles are visible in the current viewport.
+	* Changes any combination of `center`, `zoom`, `bearing`, `pitch`, `roll`, and `padding` with an animated transition
+	* between old and new values. The map will retain its current values for any
+	* details not specified in `options`.
 	*
-	* @param options - Options for calculating the covering tiles.
-	* @returns An array of `OverscaledTileID` objects.
+	* !!! note "Reduced Motion"
+	*     The transition will happen instantly if the user has enabled
+	*     the `reduced motion` accessibility feature enabled in their operating system,
+	*     unless `options` includes `essential: true`.
+	*
+	* Triggers the following events: `movestart`, `move`, `moveend`, `zoomstart`, `zoom`, `zoomend`, `pitchstart`,
+	* `pitch`, `pitchend`, `rollstart`, `roll`, `rollend`, and `rotate`.
+	*
+	* @param options - Options describing the destination and animation of the transition.
+	* Accepts {@link CameraOptions} and {@link AnimationOptions}.
+	* @param eventData - Additional properties to be added to event objects of events triggered by this method.
+	* @see [Navigate the map with game-like controls](https://maplibre.org/maplibre-gl-js/docs/examples/navigate-the-map-with-game-like-controls/)
+	*/
+	easeTo(options, eventData) {
+		this._camera.easeTo(options, eventData);
+		return this;
+	}
+	/**
+	* Changes any combination of center, zoom, bearing, pitch, and roll, animating the transition along a curve that
+	* evokes flight. The animation seamlessly incorporates zooming and panning to help
+	* the user maintain her bearings even after traversing a great distance.
+	*
+	* !!! note "Reduced Motion"
+	*     The animation will be skipped, and this will behave equivalently to `jumpTo`
+	*     if the user has the `reduced motion` accessibility feature enabled in their operating system,
+	*     unless 'options' includes `essential: true`.
+	*
+	* Triggers the following events: `movestart`, `move`, `moveend`, `zoomstart`, `zoom`, `zoomend`, `pitchstart`,
+	* `pitch`, `pitchend`, `rollstart`, `roll`, `rollend`, and `rotate`.
+	*
+	* @param options - Options describing the destination and animation of the transition.
+	* Accepts {@link CameraOptions}, {@link AnimationOptions},
+	* and the following additional options.
+	* @param eventData - Additional properties to be added to event objects of events triggered by this method.
 	* @example
 	* ```ts
-	* // Get the tiles to cover the view for a 512x512px tile source
-	* const tiles = map.coveringTiles({tileSize: 512});
+	* // fly with default options to null island
+	* map.flyTo({center: [0, 0], zoom: 9});
+	* // using flyTo options
+	* map.flyTo({
+	*   center: [0, 0],
+	*   zoom: 9,
+	*   speed: 0.2,
+	*   curve: 1,
+	*   easing(t) {
+	*     return t;
+	*   }
+	* });
 	* ```
+	* @see [Fly to a location](https://maplibre.org/maplibre-gl-js/docs/examples/fly-to-a-location/)
+	* @see [Slowly fly to a location](https://maplibre.org/maplibre-gl-js/docs/examples/slowly-fly-to-a-location/)
+	* @see [Fly to a location based on scroll position](https://maplibre.org/maplibre-gl-js/docs/examples/fly-to-a-location-based-on-scroll-position/)
 	*/
-	coveringTiles(options) {
-		return coveringTiles(this.transform, options);
+	flyTo(options, eventData) {
+		this._camera.flyTo(options, eventData);
+		return this;
+	}
+	/**
+	* Stops any animated transition underway.
+	*/
+	stop() {
+		this._camera.stop();
+		return this;
+	}
+	/**
+	* Gets the elevation at a given location, in meters above sea level.
+	* Returns null if terrain is not enabled.
+	* If terrain is enabled with some exaggeration value, the value returned here will be reflective of (multiplied by) that exaggeration value.
+	* This method should be used for proper positioning of custom 3d objects, as explained [here](https://maplibre.org/maplibre-gl-js/docs/examples/adding-3d-models-using-threejs-on-terrain/)
+	* @param lngLatLike - `[x, y]` or LngLat coordinates of the location
+	* @returns elevation in meters
+	*/
+	queryTerrainElevation(lngLatLike) {
+		if (!this.terrain) return null;
+		return this.terrain.getElevationForLngLat(LngLat.convert(lngLatLike), this._camera.transform);
+	}
+	/**
+	* Returns the value of `centerClampedToGround`.
+	*
+	* If true, the elevation of the center point will automatically be set to the terrain elevation
+	* (or zero if terrain is not enabled). If false, the elevation of the center point will default
+	* to sea level and will not automatically update. Defaults to true. Needs to be set to false to
+	* keep the camera above ground when pitch \> 90 degrees.
+	*/
+	getCenterClampedToGround() {
+		return this._camera.getCenterClampedToGround();
 	}
+	/**
+	* Given a camera 'from' position and a position to look at (`to`), calculates zoom and camera rotation and returns them as {@link CameraOptions}.
+	* @param from - The camera to look from
+	* @param altitudeFrom - The altitude of the camera to look from
+	* @param to - The center to look at
+	* @param altitudeTo - Optional altitude of the center to look at. If none given the ground height will be used.
+	* @returns the calculated camera options
+	* @example
+	* ```ts
+	* // Calculate options to look from (1°, 0°, 1000m) to (1°, 1°, 0m)
+	* const cameraLngLat = new LngLat(1, 0);
+	* const cameraAltitude = 1000;
+	* const targetLngLat = new LngLat(1, 1);
+	* const targetAltitude = 0;
+	* const cameraOptions = map.calculateCameraOptionsFromTo(cameraLngLat, cameraAltitude, targetLngLat, targetAltitude);
+	* // Apply calculated options
+	* map.jumpTo(cameraOptions);
+	* ```
+	*/
 	calculateCameraOptionsFromTo(from, altitudeFrom, to, altitudeTo) {
-		if (altitudeTo == null && this.terrain) altitudeTo = this.terrain.getElevationForLngLat(to, this.transform);
-		return super.calculateCameraOptionsFromTo(from, altitudeFrom, to, altitudeTo);
+		if (altitudeTo == null && this.terrain) altitudeTo = this.terrain.getElevationForLngLat(to, this._camera.transform);
+		return this._camera.calculateCameraOptionsFromTo(from, altitudeFrom, to, altitudeTo);
 	}
 	/**
 	* Resizes the map according to the dimensions of its
@@ -23349,7 +23464,7 @@ var Map$1 = class extends Camera {
 	resize(eventData, constrainTransform = true) {
 		if (this._lostContextStyle.style !== null) return this;
 		this._resizeInternal(constrainTransform);
-		const fireMoving = !this._moving;
+		const fireMoving = !this._camera._moving;
 		if (fireMoving) {
 			this.stop();
 			this.fire(new MapMovementEvent("movestart", eventData)).fire(new MapMovementEvent("move", eventData));
@@ -23386,8 +23501,8 @@ var Map$1 = class extends Camera {
 	}
 	_resizeTransform(constrainTransform = true) {
 		const [width, height] = this._containerDimensions();
-		this.transform.resize(width, height, constrainTransform);
-		this._requestedCameraState?.resize(width, height, constrainTransform);
+		this._camera.transform.resize(width, height, constrainTransform);
+		this._camera._requestedCameraState?.resize(width, height, constrainTransform);
 	}
 	/**
 	* @internal
@@ -23433,7 +23548,7 @@ var Map$1 = class extends Camera {
 	* ```
 	*/
 	getBounds() {
-		return this.transform.getBounds();
+		return this._camera.transform.getBounds();
 	}
 	/**
 	* Returns the maximum geographical bounds the map is constrained to, or `null` if none set.
@@ -23444,7 +23559,7 @@ var Map$1 = class extends Camera {
 	* ```
 	*/
 	getMaxBounds() {
-		return this.transform.getMaxBounds();
+		return this._camera.transform.getMaxBounds();
 	}
 	/**
 	* Sets or clears the map's geographical bounds.
@@ -23468,7 +23583,7 @@ var Map$1 = class extends Camera {
 	* ```
 	*/
 	setMaxBounds(bounds) {
-		this.transform.setMaxBounds(LngLatBounds.convert(bounds));
+		this._camera.transform.setMaxBounds(LngLatBounds.convert(bounds));
 		return this._update();
 	}
 	/**
@@ -23493,13 +23608,13 @@ var Map$1 = class extends Camera {
 	*/
 	setMinZoom(minZoom) {
 		minZoom = minZoom === null || minZoom === void 0 ? defaultMinZoom : minZoom;
-		if (minZoom >= defaultMinZoom && minZoom <= this.transform.maxZoom) {
-			const zoomBefore = this.transform.zoom;
-			const tr = this._getTransformForUpdate();
+		if (minZoom >= defaultMinZoom && minZoom <= this._camera.transform.maxZoom) {
+			const zoomBefore = this._camera.transform.zoom;
+			const tr = this._camera.getTransformForUpdate();
 			tr.setMinZoom(minZoom);
-			this._applyUpdatedTransform(tr);
+			this._camera.applyUpdatedTransform(tr);
 			this._update();
-			if (zoomBefore !== this.transform.zoom) this.fire(new MapMovementEvent("zoomstart")).fire(new MapMovementEvent("zoom")).fire(new MapMovementEvent("zoomend")).fire(new MapMovementEvent("movestart")).fire(new MapMovementEvent("move")).fire(new MapMovementEvent("moveend"));
+			if (zoomBefore !== this._camera.transform.zoom) this.fire(new MapMovementEvent("zoomstart")).fire(new MapMovementEvent("zoom")).fire(new MapMovementEvent("zoomend")).fire(new MapMovementEvent("movestart")).fire(new MapMovementEvent("move")).fire(new MapMovementEvent("moveend"));
 			return this;
 		} else throw new Error(`minZoom must be between ${defaultMinZoom} and the current maxZoom, inclusive`);
 	}
@@ -23513,7 +23628,7 @@ var Map$1 = class extends Camera {
 	* ```
 	*/
 	getMinZoom() {
-		return this.transform.minZoom;
+		return this._camera.transform.minZoom;
 	}
 	/**
 	* Sets or clears the map's maximum zoom level.
@@ -23532,13 +23647,13 @@ var Map$1 = class extends Camera {
 	*/
 	setMaxZoom(maxZoom) {
 		maxZoom = maxZoom === null || maxZoom === void 0 ? defaultMaxZoom : maxZoom;
-		if (maxZoom >= this.transform.minZoom) {
-			const zoomBefore = this.transform.zoom;
-			const tr = this._getTransformForUpdate();
+		if (maxZoom >= this._camera.transform.minZoom) {
+			const zoomBefore = this._camera.transform.zoom;
+			const tr = this._camera.getTransformForUpdate();
 			tr.setMaxZoom(maxZoom);
-			this._applyUpdatedTransform(tr);
+			this._camera.applyUpdatedTransform(tr);
 			this._update();
-			if (zoomBefore !== this.transform.zoom) this.fire(new MapMovementEvent("zoomstart")).fire(new MapMovementEvent("zoom")).fire(new MapMovementEvent("zoomend")).fire(new MapMovementEvent("movestart")).fire(new MapMovementEvent("move")).fire(new MapMovementEvent("moveend"));
+			if (zoomBefore !== this._camera.transform.zoom) this.fire(new MapMovementEvent("zoomstart")).fire(new MapMovementEvent("zoom")).fire(new MapMovementEvent("zoomend")).fire(new MapMovementEvent("movestart")).fire(new MapMovementEvent("move")).fire(new MapMovementEvent("moveend"));
 			return this;
 		} else throw new Error("maxZoom must be greater than the current minZoom");
 	}
@@ -23552,7 +23667,7 @@ var Map$1 = class extends Camera {
 	* ```
 	*/
 	getMaxZoom() {
-		return this.transform.maxZoom;
+		return this._camera.transform.maxZoom;
 	}
 	/**
 	* Sets or clears the map's minimum pitch.
@@ -23568,13 +23683,13 @@ var Map$1 = class extends Camera {
 	setMinPitch(minPitch) {
 		minPitch = minPitch === null || minPitch === void 0 ? defaultMinPitch : minPitch;
 		if (minPitch < defaultMinPitch) throw new Error(`minPitch must be greater than or equal to ${defaultMinPitch}`);
-		if (minPitch >= defaultMinPitch && minPitch <= this.transform.maxPitch) {
-			const pitchBefore = this.transform.pitch;
-			const tr = this._getTransformForUpdate();
+		if (minPitch >= defaultMinPitch && minPitch <= this._camera.transform.maxPitch) {
+			const pitchBefore = this._camera.transform.pitch;
+			const tr = this._camera.getTransformForUpdate();
 			tr.setMinPitch(minPitch);
-			this._applyUpdatedTransform(tr);
+			this._camera.applyUpdatedTransform(tr);
 			this._update();
-			if (pitchBefore !== this.transform.pitch) this.fire(new MapMovementEvent("pitchstart")).fire(new MapMovementEvent("pitch")).fire(new MapMovementEvent("pitchend")).fire(new MapMovementEvent("movestart")).fire(new MapMovementEvent("move")).fire(new MapMovementEvent("moveend"));
+			if (pitchBefore !== this._camera.transform.pitch) this.fire(new MapMovementEvent("pitchstart")).fire(new MapMovementEvent("pitch")).fire(new MapMovementEvent("pitchend")).fire(new MapMovementEvent("movestart")).fire(new MapMovementEvent("move")).fire(new MapMovementEvent("moveend"));
 			return this;
 		} else throw new Error(`minPitch must be between ${defaultMinPitch} and the current maxPitch, inclusive`);
 	}
@@ -23584,7 +23699,7 @@ var Map$1 = class extends Camera {
 	* @returns The minPitch
 	*/
 	getMinPitch() {
-		return this.transform.minPitch;
+		return this._camera.transform.minPitch;
 	}
 	/**
 	* Sets or clears the map's maximum pitch.
@@ -23600,13 +23715,13 @@ var Map$1 = class extends Camera {
 	setMaxPitch(maxPitch) {
 		maxPitch = maxPitch === null || maxPitch === void 0 ? defaultMaxPitch : maxPitch;
 		if (maxPitch > maxPitchThreshold) throw new Error(`maxPitch must be less than or equal to ${maxPitchThreshold}`);
-		if (maxPitch >= this.transform.minPitch) {
-			const pitchBefore = this.transform.pitch;
-			const tr = this._getTransformForUpdate();
+		if (maxPitch >= this._camera.transform.minPitch) {
+			const pitchBefore = this._camera.transform.pitch;
+			const tr = this._camera.getTransformForUpdate();
 			tr.setMaxPitch(maxPitch);
-			this._applyUpdatedTransform(tr);
+			this._camera.applyUpdatedTransform(tr);
 			this._update();
-			if (pitchBefore !== this.transform.pitch) this.fire(new MapMovementEvent("pitchstart")).fire(new MapMovementEvent("pitch")).fire(new MapMovementEvent("pitchend")).fire(new MapMovementEvent("movestart")).fire(new MapMovementEvent("move")).fire(new MapMovementEvent("moveend"));
+			if (pitchBefore !== this._camera.transform.pitch) this.fire(new MapMovementEvent("pitchstart")).fire(new MapMovementEvent("pitch")).fire(new MapMovementEvent("pitchend")).fire(new MapMovementEvent("movestart")).fire(new MapMovementEvent("move")).fire(new MapMovementEvent("moveend"));
 			return this;
 		} else throw new Error("maxPitch must be greater than the current minPitch");
 	}
@@ -23616,7 +23731,7 @@ var Map$1 = class extends Camera {
 	* @returns The maxPitch
 	*/
 	getMaxPitch() {
-		return this.transform.maxPitch;
+		return this._camera.transform.maxPitch;
 	}
 	/**
 	* Returns the map's anisotropic filter pitch.
@@ -23667,7 +23782,7 @@ var Map$1 = class extends Camera {
 	* @see [Render world copies](https://maplibre.org/maplibre-gl-js/docs/examples/render-world-copies/)
 	*/
 	getRenderWorldCopies() {
-		return this.transform.renderWorldCopies;
+		return this._camera.transform.renderWorldCopies;
 	}
 	/**
 	* Sets the state of `renderWorldCopies`.
@@ -23687,7 +23802,7 @@ var Map$1 = class extends Camera {
 	* @see [Render world copies](https://maplibre.org/maplibre-gl-js/docs/examples/render-world-copies/)
 	*/
 	setRenderWorldCopies(renderWorldCopies) {
-		this.transform.setRenderWorldCopies(renderWorldCopies);
+		this._camera.transform.setRenderWorldCopies(renderWorldCopies);
 		return this._update();
 	}
 	/** Sets or clears the callback overriding how the map constrains the viewport's lnglat and zoom to respect the longitude and latitude bounds.
@@ -23705,7 +23820,7 @@ var Map$1 = class extends Camera {
 	* @see [Customize the map transform constrain](https://maplibre.org/maplibre-gl-js/docs/examples/customize-the-map-transform-constrain/)
 	*/
 	setTransformConstrain(constrain) {
-		this.transform.setConstrainOverride(constrain);
+		this._camera.transform.setConstrainOverride(constrain);
 		return this._update();
 	}
 	/**
@@ -23721,7 +23836,7 @@ var Map$1 = class extends Camera {
 	* ```
 	*/
 	project(lnglat) {
-		return this.transform.locationToScreenPoint(LngLat.convert(lnglat), this.style && this.terrain);
+		return this._camera.transform.locationToScreenPoint(LngLat.convert(lnglat), this.style && this.terrain);
 	}
 	/**
 	* Returns a {@link LngLat} representing geographical coordinates that correspond
@@ -23738,7 +23853,7 @@ var Map$1 = class extends Camera {
 	* ```
 	*/
 	unproject(point) {
-		return this.transform.screenPointToLocation(Point.convert(point), this.terrain);
+		return this._camera.transform.screenPointToLocation(Point.convert(point), this.terrain);
 	}
 	/**
 	* Returns true if the map is panning, zooming, rotating, or pitching due to a camera animation or user gesture.
@@ -23749,7 +23864,7 @@ var Map$1 = class extends Camera {
 	* ```
 	*/
 	isMoving() {
-		return this._moving || this.handlers?.isMoving();
+		return this._camera.isMoving() || this._handlers?.isMoving() || false;
 	}
 	/**
 	* Returns true if the map is zooming due to a camera animation or user gesture.
@@ -23760,7 +23875,7 @@ var Map$1 = class extends Camera {
 	* ```
 	*/
 	isZooming() {
-		return this._zooming || this.handlers?.isZooming();
+		return this._camera.isZooming() || this._handlers?.isZooming() || false;
 	}
 	/**
 	* Returns true if the map is rotating due to a camera animation or user gesture.
@@ -23771,7 +23886,7 @@ var Map$1 = class extends Camera {
 	* ```
 	*/
 	isRotating() {
-		return this._rotating || this.handlers?.isRotating();
+		return this._camera.isRotating() || this._handlers?.isRotating() || false;
 	}
 	_createDelegatedListener(type, layerIds, listener) {
 		if (type === "mouseenter" || type === "mouseover") {
@@ -23969,7 +24084,7 @@ var Map$1 = class extends Camera {
 		if (!this.style) return [];
 		let queryGeometry;
 		const isGeometry = geometryOrOptions instanceof Point || Array.isArray(geometryOrOptions);
-		const geometry = isGeometry ? geometryOrOptions : [[0, 0], [this.transform.width, this.transform.height]];
+		const geometry = isGeometry ? geometryOrOptions : [[0, 0], [this._camera.transform.width, this._camera.transform.height]];
 		options ||= (isGeometry ? {} : geometryOrOptions) || {};
 		if (geometry instanceof Point || typeof geometry[0] === "number") queryGeometry = [Point.convert(geometry)];
 		else {
@@ -23983,7 +24098,7 @@ var Map$1 = class extends Camera {
 				tl
 			];
 		}
-		return this.style.queryRenderedFeatures(queryGeometry, options, this.transform);
+		return this.style.queryRenderedFeatures(queryGeometry, options, this._camera.transform);
 	}
 	/**
 	* Returns an array of MapGeoJSONFeature objects
@@ -24290,8 +24405,9 @@ var Map$1 = class extends Camera {
 			if (this.terrain) this.terrain.destroy();
 			this.terrain = null;
 			this.painter.renderToTexture = null;
-			this.transform.setMinElevationForCurrentTile(0);
-			if (this._centerClampedToGround) this.transform.setElevation(0);
+			this._camera.terrain = null;
+			this._camera.transform.setMinElevationForCurrentTile(0);
+			if (this.getCenterClampedToGround()) this._camera.transform.setElevation(0);
 		} else {
 			const tileManager = this.style.tileManagers[options.source];
 			if (!tileManager) throw new Error(`cannot load terrain, because there exists no source with ID: ${options.source}`);
@@ -24303,14 +24419,15 @@ var Map$1 = class extends Camera {
 			}
 			this.terrain = new Terrain(this.painter, tileManager, options, this._terrainSkirtLength);
 			this.painter.renderToTexture = new RenderToTexture(this.painter, this.terrain);
-			this.transform.setMinElevationForCurrentTile(this.terrain.getMinTileElevationForLngLatZoom(this.transform.center, this.transform.tileZoom));
-			this.transform.setElevation(this.terrain.getElevationForLngLatZoom(this.transform.center, this.transform.tileZoom));
+			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._elevationFreeze) {
-						this.transform.setMinElevationForCurrentTile(this.terrain.getMinTileElevationForLngLatZoom(this.transform.center, this.transform.tileZoom));
-						if (this._centerClampedToGround) this.transform.setElevation(this.terrain.getElevationForLngLatZoom(this.transform.center, this.transform.tileZoom));
+					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);
@@ -25287,10 +25404,16 @@ var Map$1 = class extends Camera {
 			this.fire(new ErrorEvent(new GPUInitializationError(attributes, creationEvent)));
 			return;
 		}
-		this.painter = new Painter(gl, this.transform);
+		this.painter = new Painter(gl, this._camera.transform);
 	}
+	/**
+	* @internal
+	* Creates a new specialized transform instance from a projection instance and migrates
+	* to this new transform, carrying over all the properties of the old transform (center, pitch, etc.).
+	* When the style's projection is changed (or first set), this function should be called.
+	*/
 	migrateProjection(newTransform, newCameraHelper) {
-		super.migrateProjection(newTransform, newCameraHelper);
+		this._camera.migrateProjection(newTransform, newCameraHelper);
 		this.painter.transform = newTransform;
 		this.fire(new MapProjectionEvent({ newProjection: this.style.projection.name }));
 	}
@@ -25355,7 +25478,7 @@ var Map$1 = class extends Camera {
 		let crossFading = false;
 		if (this.style && this._styleDirty) {
 			this._styleDirty = false;
-			const zoom = this.transform.zoom;
+			const zoom = this._camera.transform.zoom;
 			const currentTime = now();
 			this.style.zoomHistory.update(zoom, currentTime);
 			const parameters = new EvaluationParameters(zoom, {
@@ -25372,21 +25495,21 @@ var Map$1 = class extends Camera {
 			this.style.update(parameters);
 		}
 		const globeRenderingChanged = this.style.projection?.transitionState > 0 !== isGlobeRendering;
-		this.style.projection?.setErrorQueryLatitudeDegrees(this.transform.center.lat);
-		this.transform.setTransitionState(this.style.projection?.transitionState, this.style.projection?.latitudeErrorCorrectionRadians);
+		this.style.projection?.setErrorQueryLatitudeDegrees(this._camera.transform.center.lat);
+		this._camera.transform.setTransitionState(this.style.projection?.transitionState, this.style.projection?.latitudeErrorCorrectionRadians);
 		if (this.style && (this._sourcesDirty || globeRenderingChanged)) {
 			this._sourcesDirty = false;
-			this.style._updateSources(this.transform);
+			this.style._updateSources(this._camera.transform);
 		}
 		if (this.terrain) {
-			this.terrain.tileManager.update(this.transform, this.terrain);
-			this.transform.setMinElevationForCurrentTile(this.terrain.getMinTileElevationForLngLatZoom(this.transform.center, this.transform.tileZoom));
-			if (!this._elevationFreeze && this._centerClampedToGround) this.transform.setElevation(this.terrain.getElevationForLngLatZoom(this.transform.center, this.transform.tileZoom));
+			this.terrain.tileManager.update(this._camera.transform, this.terrain);
+			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 {
-			this.transform.setMinElevationForCurrentTile(0);
-			if (this._centerClampedToGround) this.transform.setElevation(0);
+			this._camera.transform.setMinElevationForCurrentTile(0);
+			if (this.getCenterClampedToGround()) this._camera.transform.setElevation(0);
 		}
-		this._placementDirty = this.style?._updatePlacement(this.transform, this.showCollisionBoxes, fadeDuration, this._crossSourceCollisions, globeRenderingChanged);
+		this._placementDirty = this.style?._updatePlacement(this._camera.transform, this.showCollisionBoxes, fadeDuration, this._crossSourceCollisions, globeRenderingChanged);
 		this.painter.render(this.style, {
 			showTileBoundaries: this.showTileBoundaries,
 			showOverdrawInspector: this._showOverdrawInspector,
@@ -25447,8 +25570,7 @@ var Map$1 = class extends Camera {
 		this._renderTaskQueue.clear();
 		this._diffStyleRequest?.abort();
 		this.painter.destroy();
-		this.handlers.destroy();
-		delete this.handlers;
+		this._handlers.destroy();
 		this.setStyle(null);
 		if (typeof window !== "undefined") this._ownerWindow.removeEventListener("online", this._onWindowOnline, false);
 		ImageRequest.removeThrottleControl(this._imageQueueHandle);
@@ -25585,7 +25707,7 @@ var Map$1 = class extends Camera {
 	* @returns The elevation.
 	*/
 	getCameraTargetElevation() {
-		return this.transform.elevation;
+		return this._camera.transform.elevation;
 	}
 	/**
 	* Gets the {@link ProjectionSpecification}.
@@ -25644,19 +25766,23 @@ var NavigationControl = class {
 			this._zoomOutButton.setAttribute("aria-disabled", isMin.toString());
 		};
 		this._rotateCompassArrow = () => {
+			const pitch = this._map.getPitch();
+			const roll = this._map.getRoll();
+			const bearing = this._map.getBearing();
+			const pitchScale = 1 / Math.pow(Math.cos(degreesToRadians(pitch)), .5);
 			if (this.options.visualizePitch && this.options.visualizeRoll) {
-				this._compassIcon.style.transform = `scale(${1 / Math.pow(Math.cos(this._map.transform.pitchInRadians), .5)}) rotateZ(${-this._map.transform.roll}deg) rotateX(${this._map.transform.pitch}deg) rotateZ(${-this._map.transform.bearing}deg)`;
+				this._compassIcon.style.transform = `scale(${pitchScale}) rotateZ(${-roll}deg) rotateX(${pitch}deg) rotateZ(${-bearing}deg)`;
 				return;
 			}
 			if (this.options.visualizePitch) {
-				this._compassIcon.style.transform = `scale(${1 / Math.pow(Math.cos(this._map.transform.pitchInRadians), .5)}) rotateX(${this._map.transform.pitch}deg) rotateZ(${-this._map.transform.bearing}deg)`;
+				this._compassIcon.style.transform = `scale(${pitchScale}) rotateX(${pitch}deg) rotateZ(${-bearing}deg)`;
 				return;
 			}
 			if (this.options.visualizeRoll) {
-				this._compassIcon.style.transform = `rotate(${-this._map.transform.bearing - this._map.transform.roll}deg)`;
+				this._compassIcon.style.transform = `rotate(${-bearing - roll}deg)`;
 				return;
 			}
-			this._compassIcon.style.transform = `rotate(${-this._map.transform.bearing}deg)`;
+			this._compassIcon.style.transform = `rotate(${-bearing}deg)`;
 		};
 		this._setButtonTitle = (button, title) => {
 			const str = this._map._getUIString(`NavigationControl.${title}`);
@@ -25966,9 +26092,9 @@ var Marker = class extends Evented {
 			if (!this._map) return;
 			const isFullyLoaded = this._map.loaded() && !this._map.isMoving();
 			if (e?.type === "terrain" || e?.type === "render" && !isFullyLoaded) this._map.once("render", this._update);
-			this._lngLat = smartWrap(this._lngLat, this._flatPos, this._map.transform);
+			this._lngLat = smartWrap(this._lngLat, this._flatPos, this._map._camera.transform);
 			this._flatPos = this._pos = this._map.project(this._lngLat)._add(this._offset);
-			if (this._map.terrain) this._flatPos = this._map.transform.locationToScreenPoint(this._lngLat)._add(this._offset);
+			if (this._map.terrain) this._flatPos = this._map._camera.transform.locationToScreenPoint(this._lngLat)._add(this._offset);
 			let rotation = "";
 			if (this._rotationAlignment === "viewport" || this._rotationAlignment === "auto") rotation = `rotateZ(${this._rotation}deg)`;
 			else if (this._rotationAlignment === "map") rotation = `rotateZ(${this._rotation - this._map.getBearing()}deg)`;
@@ -26351,7 +26477,7 @@ var Marker = class extends Evented {
 	}
 	_updateOpacity(force = false) {
 		const terrain = this._map?.terrain;
-		const occluded = this._map.transform.isLocationOccluded(this._lngLat);
+		const occluded = this._map._camera.transform.isLocationOccluded(this._lngLat);
 		if (!terrain || occluded) {
 			const targetOpacity = occluded ? this._opacityWhenCovered : this._opacity;
 			if (this._element.style.opacity !== targetOpacity) {
@@ -26369,18 +26495,18 @@ var Marker = class extends Evented {
 		}
 		const map = this._map;
 		const terrainDistance = map.terrain.depthAtPoint(this._pos);
-		const elevation = map.terrain.getElevationForLngLat(this._lngLat, map.transform);
-		const markerDistance = map.transform.lngLatToCameraDepth(this._lngLat, elevation);
+		const elevation = map.terrain.getElevationForLngLat(this._lngLat, map._camera.transform);
+		const markerDistance = map._camera.transform.lngLatToCameraDepth(this._lngLat, elevation);
 		const forgiveness = .006;
 		if (markerDistance - terrainDistance < forgiveness) {
 			this._element.style.opacity = this._opacity;
 			this._element.classList.remove("maplibregl-marker-covered");
 			return;
 		}
-		const metersToCenter = -this._offset.y / map.transform.pixelsPerMeter;
+		const metersToCenter = -this._offset.y / map._camera.transform.pixelsPerMeter;
 		const elevationToCenter = Math.sin(map.getPitch() * Math.PI / 180) * metersToCenter;
 		const terrainDistanceCenter = map.terrain.depthAtPoint(new Point(this._pos.x, this._pos.y - this._offset.y));
-		const centerIsInvisible = map.transform.lngLatToCameraDepth(this._lngLat, elevation + elevationToCenter) - terrainDistanceCenter > forgiveness;
+		const centerIsInvisible = map._camera.transform.lngLatToCameraDepth(this._lngLat, elevation + elevationToCenter) - terrainDistanceCenter > forgiveness;
 		if (this._popup?.isOpen() && centerIsInvisible) this._popup.remove();
 		this._element.style.opacity = centerIsInvisible ? this._opacityWhenCovered : this._opacity;
 		this._element.classList.toggle("maplibregl-marker-covered", centerIsInvisible);
@@ -27486,7 +27612,7 @@ var Popup = class extends Evented {
 		super();
 		this._updateOpacity = () => {
 			if (this.options.locationOccludedOpacity === void 0) return;
-			if (this._map.transform.isLocationOccluded(this.getLngLat())) this._container.style.opacity = `${this.options.locationOccludedOpacity}`;
+			if (this._map._camera.transform.isLocationOccluded(this.getLngLat())) this._container.style.opacity = `${this.options.locationOccludedOpacity}`;
 			else this._container.style.opacity = "";
 		};
 		this.remove = () => {
@@ -27523,12 +27649,12 @@ var Popup = class extends Evented {
 				if (this._trackPointer) this._container.classList.add("maplibregl-popup-track-pointer");
 			}
 			if (this.options.maxWidth && this._container.style.maxWidth !== this.options.maxWidth) this._container.style.maxWidth = this.options.maxWidth;
-			this._lngLat = smartWrap(this._lngLat, this._flatPos, this._map.transform, this._trackPointer);
+			this._lngLat = smartWrap(this._lngLat, this._flatPos, this._map._camera.transform, this._trackPointer);
 			let cursor;
 			if (event && "point" in event && event.point) cursor = event.point;
 			if (this._trackPointer && !cursor) return;
 			const pos = this._flatPos = this._pos = this._trackPointer && cursor ? cursor : this._map.project(this._lngLat);
-			if (this._map.terrain) this._flatPos = this._trackPointer && cursor ? cursor : this._map.transform.locationToScreenPoint(this._lngLat);
+			if (this._map.terrain) this._flatPos = this._trackPointer && cursor ? cursor : this._map._camera.transform.locationToScreenPoint(this._lngLat);
 			let anchor = this.options.anchor;
 			const offset = normalizeOffset(this.options.offset);
 			if (!anchor) {
@@ -27537,10 +27663,10 @@ var Popup = class extends Evented {
 				const padding = normalizePadding(this.options.padding);
 				let anchorComponents;
 				if (pos.y + offset.bottom.y < height + padding.top) anchorComponents = ["top"];
-				else if (pos.y > this._map.transform.height - height - padding.bottom) anchorComponents = ["bottom"];
+				else if (pos.y > this._map._camera.transform.height - height - padding.bottom) anchorComponents = ["bottom"];
 				else anchorComponents = [];
 				if (pos.x < width / 2 + padding.left) anchorComponents.push("left");
-				else if (pos.x > this._map.transform.width - width / 2 - padding.right) anchorComponents.push("right");
+				else if (pos.x > this._map._camera.transform.width - width / 2 - padding.right) anchorComponents.push("right");
 				if (anchorComponents.length === 0) anchor = "bottom";
 				else anchor = anchorComponents.join("-");
 			}