maplibre-gl 2.2.0-pre.3 → 2.2.1

package/dist/maplibre-gl.d.ts

@@ -1,4 +1,4 @@
-// Generated by dts-bundle-generator v6.9.0
+// Generated by dts-bundle-generator v6.12.0
 
 import Point from '@mapbox/point-geometry';
 import TinySDF from '@mapbox/tiny-sdf';
@@ -74,7 +74,7 @@ export declare class AJAXError extends Error {
 }
 export declare type ExpiryData = {
 	cacheControl?: string | null;
-	expires?: string | null;
+	expires?: Date | string | null;
 };
 export declare type GetImageCallback = (error?: Error | null, image?: HTMLImageElement | ImageBitmap | null, expiry?: ExpiryData | null) => void;
 export declare type ResourceTypeEnum = keyof IResourceType;
@@ -188,103 +188,406 @@ export declare class ZoomHistory {
 	update(z: number, now: number): boolean;
 }
 export declare type ColorSpecification = string;
+export declare type PaddingSpecification = number | number[];
 export declare type FormattedSpecification = string;
 export declare type ResolvedImageSpecification = string;
 export declare type PromoteIdSpecification = {
 	[_: string]: string;
 } | string;
-export declare type FilterSpecificationInputType = string | number | boolean;
-export declare type FilterSpecification = [
+export declare type ExpressionInputType = string | number | boolean;
+export declare type CollatorExpressionSpecification = [
+	"collator",
+	{
+		"case-sensitive"?: boolean | ExpressionSpecification;
+		"diacritic-sensitive"?: boolean | ExpressionSpecification;
+		locale?: string | ExpressionSpecification;
+	}
+];
+export declare type InterpolationSpecification = [
+	"linear"
+] | [
+	"exponential",
+	number | ExpressionSpecification
+] | [
+	"cubic-bezier",
+	number | ExpressionSpecification,
+	number | ExpressionSpecification,
+	number | ExpressionSpecification,
+	number | ExpressionSpecification
+];
+export declare type ExpressionSpecification = [
+	"array",
+	unknown | ExpressionSpecification
+] | [
+	"array",
+	ExpressionInputType | ExpressionSpecification,
+	unknown | ExpressionSpecification
+] | [
+	"array",
+	ExpressionInputType | ExpressionSpecification,
+	number | ExpressionSpecification,
+	unknown | ExpressionSpecification
+] | [
+	"boolean",
+	...(unknown | ExpressionSpecification)[],
+	unknown | ExpressionSpecification
+] | CollatorExpressionSpecification | [
+	"format",
+	...(string | [
+		"image",
+		ExpressionSpecification
+	] | ExpressionSpecification | {
+		"font-scale"?: number | ExpressionSpecification;
+		"text-font"?: string[] | ExpressionSpecification;
+		"text-color": ColorSpecification | ExpressionSpecification;
+	})[]
+] | [
+	"image",
+	unknown | ExpressionSpecification
+] | [
+	"literal",
+	unknown
+] | [
+	"number",
+	unknown | ExpressionSpecification,
+	...(unknown | ExpressionSpecification)[]
+] | [
+	"number-format",
+	number | ExpressionSpecification,
+	{
+		"locale"?: string | ExpressionSpecification;
+		"currency"?: string | ExpressionSpecification;
+		"min-fraction-digits"?: number | ExpressionSpecification;
+		"max-fraction-digits"?: number | ExpressionSpecification;
+	}
+] | [
+	"object",
+	unknown | ExpressionSpecification,
+	...(unknown | ExpressionSpecification)[]
+] | [
+	"string",
+	unknown | ExpressionSpecification,
+	...(unknown | ExpressionSpecification)[]
+] | [
+	"to-boolean",
+	unknown | ExpressionSpecification
+] | [
+	"to-color",
+	unknown | ExpressionSpecification,
+	...(unknown | ExpressionSpecification)[]
+] | [
+	"to-number",
+	unknown | ExpressionSpecification,
+	...(unknown | ExpressionSpecification)[]
+] | [
+	"to-string",
+	unknown | ExpressionSpecification
+] | [
+	"accumulated"
+] | [
+	"feature-state",
+	string
+] | [
+	"geometry-type"
+] | [
+	"id"
+] | [
+	"line-progress"
+] | [
+	"properties"
+] | [
 	"at",
-	number,
-	(number | string)[]
+	number | ExpressionSpecification,
+	ExpressionSpecification
 ] | [
 	"get",
-	string,
-	Record<string, unknown>?
+	string | ExpressionSpecification,
+	(Record<string, unknown> | ExpressionSpecification)?
 ] | [
 	"has",
-	string,
-	Record<string, unknown>?
+	string | ExpressionSpecification,
+	(Record<string, unknown> | ExpressionSpecification)?
 ] | [
 	"in",
-	...FilterSpecificationInputType[],
-	FilterSpecificationInputType | FilterSpecificationInputType[]
+	ExpressionInputType | ExpressionSpecification,
+	ExpressionInputType | ExpressionSpecification
 ] | [
 	"index-of",
-	FilterSpecificationInputType,
-	FilterSpecificationInputType | FilterSpecificationInputType[]
+	ExpressionInputType | ExpressionSpecification,
+	ExpressionInputType | ExpressionSpecification
 ] | [
 	"length",
-	string | string[]
+	string | ExpressionSpecification
 ] | [
 	"slice",
-	string | string[],
-	number
+	string | ExpressionSpecification,
+	number | ExpressionSpecification
 ] | [
 	"!",
-	FilterSpecification
+	boolean | ExpressionSpecification
 ] | [
 	"!=",
-	string | FilterSpecification,
-	FilterSpecificationInputType
+	ExpressionInputType | ExpressionSpecification,
+	ExpressionInputType | ExpressionSpecification,
+	CollatorExpressionSpecification?
 ] | [
 	"<",
-	string | FilterSpecification,
-	FilterSpecificationInputType
+	ExpressionInputType | ExpressionSpecification,
+	ExpressionInputType | ExpressionSpecification,
+	CollatorExpressionSpecification?
 ] | [
 	"<=",
-	string | FilterSpecification,
-	FilterSpecificationInputType
+	ExpressionInputType | ExpressionSpecification,
+	ExpressionInputType | ExpressionSpecification,
+	CollatorExpressionSpecification?
 ] | [
 	"==",
-	string | FilterSpecification,
-	FilterSpecificationInputType
+	ExpressionInputType | ExpressionSpecification,
+	ExpressionInputType | ExpressionSpecification,
+	CollatorExpressionSpecification?
 ] | [
 	">",
-	string | FilterSpecification,
-	FilterSpecificationInputType
+	ExpressionInputType | ExpressionSpecification,
+	ExpressionInputType | ExpressionSpecification,
+	CollatorExpressionSpecification?
 ] | [
 	">=",
-	string | FilterSpecification,
-	FilterSpecificationInputType
+	ExpressionInputType | ExpressionSpecification,
+	ExpressionInputType | ExpressionSpecification,
+	CollatorExpressionSpecification?
 ] | [
 	"all",
-	...FilterSpecification[],
-	FilterSpecificationInputType
+	...(boolean | ExpressionSpecification)[]
 ] | [
 	"any",
-	...FilterSpecification[],
-	FilterSpecificationInputType
+	...(boolean | ExpressionSpecification)[]
 ] | [
 	"case",
-	...FilterSpecification[],
-	FilterSpecificationInputType
+	boolean | ExpressionSpecification,
+	ExpressionInputType | ExpressionSpecification,
+	...(boolean | ExpressionInputType | ExpressionSpecification)[],
+	ExpressionInputType | ExpressionSpecification
 ] | [
 	"coalesce",
-	...FilterSpecification[],
-	FilterSpecificationInputType
+	ExpressionInputType | ExpressionSpecification,
+	ExpressionInputType | ExpressionSpecification,
+	...(ExpressionInputType | ExpressionSpecification)[]
 ] | [
 	"match",
-	...FilterSpecification[],
-	FilterSpecificationInputType
+	ExpressionInputType | ExpressionSpecification,
+	ExpressionInputType | ExpressionInputType[],
+	ExpressionInputType | ExpressionSpecification,
+	...(ExpressionInputType | ExpressionInputType[] | ExpressionSpecification)[],
+	ExpressionInputType
 ] | [
 	"within",
-	...FilterSpecification[],
-	FilterSpecificationInputType
+	unknown | ExpressionSpecification
 ] | [
-	"!in",
-	...FilterSpecification[],
-	FilterSpecificationInputType
+	"interpolate",
+	InterpolationSpecification,
+	number | ExpressionSpecification,
+	number | ExpressionSpecification,
+	ExpressionInputType | ExpressionSpecification,
+	...(number | ExpressionInputType | ExpressionSpecification)[]
+] | [
+	"interpolate-hcl",
+	InterpolationSpecification,
+	number | ExpressionSpecification,
+	number | ExpressionSpecification,
+	ExpressionInputType | ExpressionSpecification,
+	...(number | ColorSpecification | ExpressionSpecification)[]
+] | [
+	"interpolate-lab",
+	InterpolationSpecification,
+	number | ExpressionSpecification,
+	number | ExpressionSpecification,
+	ExpressionInputType | ExpressionSpecification,
+	...(number | ColorSpecification | ExpressionSpecification)[]
+] | [
+	"step",
+	number | ExpressionSpecification,
+	number | ExpressionSpecification,
+	ExpressionInputType | ExpressionSpecification,
+	...(number | ExpressionInputType | ExpressionSpecification)[]
+] | [
+	"let",
+	string,
+	ExpressionInputType | ExpressionSpecification,
+	...(string | ExpressionInputType | ExpressionSpecification)[]
+] | [
+	"var",
+	string
+] | [
+	"concat",
+	ExpressionInputType | ExpressionSpecification,
+	ExpressionInputType | ExpressionSpecification,
+	...(ExpressionInputType | ExpressionSpecification)[]
+] | [
+	"downcase",
+	string | ExpressionSpecification
+] | [
+	"is-supported-script",
+	string | ExpressionSpecification
+] | [
+	"resolved-locale",
+	CollatorExpressionSpecification
+] | [
+	"upcase",
+	string | ExpressionSpecification
+] | [
+	"rgb",
+	number | ExpressionSpecification,
+	number | ExpressionSpecification,
+	number | ExpressionSpecification
+] | [
+	"rgba",
+	number | ExpressionSpecification,
+	number | ExpressionSpecification,
+	number | ExpressionSpecification,
+	number | ExpressionSpecification
+] | [
+	"to-rgba",
+	ColorSpecification | ExpressionSpecification
+] | [
+	"-",
+	number | ExpressionSpecification,
+	(number | ExpressionSpecification)?
+] | [
+	"*",
+	number | ExpressionSpecification,
+	number | ExpressionSpecification,
+	...(number | ExpressionSpecification)[]
+] | [
+	"/",
+	number | ExpressionSpecification,
+	number | ExpressionSpecification
+] | [
+	"%",
+	number | ExpressionSpecification,
+	number | ExpressionSpecification
+] | [
+	"^",
+	number | ExpressionSpecification,
+	number | ExpressionSpecification
+] | [
+	"+",
+	number | ExpressionSpecification,
+	number | ExpressionSpecification,
+	...(number | ExpressionSpecification)[]
+] | [
+	"abs",
+	number | ExpressionSpecification
+] | [
+	"acos",
+	number | ExpressionSpecification
+] | [
+	"asin",
+	number | ExpressionSpecification
+] | [
+	"atan",
+	number | ExpressionSpecification
+] | [
+	"ceil",
+	number | ExpressionSpecification
+] | [
+	"cos",
+	number | ExpressionSpecification
+] | [
+	"distance",
+	Record<string, unknown> | ExpressionSpecification
+] | [
+	"ExpressionSpecification"
+] | [
+	"floor",
+	number | ExpressionSpecification
+] | [
+	"ln",
+	number | ExpressionSpecification
+] | [
+	"ln2"
+] | [
+	"log10",
+	number | ExpressionSpecification
+] | [
+	"log2",
+	number | ExpressionSpecification
+] | [
+	"max",
+	number | ExpressionSpecification,
+	...(number | ExpressionSpecification)[]
+] | [
+	"min",
+	number | ExpressionSpecification,
+	...(number | ExpressionSpecification)[]
+] | [
+	"pi"
+] | [
+	"round",
+	number | ExpressionSpecification
+] | [
+	"sin",
+	number | ExpressionSpecification
+] | [
+	"sqrt",
+	number | ExpressionSpecification
+] | [
+	"tan",
+	number | ExpressionSpecification
+] | [
+	"zoom"
+] | [
+	"heatmap-density"
+];
+export declare type ExpressionFilterSpecification = boolean | ExpressionSpecification;
+export declare type LegacyFilterSpecification = [
+	"has",
+	string
 ] | [
 	"!has",
-	...FilterSpecification[],
-	FilterSpecificationInputType
+	string
+] | [
+	"==",
+	string,
+	string | number | boolean
+] | [
+	"!=",
+	string,
+	string | number | boolean
+] | [
+	">",
+	string,
+	string | number | boolean
+] | [
+	">=",
+	string,
+	string | number | boolean
+] | [
+	"<",
+	string,
+	string | number | boolean
+] | [
+	"<=",
+	string,
+	string | number | boolean
+] | [
+	"in",
+	string,
+	...(string | number | boolean)[]
+] | [
+	"!in",
+	string,
+	...(string | number | boolean)[]
+] | [
+	"all",
+	...LegacyFilterSpecification[]
+] | [
+	"any",
+	...LegacyFilterSpecification[]
 ] | [
 	"none",
-	...FilterSpecification[],
-	FilterSpecificationInputType
-] | Array<string | FilterSpecification>;
+	...LegacyFilterSpecification[]
+];
+export declare type FilterSpecification = ExpressionFilterSpecification | LegacyFilterSpecification;
 export declare type TransitionSpecification = {
 	duration?: number;
 	delay?: number;
@@ -365,9 +668,8 @@ export declare type CompositeFunctionSpecification<T> = {
 	property: string;
 	default?: T;
 };
-export declare type ExpressionSpecificationArray = Array<unknown>;
-export declare type PropertyValueSpecification<T> = T | CameraFunctionSpecification<T> | ExpressionSpecificationArray;
-export declare type DataDrivenPropertyValueSpecification<T> = T | CameraFunctionSpecification<T> | SourceFunctionSpecification<T> | CompositeFunctionSpecification<T> | ExpressionSpecificationArray;
+export declare type PropertyValueSpecification<T> = T | CameraFunctionSpecification<T> | ExpressionSpecification;
+export declare type DataDrivenPropertyValueSpecification<T> = T | CameraFunctionSpecification<T> | SourceFunctionSpecification<T> | CompositeFunctionSpecification<T> | ExpressionSpecification;
 export declare type StyleSpecification = {
 	"version": 8;
 	"name"?: string;
@@ -571,7 +873,7 @@ export declare type LineLayerSpecification = {
 		"line-blur"?: DataDrivenPropertyValueSpecification<number>;
 		"line-dasharray"?: PropertyValueSpecification<Array<number>>;
 		"line-pattern"?: DataDrivenPropertyValueSpecification<ResolvedImageSpecification>;
-		"line-gradient"?: ExpressionSpecificationArray;
+		"line-gradient"?: ExpressionSpecification;
 	};
 };
 export declare type SymbolLayerSpecification = {
@@ -604,7 +906,7 @@ export declare type SymbolLayerSpecification = {
 		]>;
 		"icon-image"?: DataDrivenPropertyValueSpecification<ResolvedImageSpecification>;
 		"icon-rotate"?: DataDrivenPropertyValueSpecification<number>;
-		"icon-padding"?: PropertyValueSpecification<number>;
+		"icon-padding"?: DataDrivenPropertyValueSpecification<PaddingSpecification>;
 		"icon-keep-upright"?: PropertyValueSpecification<boolean>;
 		"icon-offset"?: DataDrivenPropertyValueSpecification<[
 			number,
@@ -709,7 +1011,7 @@ export declare type HeatmapLayerSpecification = {
 		"heatmap-radius"?: DataDrivenPropertyValueSpecification<number>;
 		"heatmap-weight"?: DataDrivenPropertyValueSpecification<number>;
 		"heatmap-intensity"?: PropertyValueSpecification<number>;
-		"heatmap-color"?: ExpressionSpecificationArray;
+		"heatmap-color"?: ExpressionSpecification;
 		"heatmap-opacity"?: PropertyValueSpecification<number>;
 	};
 };
@@ -1197,7 +1499,28 @@ export declare class Formatted {
 	static factory(text: Formatted | string): Formatted;
 	toString(): string;
 }
-export declare type Value = null | string | boolean | number | Color | Collator | Formatted | ResolvedImage | ReadonlyArray<Value> | {
+export declare class Padding {
+	/** Padding values are in CSS order: top, right, bottom, left */
+	values: [
+		number,
+		number,
+		number,
+		number
+	];
+	constructor(values: [
+		number,
+		number,
+		number,
+		number
+	]);
+	/**
+	 * Numeric padding values
+	 * @returns A `Padding` instance, or `undefined` if the input is not a valid padding value.
+	 */
+	static parse(input?: number | number[] | Padding | null): Padding | void;
+	toString(): string;
+}
+export declare type Value = null | string | boolean | number | Color | Collator | Formatted | Padding | ResolvedImage | ReadonlyArray<Value> | {
 	readonly [x: string]: Value;
 };
 export declare type InterpolationType = {
@@ -1271,33 +1594,33 @@ export declare type FeatureFilter = {
 };
 export declare type ExpressionType = "data-driven" | "cross-faded" | "cross-faded-data-driven" | "color-ramp" | "data-constant" | "constant";
 export declare type ExpressionParameters = Array<"zoom" | "feature" | "feature-state" | "heatmap-density" | "line-progress">;
-export declare type ExpressionSpecification = {
+export declare type ExpressionSpecificationDefinition = {
 	interpolated: boolean;
 	parameters: ExpressionParameters;
 };
 export declare type StylePropertySpecification = {
 	type: "number";
 	"property-type": ExpressionType;
-	expression?: ExpressionSpecification;
+	expression?: ExpressionSpecificationDefinition;
 	transition: boolean;
 	default?: number;
 } | {
 	type: "string";
 	"property-type": ExpressionType;
-	expression?: ExpressionSpecification;
+	expression?: ExpressionSpecificationDefinition;
 	transition: boolean;
 	default?: string;
 	tokens?: boolean;
 } | {
 	type: "boolean";
 	"property-type": ExpressionType;
-	expression?: ExpressionSpecification;
+	expression?: ExpressionSpecificationDefinition;
 	transition: boolean;
 	default?: boolean;
 } | {
 	type: "enum";
 	"property-type": ExpressionType;
-	expression?: ExpressionSpecification;
+	expression?: ExpressionSpecificationDefinition;
 	values: {
 		[_: string]: {};
 	};
@@ -1306,7 +1629,7 @@ export declare type StylePropertySpecification = {
 } | {
 	type: "color";
 	"property-type": ExpressionType;
-	expression?: ExpressionSpecification;
+	expression?: ExpressionSpecificationDefinition;
 	transition: boolean;
 	default?: string;
 	overridable: boolean;
@@ -1314,7 +1637,7 @@ export declare type StylePropertySpecification = {
 	type: "array";
 	value: "number";
 	"property-type": ExpressionType;
-	expression?: ExpressionSpecification;
+	expression?: ExpressionSpecificationDefinition;
 	length?: number;
 	transition: boolean;
 	default?: Array<number>;
@@ -1322,10 +1645,16 @@ export declare type StylePropertySpecification = {
 	type: "array";
 	value: "string";
 	"property-type": ExpressionType;
-	expression?: ExpressionSpecification;
+	expression?: ExpressionSpecificationDefinition;
 	length?: number;
 	transition: boolean;
 	default?: Array<string>;
+} | {
+	type: "padding";
+	"property-type": ExpressionType;
+	expression?: ExpressionSpecificationDefinition;
+	transition: boolean;
+	default?: number | Array<number>;
 };
 export declare type TimePoint = number;
 export declare type CrossFaded<T> = {
@@ -4769,7 +5098,7 @@ export declare class SourceCache extends Evented {
 	 * are inside the viewport.
 	 * @private
 	 */
-	update(transform: Transform, terrain: Terrain): void;
+	update(transform: Transform, terrain?: Terrain): void;
 	releaseSymbolFadeTiles(): void;
 	_updateRetainedTiles(idealTileIDs: Array<OverscaledTileID>, zoom: number): {
 		[_: string]: OverscaledTileID;
@@ -4860,7 +5189,7 @@ export declare type SymbolLayoutProps = {
 	]>;
 	"icon-image": DataDrivenProperty<ResolvedImage>;
 	"icon-rotate": DataDrivenProperty<number>;
-	"icon-padding": DataConstantProperty<number>;
+	"icon-padding": DataDrivenProperty<Padding>;
 	"icon-keep-upright": DataConstantProperty<boolean>;
 	"icon-offset": DataDrivenProperty<[
 		number,
@@ -4916,7 +5245,7 @@ export declare type SymbolLayoutPropsPossiblyEvaluated = {
 	];
 	"icon-image": PossiblyEvaluatedPropertyValue<ResolvedImage>;
 	"icon-rotate": PossiblyEvaluatedPropertyValue<number>;
-	"icon-padding": number;
+	"icon-padding": PossiblyEvaluatedPropertyValue<Padding>;
 	"icon-keep-upright": boolean;
 	"icon-offset": PossiblyEvaluatedPropertyValue<[
 		number,
@@ -5510,13 +5839,11 @@ export declare class TerrainSourceCache extends Evented {
 	 */
 	getTileByID(id: string): Tile;
 	/**
-	 * searches for the corresponding current renderable terrain-tiles
+	 * Searches for the corresponding current renderable terrain-tiles
 	 * @param {OverscaledTileID} tileID - the tile to look for
-	 * @returns {[_:string]: Tile} - the tiles that were found
+	 * @returns {Record<string, OverscaledTileID>} - the tiles that were found
 	 */
-	getTerrainCoords(tileID: OverscaledTileID): {
-		[_: string]: OverscaledTileID;
-	};
+	getTerrainCoords(tileID: OverscaledTileID): Record<string, OverscaledTileID>;
 	/**
 	 * find the covering raster-dem tile
 	 * @param {OverscaledTileID} tileID - the tile to look for
@@ -5531,33 +5858,6 @@ export declare class TerrainSourceCache extends Evented {
 	 */
 	tilesAfterTime(time?: number): Array<Tile>;
 }
-/**
- * This is the main class which handles most of the 3D Terrain logic. It has the follwing topics:
- *    1) loads raster-dem tiles via the internal sourceCache this.sourceCache
- *    2) creates a depth-framebuffer, which is used to calculate the visibility of coordinates
- *    3) creates a coords-framebuffer, which is used the get to tile-coordinate for a screen-pixel
- *    4) stores all render-to-texture tiles in the this.sourceCache._tiles
- *    5) calculates the elevation for a spezific tile-coordinate
- *    6) creates a terrain-mesh
- *
- *    A note about the GPU resource-usage:
- *    Framebuffers:
- *       - one for the depth & coords framebuffer with the size of the map-div.
- *       - one for rendering a tile to texture with the size of tileSize (= 512x512).
- *    Textures:
- *       - one texture for an empty raster-dem tile with size 1x1
- *       - one texture for an empty depth-buffer, when terrain is disabled with size 1x1
- *       - one texture for an each loaded raster-dem with size of the source.tileSize
- *       - one texture for the coords-framebuffer with the size of the map-div.
- *       - one texture for the depth-framebuffer with the size of the map-div.
- *       - one texture for the encoded tile-coords with the size 2*tileSize (=1024x1024)
- *       - finally for each render-to-texture tile (= this._tiles) a set of textures
- *         for each render stack (The stack-concept is documented in painter.ts).
- *         Normally there exists 1-3 Textures per tile, depending on the stylesheet.
- *         Each Textures has the size 2*tileSize (= 1024x1024). Also there exists a
- *         cache of the last 150 newest rendered tiles.
- *
- */
 export declare type TerrainData = {
 	"u_depth": number;
 	"u_terrain": number;
@@ -5845,7 +6145,7 @@ export declare class Transform {
 	 * get the elevation from terrain for the current zoomlevel.
 	 * @param lnglat the location
 	 * @param terrain the terrain
-	 * @returns {Number} elevation in meters
+	 * @returns {number} elevation in meters
 	 */
 	getElevation(lnglat: LngLat, terrain: Terrain): number;
 	/**
@@ -5906,8 +6206,8 @@ export declare class Transform {
 	/**
 	 * Given a coordinate, return the screen point that corresponds to it
 	 * @param {Coordinate} coord
-	 * @params {number} elevation default = 0
-	 * @params {mat4} pixelMatrix, default = this.pixelMatrix
+	 * @param {number} elevation default = 0
+	 * @param {mat4} pixelMatrix, default = this.pixelMatrix
 	 * @returns {Point} screen point
 	 * @private
 	 */
@@ -7133,7 +7433,7 @@ export declare class CollisionIndex {
 	queryRenderedSymbols(viewportQueryGeometry: Array<Point>): {};
 	insertCollisionBox(collisionBox: Array<number>, overlapMode: OverlapMode, ignorePlacement: boolean, bucketInstanceId: number, featureIndex: number, collisionGroupID: number): void;
 	insertCollisionCircles(collisionCircles: Array<number>, overlapMode: OverlapMode, ignorePlacement: boolean, bucketInstanceId: number, featureIndex: number, collisionGroupID: number): void;
-	projectAndGetPerspectiveRatio(posMatrix: mat4, x: number, y: number, getElevation: (x: number, y: number) => number): {
+	projectAndGetPerspectiveRatio(posMatrix: mat4, x: number, y: number, getElevation?: (x: number, y: number) => number): {
 		point: Point;
 		perspectiveRatio: number;
 	};
@@ -7607,9 +7907,12 @@ export declare class TouchPanHandler {
 	_minTouches: number;
 	_clickTolerance: number;
 	_sum: Point;
+	_map: Map;
+	_cancelCooperativeMessage: boolean;
 	constructor(options: {
 		clickTolerance: number;
-	});
+		cooperativeGestures: boolean | GestureOptions;
+	}, map: Map);
 	reset(): void;
 	touchstart(e: TouchEvent, points: Array<Point>, mapTouches: Array<Touch>): {
 		around: Point;
@@ -8650,7 +8953,11 @@ export declare class TouchPitchHandler extends TwoTouchHandler {
 		Point,
 		Point
 	];
+	_map: Map;
+	_currentTouchCount: number;
+	constructor(map: Map);
 	reset(): void;
+	touchstart(e: TouchEvent, points: Array<Point>, mapTouches: Array<Touch>): void;
 	_start(points: [
 		Point,
 		Point
@@ -9058,6 +9365,7 @@ export declare type MapOptions = {
 	doubleClickZoom?: boolean;
 	touchZoomRotate?: boolean;
 	touchPitch?: boolean;
+	cooperativeGestures?: boolean | GestureOptions;
 	trackResize?: boolean;
 	center?: LngLatLike;
 	zoom?: number;
@@ -9078,6 +9386,11 @@ export declare type MapOptions = {
 	pitchWithRotate?: boolean;
 	pixelRatio?: number;
 };
+export declare type GestureOptions = {
+	windowsHelpText?: string;
+	macHelpText?: string;
+	mobileHelpText?: string;
+};
 export declare type Complete<T> = {
 	[P in keyof Required<T>]: Pick<T, P> extends Required<Pick<T, P>> ? T[P] : (T[P] | undefined);
 };
@@ -9093,6 +9406,9 @@ export declare class Map extends Camera {
 		[_: string]: HTMLElement;
 	};
 	_interactive: boolean;
+	_cooperativeGestures: boolean | GestureOptions;
+	_cooperativeGesturesScreen: HTMLElement;
+	_metaPress: boolean;
 	_showTileBoundaries: boolean;
 	_showCollisionBoxes: boolean;
 	_showPadding: boolean;
@@ -9495,7 +9811,7 @@ export declare class Map extends Camera {
 	 * | [`dataabort`](#map.event:dataabort)                       |                           |
 	 * | [`sourcedataabort`](#map.event:sourcedataabort)           |                           |
 	 *
-	 * @param {string | Listener} layerIdOrListener The ID of a style layer or a listener if no ID is provided. Event will only be triggered if its location
+	 * @param {string | Listener} layer The ID of a style layer or a listener if no ID is provided. Event will only be triggered if its location
 	 * is within a visible feature in this layer. The event will have a `features` property containing
 	 * an array of the matching features. If `layerIdOrListener` is not supplied, the event will not have a `features` property.
 	 * Please note that many event types are not compatible with the optional `layerIdOrListener` parameter.
@@ -9562,7 +9878,7 @@ export declare class Map extends Camera {
 	 * a visible portion of the specified layer from outside that layer or outside the map canvas. `mouseleave`
 	 * and `mouseout` events are triggered when the cursor leaves a visible portion of the specified layer, or leaves
 	 * the map canvas.
-	 * @param {string} layerIdOrListener The ID of a style layer or a listener if no ID is provided. Only events whose location is within a visible
+	 * @param {string} layer The ID of a style layer or a listener if no ID is provided. Only events whose location is within a visible
 	 * feature in this layer will trigger the listener. The event will have a `features` property containing
 	 * an array of the matching features.
 	 * @param {Function} listener The function to be called when the event is fired.
@@ -9586,7 +9902,7 @@ export declare class Map extends Camera {
 	 * Removes an event listener for layer-specific events previously added with `Map#on`.
 	 *
 	 * @param {string} type The event type previously used to install the listener.
-	 * @param {string} layerIdOrListener The layer ID or listener previously used to install the listener.
+	 * @param {string} layer The layer ID or listener previously used to install the listener.
 	 * @param {Function} listener The function previously installed as a listener.
 	 * @returns {Map} `this`
 	 */
@@ -10023,7 +10339,10 @@ export declare class Map extends Camera {
 	 * A layer defines how data from a specified source will be styled. Read more about layer types
 	 * and available paint and layout properties in the [MapLibre Style Specification](https://maplibre.org/maplibre-gl-js-docs/style-spec/#layers).
 	 *
-	 * @param {Object | CustomLayerInterface} layer The layer to add, conforming to either the MapLibre Style Specification's [layer definition](https://maplibre.org/maplibre-gl-js-docs/style-spec/#layers) or, less commonly, the {@link CustomLayerInterface} specification.
+	 * TODO: JSDoc can't pass @param {(LayerSpecification & {source?: string | SourceSpecification}) | CustomLayerInterface} layer The layer to add,
+	 * @param {Object} layer
+	 * conforming to either the MapLibre Style Specification's [layer definition](https://maplibre.org/maplibre-gl-js-docs/style-spec/#layers) or,
+	 * less commonly, the {@link CustomLayerInterface} specification.
 	 * The MapLibre Style Specification's layer definition is appropriate for most layers.
 	 *
 	 * @param {string} layer.id A unique identifer that you define.
@@ -10031,10 +10350,10 @@ export declare class Map extends Camera {
 	 * A list of layer types is available in the [MapLibre Style Specification](https://maplibre.org/maplibre-gl-js-docs/style-spec/layers/#type).
 	 *
 	 * (This can also be `custom`. For more information, see {@link CustomLayerInterface}.)
-	 * @param {string | Object} [layer.source] The data source for the layer.
+	 * @param {string | SourceSpecification} [layer.source] The data source for the layer.
 	 * Reference a source that has _already been defined_ using the source's unique id.
 	 * Reference a _new source_ using a source object (as defined in the [MapLibre Style Specification](https://maplibre.org/maplibre-gl-js-docs/style-spec/sources/)) directly.
-	 * This is **required** for all `layer.type` options _except_ for `custom`.
+	 * This is **required** for all `layer.type` options _except_ for `custom` and `background`.
 	 * @param {string} [layer.sourceLayer] (optional) The name of the source layer within the specified `layer.source` to use for this style layer.
 	 * This is only applicable for vector tile sources and is **required** when `layer.source` is of the type `vector`.
 	 * @param {array} [layer.filter] (optional) An expression specifying conditions on source features.
@@ -10125,7 +10444,9 @@ export declare class Map extends Camera {
 	 * @see [Add a vector tile source](https://maplibre.org/maplibre-gl-js-docs/example/vector-source/)
 	 * @see [Add a WMS source](https://maplibre.org/maplibre-gl-js-docs/example/wms/)
 	 */
-	addLayer(layer: LayerSpecification | CustomLayerInterface, beforeId?: string): this;
+	addLayer(layer: (LayerSpecification & {
+		source?: string | SourceSpecification;
+	}) | CustomLayerInterface, beforeId?: string): this;
 	/**
 	 * Moves a layer to a different z-position.
 	 *
@@ -10431,11 +10752,13 @@ export declare class Map extends Camera {
 	getCanvas(): HTMLCanvasElement;
 	_containerDimensions(): number[];
 	_setupContainer(): void;
+	_setupCooperativeGestures(): void;
 	_resizeCanvas(width: number, height: number, pixelRatio: number): void;
 	_setupPainter(): void;
 	_contextLost(event: any): void;
 	_contextRestored(event: any): void;
 	_onMapScroll(event: any): boolean;
+	_onCooperativeGesture(event: any, metaPress: any, touches: any): boolean;
 	/**
 	 * Returns a Boolean indicating whether the map is fully loaded.
 	 *
@@ -11394,45 +11717,10 @@ declare const exported: {
 	 */
 	removeProtocol(customProtocol: string): void;
 };
-/**
- * Test whether the browser supports MapLibre GL JS.
- *
- * @function supported
- * @param {Object} [options]
- * @param {boolean} [options.failIfMajorPerformanceCaveat=false] If `true`,
- *   the function will return `false` if the performance of MapLibre GL JS would
- *   be dramatically worse than expected (e.g. a software WebGL renderer would be used).
- * @return {boolean}
- * @example
- * // Show an alert if the browser does not support MapLibre GL
- * if (!maplibregl.supported()) {
- *   alert('Your browser does not support MapLibre GL');
- * }
- * @see [Check for browser support](https://maplibre.org/maplibre-gl-js-docs/example/check-for-support/)
- */
-/**
- * Sets the map's [RTL text plugin](https://www.mapbox.com/mapbox-gl-js/plugins/#mapbox-gl-rtl-text).
- * Necessary for supporting the Arabic and Hebrew languages, which are written right-to-left.
- *
- * @function setRTLTextPlugin
- * @param {string} pluginURL URL pointing to the Mapbox RTL text plugin source.
- * @param {Function} callback Called with an error argument if there is an error.
- * @param {boolean} lazy If set to `true`, mapboxgl will defer loading the plugin until rtl text is encountered,
- *    rtl text will then be rendered only after the plugin finishes loading.
- * @example
- * maplibregl.setRTLTextPlugin('https://api.mapbox.com/mapbox-gl-js/plugins/mapbox-gl-rtl-text/v0.2.0/mapbox-gl-rtl-text.js');
- * @see [Add support for right-to-left scripts](https://maplibre.org/maplibre-gl-js-docs/example/mapbox-gl-rtl-text/)
- */
-/**
- * Gets the map's [RTL text plugin](https://www.mapbox.com/mapbox-gl-js/plugins/#mapbox-gl-rtl-text) status.
- * The status can be `unavailable` (i.e. not requested or removed), `loading`, `loaded` or `error`.
- * If the status is `loaded` and the plugin is requested again, an error will be thrown.
- *
- * @function getRTLTextPluginStatus
- * @example
- * const pluginStatus = maplibregl.getRTLTextPluginStatus();
- */
-export default exported;
+
+export {
+	exported as default,
+};
 
 export as namespace maplibregl;