maplibre-gl 6.11.0 → 6.11.1

package/README.md

@@ -104,7 +104,7 @@ Silver:
 
 <a href="https://www.caltopo.com/"><img src="https://maplibre.org/img/caltopo-logo.svg" alt="Logo Caltopo" width="25%"/></a>
 
-<a href="https://www.caltopo.com/"><img src="https://maplibre.org/img/smartmaps-logo.svg" alt="Logo SmartMaps" width="25%"/></a>
+<a href="https://www.smartmaps.net/"><img src="https://maplibre.org/img/smartmaps-logo.svg" alt="Logo SmartMaps" width="25%"/></a>
 
 Backers and Supporters:
 

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.11.0/LICENSE.txt
+* @license 3-Clause BSD. Full text of license: https://github.com/maplibre/maplibre-gl-js/blob/v6.11.1/LICENSE.txt
 */
 import { $ as projectToWorldCoordinates, $n as differenceOfAnglesDegrees, $r as add, $t as Transitionable, A as evaluateSizeForZoom, Ai as rotateX, An as addProtocol, Ar as scaleZoom, At as toEvaluationFeature, B as isCluster, Bi as rotate, Bn as arrayBufferToImage, Br as EXTENT, Bt as SegmentVector, C as addDynamicAttributes, Ci as exactEquals, Cn as GLOBAL_DISPATCHER_ID, Cr as pointPlaneSignedDistance, Ct as HEATMAP_FULL_RENDER_FBO_KEY, Di as multiply, Dn as getVideo, Dr as remapSaturate, Dt as RGBAImage, E as TextAnchorEnum, Ei as invert$1, En as getReferrer, Er as readImageUsingVideoFrame, Et as AlphaImage, F as potpack, Fi as create$4, Fn as isAbortError, Fr as uniqueId, Ft as Uniform4f, Gn as createIdentityMat4f32, Gr as zero, Gt as PosArray, Hi as offscreenCanvasSupported, Hn as bezier, Hr as length$1, Ht as CollisionCircleLayoutArray, I as isStyleImageWebGLData, Ii as fromRotation, In as throwIfAborted, Ir as warnOnce, It as UniformColor, J as cameraDirectionFromPitchBearing, Jn as createVec3f64, Jr as multiply$1, Jt as TriangleIndexArray, K as isFillExtrusionStyleLayer, Kn as createIdentityMat4f64, Kr as fromEuler, Kt as QuadTriangleArray, L as renderStyleImage, Li as create$2, Lr as wrap, Lt as UniformColorArray, M as getAnchorAlignment, Mi as rotateZ, Mn as removeProtocol, Mr as subscribe, Mt as Uniform1i, Ni as scale, Nn as config, Nr as threePlaneIntersection, Nt as Uniform2f, O as clipLine, Oi as ortho, On as makeRequest, Or as rollPitchBearingEqual, Ot as isCircleStyleLayer, P as ImagePosition, Pi as translate, Pn as AbortError, Pr as translatePosition, Pt as Uniform3f, Q as maxMercatorHorizonAngle, Qn as degreesToRadians, Qr as transformMat4, Qt as Properties, R as parseGlyphPbf, Ri as determinant, Rn as MAX_VALID_LATITUDE, Rr as zoomScale, Rt as UniformFloatArray, S as SymbolBucket, Si as equals, Sn as AJAXError, Sr as pick, St as isHillshadeStyleLayer, T as getAnchorJustification, Ti as identity, Tn as getJSON, Tr as rayPlaneIntersection, Tt as renderColorRamp, U as collisionCircleLayout, Ui as Point, Un as clamp, Ur as scale$3, Ut as LineStripIndexArray, V as codePointUsesLocalIdeographFontFamily, Vi as isOffscreenCanvasDistorted, Vn as arrayBufferToImageBitmap, Vr as create$3, Vt as CollisionBoxArray, W as isLineStyleLayer, Wn as clone$2, Wr as sqrLen, Wt as Pos3dArray, X as cameraMercatorCoordinateFromCenterAndRotation, Xn as deepEqual, Xr as mul, Xt as isRasterStyleLayer, Y as cameraMercatorCoordinate, Yn as createVec4f64, Yr as slerp, Yt as createLayout, Z as getMercatorHorizon, Zn as defaultEasing, Zr as scale$2, Zt as DataConstantProperty, _ as createStyleLayer, _i as transformQuat, _n as derefLayers, _r as lerp, _t as SubdivisionGranularityExpression, a as GeoJSONFeature, ai as length, an as validateAndEmit, ar as findLineIntersection, at as lngFromMercatorX, b as isBackgroundStyleLayer, bi as copy, bn as Event, br as nextPowerOfTwo, ci as rotateX$1, cn as emptyStyle, cr as getEdgeTiles, ct as mercatorZfromAltitude, d as OverscaledTileID, di as scale$1, dr as isImageBitmap, ei as clone, en as EvaluationParameters, er as distanceOfAnglesRadians, et as tileCoordinatesToMercatorCoordinates, f as UnwrappedTileID, fi as scaleAndAdd, fn as interpolateFactory, fr as isPointableEvent, ft as EXTENT_BOUNDS, g as Actor, gi as transformMat4$1, gn as diff, gr as isWorker, gt as SOUTH_POLE_Y, h as isInBoundsForZoomLngLat, hi as transformMat3, hn as ValidationError, hr as isTouchableOrPointableType, ht as NORTH_POLE_Y, ii as len, in as emitValidationErrors, ir as filterObject, it as latFromMercatorY, ji as rotateY$1, jn as getProtocol, jr as sphericalToCartesian, jt as Uniform1f, k as evaluateSizeForFeature, ki as perspective, kn as sameOrigin, kr as rollPitchBearingToQuat, kt as polygonIntersectsPolygon, li as rotateY, lt as LngLat, m as compareTileId, mi as subtract, mn as Color, mr as isTouchableEvent, mt as isFillStyleLayer, n as TileCache, ni as distance, nr as evaluateZoomSnap, nt as MercatorCoordinate, oi as negate, on as validateStyle, or as getAABB, ot as mercatorXfromLng, p as calculateTileKey, pi as sub, pn as ProjectionDefinition, pr as isSafari, pt as Bounds, q as calculateTileMatrix, qn as createMat4f64, qr as fromValues, qt as RasterBoundsArray, ri as dot, rn as SPEC_SOURCE_TYPES, rr as extend, rt as altitudeFromMercatorZ, s as GEOJSON_TILE_LAYER_NAME, si as normalize, sn as validateStyleAndEmit, sr as getAngleDelta, st as mercatorYfromLat, ti as cross, tn as ZoomHistory, tr as ensureError, tt as unprojectFromWorldCoordinates, u as CanonicalTileID, ui as rotateZ$1, un as featureFilter, ur as getRollPitchBearing, ut as earthRadius, v as isCustomStyleLayer, vi as zero$1, vn as latest, vr as mapObject, vt as SubdivisionGranularitySetting, w as getOverlapMode, wi as fromScaling, wn as getArrayBuffer, wr as radiansToDegrees, wt as isHeatmapStyleLayer, x as isSymbolStyleLayer, xi as create$1, xn as Evented, xr as parseCacheControl, xt as Texture, y as validateCustomStyleLayer, yi as clone$1, yn as ErrorEvent, yr as mod, yt as isColorReliefStyleLayer, zi as invert, zn as angleToRotateBetweenVectors2D, zr as pixelsToTileUnits, zt as UniformMatrix4f } from "./maplibre-gl-shared-dev.mjs";
 //#region package.json
