maplibre-gl 2.0.1 → 2.0.2

package/CHANGELOG.md

@@ -8,6 +8,12 @@
 
 - *...Add new stuff here...*
 
+## 2.0.2
+
+### 🐞 Bug fixes
+
+- Fix typescript generated file (#776).
+
 ## 2.0.1
 
 ### 🐞 Bug fixes
@@ -21,6 +27,7 @@
 - Migrated the production code to typescript
 - ** Breaking Change ** removed `version` from the public API
 - ** Breaking Change ** stopped supporting IE (internet explorer)
+- ** Breaking Change ** stopped supporting Chrome 49-65. Chrome 66+ required. For Chrome 49-65 support use version 1.15.2.
 - ** Breaking Change ** removed all code related to `accessToken` and Mapbox specific urls starting with `mapbox://`. Telemetry and tracking code was removed.
 - ** Breaking Change ** removed `baseApiUrl` as it was used only for Mapbox related urls
 - ** Breaking Change ** typescript typings have changed:

package/build/generate-struct-arrays.ts

@@ -87,7 +87,7 @@ function createStructArrayType(name: string, layout: StructArrayLayout, includeS
             includeStructAccessors
         });
     } else {
-        arrayTypeEntries.add(`${layoutClass} as ${arrayClass}`);
+        arrayTypeEntries.add(`export class ${arrayClass} extends ${layoutClass} {}`);
     }
 }
 
@@ -432,8 +432,8 @@ import Point from '../util/point';
 
 ${layouts.map(emitStructArrayLayout).join('\n')}
 ${arraysWithStructAccessors.map(emitStructArray).join('\n')}