-var version$2 = "6.11.0";
+var version$2 = "6.11.1";
 //#endregion
 //#region src/util/browser.ts
 let linkEl;
@@ -198,6 +198,92 @@ function isTimeFrozen() {
 }
 //#endregion
 //#region src/util/dom.ts
+const HTML_NAMESPACE = "http://www.w3.org/1999/xhtml";
+const ALLOWED_TAGS = /* @__PURE__ */ new Set([
+	"a",
+	"abbr",
+	"b",
+	"bdi",
+	"bdo",
+	"br",
+	"cite",
+	"code",
+	"del",
+	"div",
+	"em",
+	"i",
+	"img",
+	"ins",
+	"kbd",
+	"li",
+	"mark",
+	"ol",
+	"p",
+	"q",
+	"s",
+	"samp",
+	"small",
+	"span",
+	"strong",
+	"sub",
+	"sup",
+	"time",
+	"u",
+	"ul",
+	"var",
+	"wbr"
+]);
+const ALLOWED_ATTRIBUTES = /* @__PURE__ */ new Set([
+	"alt",
+	"class",
+	"datetime",
+	"dir",
+	"height",
+	"href",
+	"hreflang",
+	"lang",
+	"referrerpolicy",
+	"rel",
+	"role",
+	"src",
+	"target",
+	"title",
+	"translate",
+	"type",
+	"width"
+]);
+const URL_ATTRIBUTES = /* @__PURE__ */ new Set(["href", "src"]);
+const ALLOWED_PROTOCOLS = /* @__PURE__ */ new Set([
+	"http:",
+	"https:",
+	"mailto:"
+]);
+/**
+* Relative URLs have to resolve against something before their protocol can be read. Only the protocol of the
+* result is used, so the base never leaks into the sanitized markup.
+*/
+const RELATIVE_URL_BASE = "https://maplibre.invalid/";
+let elementInternals;
+/**
+* The `Element` members the sanitizer uses, read off the prototype rather than off the element it is looking at.
+* A form control named `children`, `remove` or `localName` shadows the same-named property of its own form element,
+* which would otherwise let untrusted markup pick what the sanitizer walking that tree sees.
+*
+* They are read on first use rather than when this module is loaded, since the module is also imported where there
+* is no DOM at all, such as during server side rendering.
+*/
+function getElementInternals() {
+	elementInternals ??= {
+		getAttribute: Element.prototype.getAttribute,
+		getAttributeNames: Element.prototype.getAttributeNames,
+		querySelectorAll: Element.prototype.querySelectorAll,
+		remove: Element.prototype.remove,
+		removeAttribute: Element.prototype.removeAttribute,
+		localName: Object.getOwnPropertyDescriptor(Element.prototype, "localName").get,
+		namespaceURI: Object.getOwnPropertyDescriptor(Element.prototype, "namespaceURI").get
+	};
+	return elementInternals;
+}
 var DOM = class DOM {
 	static {
 		this.docStyle = typeof window !== "undefined" && window.document?.documentElement.style;
@@ -257,55 +343,54 @@ var DOM = class DOM {
 		return points;
 	}
 	/**
-	* Sanitize an HTML string - this might not be enough to prevent all XSS attacks
-	* Base on https://javascriptsource.com/sanitize-an-html-string-to-reduce-the-risk-of-xss-attacks/
-	* (c) 2021 Chris Ferdinandi, MIT License, https://gomakethings.com
+	* Sanitize an untrusted HTML string, such as the attribution a remote TileJSON asks the map to display.
+	*
+	* Only the elements in `ALLOWED_TAGS` and the attributes in `ALLOWED_ATTRIBUTES` survive; anything else is
+	* dropped along with its subtree. An allow list is used rather than a list of known-dangerous markup because
+	* the latter silently permits whatever it has not heard of yet, including markup added to HTML after it was
+	* written.
 	*
-	* Returns the sanitized nodes rather than a string, since re-parsing serialized HTML can produce a different tree.
+	* The sanitized nodes are returned rather than a string: serializing and re-parsing is not a round trip, so
+	* a string result lets carefully nested markup mutate into a different - and no longer sanitized - tree.
 	*/
 	static sanitize(str) {
-		const html = new DOMParser().parseFromString(str, "text/html").body || document.createElement("body");
-		const dangerousElements = html.querySelectorAll("script, iframe");
-		for (const element of dangerousElements) element.remove();
-		DOM.clean(html);
+		const body = new DOMParser().parseFromString(str, "text/html").body;
+		const { querySelectorAll, remove } = getElementInternals();
+		for (const element of Array.from(querySelectorAll.call(body, "*"))) if (DOM.isAllowedElement(element)) DOM.removeDisallowedAttributes(element);
+		else remove.call(element);
 		const fragment = document.createDocumentFragment();
-		fragment.append(...html.childNodes);
+		fragment.append(...body.childNodes);
 		return fragment;
 	}
 	/**
-	* Check if the attribute is potentially dangerous
+	* An element is allowed only when it is plain HTML markup on the allow list. Elements in the SVG and MathML
+	* namespaces are rejected even when their local name is allowed, since foreign content follows different
+	* parsing rules and is what makes most mutation attacks possible in the first place.
 	*/
-	static isPossiblyDangerous(name, value) {
-		const val = value.replace(/\s+/g, "").toLowerCase();
-		if ([
-			"src",
-			"href",
-			"xlink:href"
-		].includes(name)) {
-			if (val.includes("javascript:") || val.includes("data:")) return true;
-		}
-		if (name === "srcdoc") return true;
-		if (name.startsWith("on")) return true;
+	static isAllowedElement(element) {
+		const { namespaceURI, localName } = getElementInternals();
+		return namespaceURI.call(element) === HTML_NAMESPACE && ALLOWED_TAGS.has(localName.call(element));
 	}
-	/**
-	* Remove dangerous stuff from the HTML document's nodes
-	* @param html - The HTML document
-	*/
-	static clean(html) {
-		const nodes = html.children;
-		for (const node of nodes) {
-			DOM.removeAttributes(node);
-			DOM.clean(node);
+	static removeDisallowedAttributes(element) {
+		const { getAttributeNames, getAttribute, removeAttribute } = getElementInternals();
+		for (const name of getAttributeNames.call(element)) {
+			if (DOM.isAllowedAttribute(name, getAttribute.call(element, name))) continue;
+			removeAttribute.call(element, name);
 		}
 	}
 	/**
-	* Remove potentially dangerous attributes from an element
-	* @param elem - The element
+	* `href` and `src` are further restricted to the protocols in `ALLOWED_PROTOCOLS`, so that `javascript:` and
+	* `data:` URLs cannot turn an otherwise harmless link or image into a script. The protocol is taken from a
+	* parsed URL rather than matched against the raw string, since the URL parser is what the browser will apply
+	* and it ignores tabs, newlines and leading control characters that a string comparison would trip over.
 	*/
-	static removeAttributes(elem) {
-		for (const { name, value } of Array.from(elem.attributes)) {
-			if (!DOM.isPossiblyDangerous(name, value)) continue;
-			elem.removeAttribute(name);
+	static isAllowedAttribute(name, value) {
+		if (!ALLOWED_ATTRIBUTES.has(name) && !name.startsWith("aria-")) return false;
+		if (!URL_ATTRIBUTES.has(name)) return true;
+		try {
+			return ALLOWED_PROTOCOLS.has(new URL(value, RELATIVE_URL_BASE).protocol);
+		} catch {
+			return false;
 		}
 	}
 };
@@ -2963,6 +3048,7 @@ var VectorTileSource = class extends Evented {
 		};
 		params.request.collectResourceTiming = this._collectResourceTiming;
 		await this.dispatcher.waitForInitComplete();
+		if (tile.aborted) return;
 		let messageType = "RT";
 		if (!tile.actor || tile.state === "expired") {
 			tile.actor = this.dispatcher.getReadyActor();
@@ -3474,18 +3560,13 @@ function applySourceDiff(updateable, diff, promoteId) {
 /**
 * Merge two GeoJSONSourceDiffs, considering the order of operations as specified above (remove, add, update).
 *
-* For `add` features that use promoteId, the feature id will be set to the promoteId value temporarily so that
-* the merge can be completed, then reverted to the original promoteId state after the merge.
+* `add` features of a promoteId source carry their id in a property, so `promoteId` is needed to key them.
 */
 function mergeSourceDiffs(prevDiff, nextDiff, promoteId) {
 	if (!prevDiff) return nextDiff || {};
 	if (!nextDiff) return prevDiff || {};
-	if (promoteId) {
-		promoteFeatureIds(prevDiff.add, promoteId);
-		promoteFeatureIds(nextDiff.add, promoteId);
-	}
-	const prev = diffToHashed(prevDiff);
-	const next = diffToHashed(nextDiff);
+	const prev = diffToHashed(prevDiff, promoteId);
+	const next = diffToHashed(nextDiff, promoteId);
 	resolveMergeConflicts(prev, next);
 	const merged = {};
 	if (prev.removeAll || next.removeAll) merged.removeAll = true;
@@ -3493,9 +3574,7 @@ function mergeSourceDiffs(prevDiff, nextDiff, promoteId) {
 	merged.add = new Map([...prev.add, ...next.add]);
 	merged.update = new Map([...prev.update, ...next.update]);
 	if (merged.remove.size && merged.add.size) for (const id of merged.add.keys()) merged.remove.delete(id);
-	const mergedDiff = hashedToDiff(merged);
-	if (promoteId) demoteFeatureIds(mergedDiff.add, promoteId);
-	return mergedDiff;
+	return hashedToDiff(merged);
 }
 /**
 * Resolve merge conflicts between two GeoJSONSourceDiffs considering the ordering above (remove/add/update).
@@ -3542,32 +3621,16 @@ function mergeFeatureDiffs(prev, next) {
 	return merged;
 }
 /**
-* Mutates diff.add and applies a feature id using the promoteId property
-*/
-function promoteFeatureIds(add, promoteId) {
-	if (!add) return;
-	for (const feature of add) {
-		const id = getFeatureId(feature, promoteId);
-		if (id != null) feature.id = id;
-	}
-}
-/**
-* Mutates diff.add and removes the feature id if using the promoteId property
-*/
-function demoteFeatureIds(add, promoteId) {
-	if (!add) return;
-	for (const feature of add) if (getFeatureId(feature, promoteId) != null) delete feature.id;
-}
-/**
 * @internal
 * Convert a GeoJSONSourceDiff to an idempotent hashed representation using Sets and Maps
+* @param promoteId - If set, `add` features are keyed by that property instead of by `id`.
 */
-function diffToHashed(diff) {
+function diffToHashed(diff, promoteId) {
 	if (!diff) return {};
 	const hashed = {};
 	hashed.removeAll = diff.removeAll;
 	hashed.remove = new Set(diff.remove || []);
-	hashed.add = new Map(diff.add?.map((feature) => [feature.id, feature]));
+	hashed.add = new Map(diff.add?.map((feature) => [getFeatureId(feature, promoteId), feature]));
 	hashed.update = new Map(diff.update?.map((update) => [update.id, update]));
 	return hashed;
 }
@@ -3718,7 +3781,7 @@ var GeoJSONSource = class extends Evented {
 				maxZoom: this.maxzoom,
 				lineMetrics: options.lineMetrics || false,
 				generateId: options.generateId || false,
-				promoteId: typeof options.promoteId === "string" ? options.promoteId : void 0,
+				promoteId: this._promoteIdKey,
 				cluster: options.cluster || false,
 				clusterOptions: {
 					maxZoom: this._getClusterMaxZoom(options.clusterMaxZoom),
@@ -3733,6 +3796,10 @@ var GeoJSONSource = class extends Evented {
 			filter: options.filter
 		}, options.workerOptions);
 	}
+	/** The `promoteId` property name, when it is a plain string. */
+	get _promoteIdKey() {
+		return typeof this.promoteId === "string" ? this.promoteId : void 0;
+	}
 	_hasPendingWorkerUpdate() {
 		return this._pendingWorkerUpdate.data !== void 0 || this._pendingWorkerUpdate.diff !== void 0 || this._pendingWorkerUpdate.updateCluster;
 	}
@@ -3779,7 +3846,7 @@ var GeoJSONSource = class extends Evented {
 	* @param diff - The changes that need to be applied.
 	*/
 	updateData(diff) {
-		this._pendingWorkerUpdate.diff = mergeSourceDiffs(this._pendingWorkerUpdate.diff, diff);
+		this._pendingWorkerUpdate.diff = mergeSourceDiffs(this._pendingWorkerUpdate.diff, diff, this._promoteIdKey);
 		return this._updateWorkerData();
 	}
 	/**
@@ -4011,7 +4078,7 @@ var GeoJSONSource = class extends Evented {
 	*/
 	_applyDiffToSource(diff) {
 		if (!diff) return;
-		const promoteId = typeof this.promoteId === "string" ? this.promoteId : void 0;
+		const promoteId = this._promoteIdKey;
 		if (!this._data.url && !this._data.updateable) {
 			const updateable = toUpdateable(this._data.geojson, promoteId);
 			if (!updateable) throw new Error(`GeoJSONSource "${this.id}": GeoJSON data is not compatible with updateData`);
@@ -22544,7 +22611,10 @@ var HandlerManager = class {
 		return this._el?.ownerDocument?.defaultView || window;
 	}
 	constructor(map, camera, options) {
-		this._terrainGestureAnchorElevation = null;
+		this._terrainGesture = {
+			inFlight: false,
+			anchorElevation: null
+		};
 		this.handleWindowEvent = (e) => {
 			this.handleEvent(e, `${e.type}Window`);
 		};
@@ -22729,7 +22799,7 @@ var HandlerManager = class {
 		const touchPitch = map.touchPitch = new TwoFingersTouchPitchHandler(map);
 		this._add("touchPitch", touchPitch);
 		if (options.interactive && options.touchPitch) map.touchPitch.enable(options.touchPitch);
-		const getCenter = () => map.project(map.getCenter());
+		const getCenter = () => this._camera.transform.centerPoint;
 		const mouseRotate = generateMouseRotationHandler(options, getCenter);
 		const mousePitch = generateMousePitchHandler(options);
 		const mouseRoll = generateMouseRollHandler(options, getCenter);
@@ -22833,14 +22903,18 @@ var HandlerManager = class {
 		this._updateMapTransform(combined, combinedEventsInProgress, combinedDeactivatedHandlers);
 		this._changes = [];
 	}
+	/**
+	* Applies a frame's combined handler deltas to the requested camera state and fires the movement
+	* events. A frame without a change only fires the events and takes no requested camera state, so a
+	* trailing frame that merely ends a handler leaves none behind for the next gesture to start from.
+	*/
 	_updateMapTransform(combinedResult, combinedEventsInProgress, deactivatedHandlers) {
-		const map = this._map;
-		const tr = this._camera.getTransformForUpdate();
-		const terrain = map.terrain;
-		if (!hasChange(combinedResult) && !(terrain && this._terrainMovement)) {
+		const terrain = this._map.terrain;
+		if (!hasChange(combinedResult)) {
 			this._fireEvents(combinedEventsInProgress, deactivatedHandlers, true);
 			return;
 		}
+		const tr = this._camera.getTransformForUpdate();
 		this._camera.stop(true);
 		const { panDelta, zoomDelta, bearingDelta, pitchDelta, rollDelta } = combinedResult;
 		let { around, aroundOnSurface } = this._resolveAround(combinedResult, terrain, tr);
@@ -22895,12 +22969,12 @@ var HandlerManager = class {
 	*/
 	_terrainGestureElevation(terrain, around, aroundOnSurface, tr, combinedEventsInProgress) {
 		if (!aroundOnSurface) return;
-		if (!this._terrainMovement && (combinedEventsInProgress.drag || combinedEventsInProgress.zoom)) {
+		if (this._terrainGesture.anchorElevation === null && (combinedEventsInProgress.drag || combinedEventsInProgress.zoom)) {
 			const anchor = tr.screenTerrainPointToMercatorCoordinate(around, terrain);
-			this._terrainGestureAnchorElevation = anchor ? anchor.z : null;
+			this._terrainGesture.anchorElevation = anchor ? anchor.z : void 0;
 		}
-		if (this._terrainGestureAnchorElevation === null) return;
-		const elevation = this._terrainGestureAnchorElevation;
+		const elevation = this._terrainGesture.anchorElevation;
+		if (elevation === null || elevation === void 0) return;
 		if (around.distSqr(tr.centerPoint) < .01) return;
 		if (elevation - tr.elevation >= TERRAIN_ANCHOR_MAX_CAMERA_ALTITUDE_FRACTION * (tr.getCameraAltitude() - tr.elevation)) return;
 		return elevation;
@@ -22924,21 +22998,13 @@ var HandlerManager = class {
 			cameraHelper.handleMapControlsPan(deltasForHelper, tr, preZoomAroundLoc);
 			return;
 		}
-		if (cameraHelper.useGlobeControls) {
-			if (!this._terrainMovement && (combinedEventsInProgress.drag || combinedEventsInProgress.zoom)) {
-				this._terrainMovement = true;
-				this._camera.elevationFreeze = true;
-			}
-			cameraHelper.handleMapControlsPan(deltasForHelper, tr, preZoomAroundLoc);
-			return;
-		}
-		if (!this._terrainMovement && (combinedEventsInProgress.drag || combinedEventsInProgress.zoom)) {
-			this._terrainMovement = true;
+		if (!this._terrainGesture.inFlight) {
+			this._terrainGesture.inFlight = true;
 			this._camera.elevationFreeze = true;
 			cameraHelper.handleMapControlsPan(deltasForHelper, tr, preZoomAroundLoc);
 			return;
 		}
-		if (deltasForHelper.aroundElevation === void 0 && combinedEventsInProgress.drag && this._terrainMovement && panDelta) {
+		if (!cameraHelper.useGlobeControls && deltasForHelper.aroundElevation === void 0 && combinedEventsInProgress.drag && panDelta) {
 			tr.setCenter(tr.screenPointToLocation(tr.centerPoint.sub(panDelta)));
 			return;
 		}
@@ -22973,10 +23039,12 @@ var HandlerManager = class {
 		for (const name in endEvents) this._fireEvent(name, endEvents[name]);
 		const stillMoving = isMoving(this._eventsInProgress);
 		const finishedMoving = (wasMoving || nowMoving) && !stillMoving;
-		if (finishedMoving && this._terrainMovement) {
+		if (finishedMoving && this._terrainGesture.inFlight) {
 			this._camera.elevationFreeze = false;
-			this._terrainMovement = false;
-			this._terrainGestureAnchorElevation = null;
+			this._terrainGesture = {
+				inFlight: false,
+				anchorElevation: null
+			};
 			const tr = this._camera.getTransformForUpdate();
 			if (this._map.getCenterClampedToGround()) tr.recalculateZoomAndCenter(this._map.terrain);
 			this._camera.applyUpdatedTransform(tr);
@@ -22990,14 +23058,19 @@ var HandlerManager = class {
 				inertialEase.freezeElevation = true;
 				this._map.easeTo(inertialEase, { originalEvent: originalEndEvent });
 			} else {
-				this._map.fire(new MapMovementEvent("moveend", { originalEvent: originalEndEvent }));
+				this._fireEvent("moveend", originalEndEvent);
 				if (shouldSnapToNorth(this._map.getBearing())) this._map.resetNorth();
 			}
 			this._updatingCamera = false;
 		}
 	}
+	/**
+	* Fires a movement event through the camera, whose evented parent is the map: the map's listeners
+	* see the event as before, and the camera's own `moveend` listener drops the requested camera state,
+	* so the next gesture starts from the rendered transform instead of the state this one ended in.
+	*/
 	_fireEvent(type, e) {
-		this._map.fire(new MapMovementEvent(type, e ? { originalEvent: e } : {}));
+		this._camera.fire(new MapMovementEvent(type, e ? { originalEvent: e } : {}));
 	}
 	_requestFrame() {
 		this._map.triggerRepaint();
@@ -23044,6 +23117,15 @@ var Camera = class extends Evented {
 			delete this._requestedCameraState;
 		});
 	}
+	/**
+	* @internal
+	* Hands the camera the map's terrain, or null when the map has none, and brings the center
+	* elevation up to date with it, see {@link Camera.applyTerrainChange}.
+	*/
+	setTerrain(terrain) {
+		this.terrain = terrain;
+		this.applyTerrainChange();
+	}
 	migrateProjection(newTransform, newCameraHelper) {
 		newTransform.apply(this.transform, true);
 		this.transform = newTransform;
@@ -23348,6 +23430,7 @@ var Camera = class extends Evented {
 			this._fireMoveEvents(eventData);
 		}, (interruptingEaseId) => {
 			if (this.terrain && options.freezeElevation) this._finalizeElevation();
+			else this.elevationFreeze = false;
 			this._afterEase(eventData, interruptingEaseId);
 		}, options);
 		return this;
@@ -23384,6 +23467,23 @@ var Camera = class extends Evented {
 	}
 	/**
 	* @internal
+	* Applies a change of the terrain under the center to the transform: the terrain was set or
+	* removed, or a DEM tile landed. The center keeps its place and the camera moves with the
+	* center's elevation, as it does on every rendered frame while nothing holds the elevation.
+	* While a gesture or an ease holds it this does nothing: the camera stays where the user put
+	* it and the hold's end re-solves zoom and center onto the new terrain without moving it.
+	* Nothing is in flight when this writes, so it writes the rendered transform, like the
+	* per-frame clamp; a requested camera state created here would outlive the call and the
+	* next gesture would start from it.
+	*/
+	applyTerrainChange() {
+		if (this.elevationFreeze) return;
+		const tr = this.transform;
+		tr.setMinElevationForCurrentTile(this.terrain ? this.terrain.getMinTileElevationForLngLatZoom(tr.center, tr.tileZoom) : 0);
+		if (this.getCenterClampedToGround()) tr.setElevation(this.terrain ? this.terrain.getElevationForLngLat(tr.center, tr) : 0);
+	}
+	/**
+	* @internal
 	* Called when the camera is about to be manipulated.
 	* If `transformCameraUpdate` is specified or terrain is enabled, a copy of
 	* the current transform is created to track the accumulated changes.
@@ -23583,6 +23683,7 @@ var Camera = class extends Evented {
 			this._fireMoveEvents(eventData);
 		}, () => {
 			if (this.terrain && options.freezeElevation) this._finalizeElevation();
+			else this.elevationFreeze = false;
 			this._afterEase(eventData);
 		}, options);
 		return this;
@@ -26155,9 +26256,7 @@ var Map$1 = class extends Evented {
 			this.terrain = null;
 			this.painter.renderToTexture = null;
 			this.painter.destroyRTTResources();
-			this._camera.terrain = null;
-			this._camera.transform.setMinElevationForCurrentTile(0);
-			if (this.getCenterClampedToGround()) this._camera.transform.setElevation(0);
+			this._camera.setTerrain(null);
 		} 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}`);
@@ -26170,9 +26269,7 @@ var Map$1 = class extends Evented {
 			if (this.terrain) this.terrain.destroy();
 			this.terrain = new Terrain(this.painter, tileManager, options, this._terrainSkirtLength);
 			this.painter.renderToTexture = new RenderToTexture(this.painter, this.terrain);
-			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.getElevationForLngLat(this._camera.transform.center, this._camera.transform));
+			this._camera.setTerrain(this.terrain);
 			this._terrainDataCallback = (e) => this._handleTerrainDataEvent(e, options.source);
 			this.style.on("data", this._terrainDataCallback);
 		}
@@ -26190,10 +26287,9 @@ var Map$1 = class extends Evented {
 			this.terrain.resetElevationCache();
 			this.style.triggerSymbolPlacement();
 		}
-		if (isTerrainSourceEvent && event.tile) this.painter.markTerrainDepthDirty();
-		if (isTerrainSourceEvent && event.tile && !this._camera.elevationFreeze) {
-			this._camera.transform.setMinElevationForCurrentTile(this.terrain.getMinTileElevationForLngLatZoom(this._camera.transform.center, this._camera.transform.tileZoom));
-			if (this.getCenterClampedToGround()) this._camera.transform.setElevation(this.terrain.getElevationForLngLat(this._camera.transform.center, this._camera.transform));
+		if (isTerrainSourceEvent && event.tile) {
+			this.painter.markTerrainDepthDirty();
+			this._camera.applyTerrainChange();
 		}
 		if (!event.tile) return;
 		if (event.source?.type === "image") {