+${[...arrayTypeEntries].join('\n')}
 export {
-    ${layouts.map(layout => layout.className).join(',\n    ')},
-    ${[...arrayTypeEntries].join(',\n    ')}
+    ${layouts.map(layout => layout.className).join(',\n    ')}
 };
 `);

package/build/post-ts-build.js

@@ -35,7 +35,17 @@ console.log(`Starting bundling types`);
 const outputFile = "./dist/maplibre-gl.d.ts";
 child_process.execSync(`dts-bundle-generator --no-check --umd-module-name=maplibregl -o ${outputFile} ./src/index.ts`);
 let types = fs.readFileSync(outputFile, 'utf8');
+// Classes are not exported but should be since this is exported as UMD - fixing...
 types = types.replace(/declare class/g, "export declare class");
+// Missing vector-tile types that are added to this file too
+let file = fs.readFileSync("./src/types/packages-types/vector-tile/index.d.ts", 'utf8');
+let lines = file.split("\n").filter(Boolean);
+lines.pop(); // last } is removed too.
+types = lines.join("\n") + "\n" + types;
+// remove imports of vector-tile and declare module lines
+types = types.split("\n")
+    .filter(l => !l.includes("@mapbox/vector-tile"))
+    .join("\n");
 fs.writeFileSync(outputFile, types);
 console.log(`Finished bundling types`);
 

package/dist/maplibre-gl.d.ts

@@ -1,190 +1,30 @@
+    import type Pbf from 'pbf';
+    export class VectorTileLayer {
+        version?: number;
+        name: string;
+        extent: number;
+        length: number;
+        feature(i: number): VectorTileFeature;
+    }
+    export class VectorTile {
+        constructor(pbf: Pbf);
+        layers: {[_: string]: VectorTileLayer};
+    }
+    export class VectorTileFeature {
+        static types: ['Unknown', 'Point', 'LineString', 'Polygon'];
+        extent: number;
+        type: 1 | 2 | 3;
+        id: number;
+        properties: {[_: string]: string | number | boolean};
+        loadGeometry(): Array<Array<Point>>;
+        toGeoJSON(x: number, y: number, z: number): GeoJSON.Feature;
+    }
 // Generated by dts-bundle-generator v6.1.0
 
 import TinySDF from '@mapbox/tiny-sdf';
 import { mat2, mat4 } from 'gl-matrix';
 import { PotpackBox } from 'potpack';
 
-/**
- * A {@link Point} or an array of two numbers representing `x` and `y` screen coordinates in pixels.
- *
- * @typedef {(Point | [number, number])} PointLike
- * @example
- * var p1 = new maplibregl.Point(-77, 38); // a PointLike which is a Point
- * var p2 = [-77, 38]; // a PointLike which is an array of two numbers
- */
-export declare type PointLike = Point | [
-	number,
-	number
-];
-export declare class Point {
-	x: number;
-	y: number;
-	constructor(x: number, y: number);
-	/**
-	 * Clone this point, returning a new point that can be modified
-	 * without affecting the old one.
-	 * @returns {Point} the clone
-	 */
-	clone(): Point;
-	/**
-	 * Add this point's x & y coordinates to another point,
-	 * yielding a new point.
-	 * @param {Point} p the other point
-	 * @returns {Point} output point
-	 */
-	add(p: any): Point;
-	/**
-	 * Subtract this point's x & y coordinates to from point,
-	 * yielding a new point.
-	 * @param {Point} p the other point
-	 * @returns {Point} output point
-	 */
-	sub(p: any): Point;
-	/**
-	 * Multiply this point's x & y coordinates by point,
-	 * yielding a new point.
-	 * @param {Point} p the other point
-	 * @returns {Point} output point
-	 */
-	multByPoint(p: any): Point;
-	/**
-	 * Divide this point's x & y coordinates by point,
-	 * yielding a new point.
-	 * @param {Point} p the other point
-	 * @returns {Point} output point
-	 */
-	divByPoint(p: any): Point;
-	/**
-	 * Multiply this point's x & y coordinates by a factor,
-	 * yielding a new point.
-	 * @param {Point} k factor
-	 * @returns {Point} output point
-	 */
-	mult(k: any): Point;
-	/**
-	 * Divide this point's x & y coordinates by a factor,
-	 * yielding a new point.
-	 * @param {Point} k factor
-	 * @returns {Point} output point
-	 */
-	div(k: any): Point;
-	/**
-	 * Rotate this point around the 0, 0 origin by an angle a,
-	 * given in radians
-	 * @param {Number} a angle to rotate around, in radians
-	 * @returns {Point} output point
-	 */
-	rotate(a: any): Point;
-	/**
-	 * Rotate this point around p point by an angle a,
-	 * given in radians
-	 * @param {Number} a angle to rotate around, in radians
-	 * @param {Point} p Point to rotate around
-	 * @returns {Point} output point
-	 */
-	rotateAround(a: any, p: any): Point;
-	/**
-	 * Multiply this point by a 4x1 transformation matrix
-	 * @param {Array<Number>} m transformation matrix
-	 * @returns {Point} output point
-	 */
-	matMult(m: any): Point;
-	/**
-	 * Calculate this point but as a unit vector from 0, 0, meaning
-	 * that the distance from the resulting point to the 0, 0
-	 * coordinate will be equal to 1 and the angle from the resulting
-	 * point to the 0, 0 coordinate will be the same as before.
-	 * @returns {Point} unit vector point
-	 */
-	unit(): Point;
-	/**
-	 * Compute a perpendicular point, where the new y coordinate
-	 * is the old x coordinate and the new x coordinate is the old y
-	 * coordinate multiplied by -1
-	 * @returns {Point} perpendicular point
-	 */
-	perp(): Point;
-	/**
-	 * Return a version of this point with the x & y coordinates
-	 * rounded to integers.
-	 * @returns {Point} rounded point
-	 */
-	round(): Point;
-	/**
-	 * Return the magitude of this point: this is the Euclidean
-	 * distance from the 0, 0 coordinate to this point's x and y
-	 * coordinates.
-	 * @returns {Number} magnitude
-	 */
-	mag(): number;
-	/**
-	 * Judge whether this point is equal to another point, returning
-	 * true or false.
-	 * @param {Point} other the other point
-	 * @returns {boolean} whether the points are equal
-	 */
-	equals(other: any): boolean;
-	/**
-	 * Calculate the distance from this point to another point
-	 * @param {Point} p the other point
-	 * @returns {Number} distance
-	 */
-	dist(p: any): number;
-	/**
-	 * Calculate the distance from this point to another point,
-	 * without the square root step. Useful if you're comparing
-	 * relative distances.
-	 * @param {Point} p the other point
-	 * @returns {Number} distance
-	 */
-	distSqr(p: any): number;
-	/**
-	 * Get the angle from the 0, 0 coordinate to this point, in radians
-	 * coordinates.
-	 * @returns {Number} angle
-	 */
-	angle(): number;
-	/**
-	 * Get the angle from this point to another point, in radians
-	 * @param {Point} b the other point
-	 * @returns {Number} angle
-	 */
-	angleTo(b: any): number;
-	/**
-	 * Get the angle between this point and another point, in radians
-	 * @param {Point} b the other point
-	 * @returns {Number} angle
-	 */
-	angleWith(b: any): number;
-	angleWithSep(x: any, y: any): number;
-	_matMult(m: any): this;
-	_add(p: any): this;
-	_sub(p: any): this;
-	_mult(k: any): this;
-	_div(k: any): this;
-	_multByPoint(p: any): this;
-	_divByPoint(p: any): this;
-	_unit(): this;
-	_perp(): this;
-	_rotate(angle: any): this;
-	_rotateAround(angle: any, p: any): this;
-	_round(): this;
-	/**
-	 * Construct a point from an array if necessary, otherwise if the input
-	 * is already a Point, or an unknown type, return it unchanged
-	 * @param {Array<Number>|Point|*} a any kind of input value
-	 * @returns {Point} constructed point, or passed-through value.
-	 * @example
-	 * // this
-	 * var point = Point.convert([0, 1]);
-	 * // is equivalent to
-	 * var point = new Point(0, 1);
-	 */
-	static convert(a: PointLike | {
-		x: number;
-		y: number;
-	}): Point;
-}
 export declare type Callback<T> = (error?: Error | null, result?: T | null) => void;
 export declare type Cancelable = {
 	cancel: () => void;
@@ -962,6 +802,187 @@ export declare class EvaluationParameters {
 	crossFadingFactor(): number;
 	getCrossfadeParameters(): CrossfadeParameters;
 }
+/**
+ * A {@link Point} or an array of two numbers representing `x` and `y` screen coordinates in pixels.
+ *
+ * @typedef {(Point | [number, number])} PointLike
+ * @example
+ * var p1 = new maplibregl.Point(-77, 38); // a PointLike which is a Point
+ * var p2 = [-77, 38]; // a PointLike which is an array of two numbers
+ */
+export declare type PointLike = Point | [
+	number,
+	number
+];
+export declare class Point {
+	x: number;
+	y: number;
+	constructor(x: number, y: number);
+	/**
+	 * Clone this point, returning a new point that can be modified
+	 * without affecting the old one.
+	 * @returns {Point} the clone
+	 */
+	clone(): Point;
+	/**
+	 * Add this point's x & y coordinates to another point,
+	 * yielding a new point.
+	 * @param {Point} p the other point
+	 * @returns {Point} output point
+	 */
+	add(p: any): Point;
+	/**
+	 * Subtract this point's x & y coordinates to from point,
+	 * yielding a new point.
+	 * @param {Point} p the other point
+	 * @returns {Point} output point
+	 */
+	sub(p: any): Point;
+	/**
+	 * Multiply this point's x & y coordinates by point,
+	 * yielding a new point.
+	 * @param {Point} p the other point
+	 * @returns {Point} output point
+	 */
+	multByPoint(p: any): Point;
+	/**
+	 * Divide this point's x & y coordinates by point,
+	 * yielding a new point.
+	 * @param {Point} p the other point
+	 * @returns {Point} output point
+	 */
+	divByPoint(p: any): Point;
+	/**
+	 * Multiply this point's x & y coordinates by a factor,
+	 * yielding a new point.
+	 * @param {Point} k factor
+	 * @returns {Point} output point
+	 */
+	mult(k: any): Point;
+	/**
+	 * Divide this point's x & y coordinates by a factor,
+	 * yielding a new point.
+	 * @param {Point} k factor
+	 * @returns {Point} output point
+	 */
+	div(k: any): Point;
+	/**
+	 * Rotate this point around the 0, 0 origin by an angle a,
+	 * given in radians
+	 * @param {Number} a angle to rotate around, in radians
+	 * @returns {Point} output point
+	 */
+	rotate(a: any): Point;
+	/**
+	 * Rotate this point around p point by an angle a,
+	 * given in radians
+	 * @param {Number} a angle to rotate around, in radians
+	 * @param {Point} p Point to rotate around
+	 * @returns {Point} output point
+	 */
+	rotateAround(a: any, p: any): Point;
+	/**
+	 * Multiply this point by a 4x1 transformation matrix
+	 * @param {Array<Number>} m transformation matrix
+	 * @returns {Point} output point
+	 */
+	matMult(m: any): Point;
+	/**
+	 * Calculate this point but as a unit vector from 0, 0, meaning
+	 * that the distance from the resulting point to the 0, 0
+	 * coordinate will be equal to 1 and the angle from the resulting
+	 * point to the 0, 0 coordinate will be the same as before.
+	 * @returns {Point} unit vector point
+	 */
+	unit(): Point;
+	/**
+	 * Compute a perpendicular point, where the new y coordinate
+	 * is the old x coordinate and the new x coordinate is the old y
+	 * coordinate multiplied by -1
+	 * @returns {Point} perpendicular point
+	 */
+	perp(): Point;
+	/**
+	 * Return a version of this point with the x & y coordinates
+	 * rounded to integers.
+	 * @returns {Point} rounded point
+	 */
+	round(): Point;
+	/**
+	 * Return the magitude of this point: this is the Euclidean
+	 * distance from the 0, 0 coordinate to this point's x and y
+	 * coordinates.
+	 * @returns {Number} magnitude
+	 */
+	mag(): number;
+	/**
+	 * Judge whether this point is equal to another point, returning
+	 * true or false.
+	 * @param {Point} other the other point
+	 * @returns {boolean} whether the points are equal
+	 */
+	equals(other: any): boolean;
+	/**
+	 * Calculate the distance from this point to another point
+	 * @param {Point} p the other point
+	 * @returns {Number} distance
+	 */
+	dist(p: any): number;
+	/**
+	 * Calculate the distance from this point to another point,
+	 * without the square root step. Useful if you're comparing
+	 * relative distances.
+	 * @param {Point} p the other point
+	 * @returns {Number} distance
+	 */
+	distSqr(p: any): number;
+	/**
+	 * Get the angle from the 0, 0 coordinate to this point, in radians
+	 * coordinates.
+	 * @returns {Number} angle
+	 */
+	angle(): number;
+	/**
+	 * Get the angle from this point to another point, in radians
+	 * @param {Point} b the other point
+	 * @returns {Number} angle
+	 */
+	angleTo(b: any): number;
+	/**
+	 * Get the angle between this point and another point, in radians
+	 * @param {Point} b the other point
+	 * @returns {Number} angle
+	 */
+	angleWith(b: any): number;
+	angleWithSep(x: any, y: any): number;
+	_matMult(m: any): this;
+	_add(p: any): this;
+	_sub(p: any): this;
+	_mult(k: any): this;
+	_div(k: any): this;
+	_multByPoint(p: any): this;
+	_divByPoint(p: any): this;
+	_unit(): this;
+	_perp(): this;
+	_rotate(angle: any): this;
+	_rotateAround(angle: any, p: any): this;
+	_round(): this;
+	/**
+	 * Construct a point from an array if necessary, otherwise if the input
+	 * is already a Point, or an unknown type, return it unchanged
+	 * @param {Array<Number>|Point|*} a any kind of input value
+	 * @returns {Point} constructed point, or passed-through value.
+	 * @example
+	 * // this
+	 * var point = Point.convert([0, 1]);
+	 * // is equivalent to
+	 * var point = new Point(0, 1);
+	 */
+	static convert(a: PointLike | {
+		x: number;
+		y: number;
+	}): Point;
+}
 export declare class LngLatBounds {
 	_ne: LngLat;
 	_sw: LngLat;
@@ -1995,6 +2016,30 @@ export declare class FeatureIndexArray extends StructArrayLayout1ul2ui8 {
 	 */
 	get(index: number): FeatureIndexStruct;
 }
+export declare class CircleLayoutArray extends StructArrayLayout2i4 {
+}
+export declare class FillLayoutArray extends StructArrayLayout2i4 {
+}
+export declare class FillExtrusionLayoutArray extends StructArrayLayout2i4i12 {
+}
+export declare class LineLayoutArray extends StructArrayLayout2i4ub8 {
+}
+export declare class LineExtLayoutArray extends StructArrayLayout2f8 {
+}
+export declare class SymbolLayoutArray extends StructArrayLayout4i4ui4i24 {
+}
+export declare class SymbolDynamicLayoutArray extends StructArrayLayout3f12 {
+}
+export declare class SymbolOpacityArray extends StructArrayLayout1ul4 {
+}
+export declare class CollisionVertexArray extends StructArrayLayout2ub2f12 {
+}
+export declare class TriangleIndexArray extends StructArrayLayout3ui6 {
+}
+export declare class LineIndexArray extends StructArrayLayout2ui4 {
+}
+export declare class LineStripIndexArray extends StructArrayLayout1ui2 {
+}
 export declare type SerializedFeaturePositionMap = {
 	ids: Float64Array;
 	positions: Uint32Array;
@@ -2732,6 +2777,35 @@ export declare class ImageAtlas {
 	patchUpdatedImages(imageManager: ImageManager, texture: Texture): void;
 	patchUpdatedImage(position: ImagePosition, image: StyleImage, texture: Texture): void;
 }
+export declare type SerializedGrid = {
+	buffer: ArrayBuffer;
+};
+export declare class TransferableGridIndex {
+	cells: number[][];
+	arrayBuffer: ArrayBuffer;
+	d: number;
+	keys: number[];
+	bboxes: number[];
+	n: number;
+	extent: number;
+	padding: number;
+	scale: any;
+	uid: number;
+	min: number;
+	max: number;
+	constructor(extent: number | ArrayBuffer, n?: number, padding?: number);
+	insert(key: number, x1: number, y1: number, x2: number, y2: number): void;
+	_insertReadonly(): void;
+	_insertCell(x1: number, y1: number, x2: number, y2: number, cellIndex: number, uid: number): void;
+	query(x1: number, y1: number, x2: number, y2: number, intersectionTest?: Function): number[];
+	_queryCell(x1: number, y1: number, x2: number, y2: number, cellIndex: number, result: any, seenUids: any, intersectionTest: Function): void;
+	_forEachCell(x1: number, y1: number, x2: number, y2: number, fn: Function, arg1: any, arg2: any, intersectionTest: any): void;
+	_convertFromCellCoord(x: any): number;
+	_convertToCellCoord(x: any): number;
+	toArrayBuffer(): ArrayBuffer;
+	static serialize(grid: TransferableGridIndex, transferables?: Array<Transferable>): SerializedGrid;
+	static deserialize(serialized: SerializedGrid): TransferableGridIndex;
+}
 export declare class DictionaryCoder {
 	_stringToNumber: {
 		[_: string]: number;
@@ -4489,10 +4563,6 @@ export interface CustomLayerInterface {
 	*/
 	onRemove(map: Map, gl: WebGLRenderingContext): void;
 }
-export interface StyleLayer {
-	queryRadius?(bucket: Bucket): number;
-	queryIntersectsFeature?(queryGeometry: Array<Point>, feature: VectorTileFeature, featureState: FeatureState, geometry: Array<Array<Point>>, zoom: number, transform: Transform, pixelsToTileUnits: number, pixelPosMatrix: mat4): boolean | number;
-}
 declare abstract class StyleLayer extends Evented {
 	id: string;
 	metadata: unknown;
@@ -4512,6 +4582,8 @@ declare abstract class StyleLayer extends Evented {
 	_featureFilter: FeatureFilter;
 	readonly onAdd: ((map: Map) => void);
 	readonly onRemove: ((map: Map) => void);
+	queryRadius?(bucket: Bucket): number;
+	queryIntersectsFeature?(queryGeometry: Array<Point>, feature: VectorTileFeature, featureState: FeatureState, geometry: Array<Array<Point>>, zoom: number, transform: Transform, pixelsToTileUnits: number, pixelPosMatrix: mat4): boolean | number;
 	constructor(layer: LayerSpecification | CustomLayerInterface, properties: Readonly<{
 		layout?: Properties<any>;
 		paint?: Properties<any>;
@@ -5953,8 +6025,8 @@ export declare type SourceStatics = {
 export declare type SourceClass = {
 	new (...args: any): Source;
 } & SourceStatics;
-declare const getType: (name: string) => any;
-declare const setType: (name: string, type: new (...args: any) => Source) => void;
+declare const getSourceType: (name: string) => any;
+declare const setSourceType: (name: string, type: new (...args: any) => Source) => void;
 export declare class TileCache {
 	max: number;
 	data: {