maplibre-gl 2.1.1 → 2.1.2

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "maplibre-gl",
   "description": "BSD licensed community fork of mapbox-gl, a WebGL interactive maps library",
-  "version": "2.1.1",
+  "version": "2.1.2",
   "main": "dist/maplibre-gl.js",
   "style": "dist/maplibre-gl.css",
   "license": "BSD-3-Clause",
@@ -24,6 +24,7 @@
     "earcut": "^2.2.3",
     "geojson-vt": "^3.2.1",
     "gl-matrix": "^3.4.3",
+    "husky": "^7.0.4",
     "murmurhash-js": "^1.0.0",
     "pbf": "^3.2.1",
     "potpack": "^1.0.2",
@@ -33,7 +34,6 @@
     "vt-pbf": "^3.1.3"
   },
   "devDependencies": {
-    "@babel/core": "^7.16.12",
     "@mapbox/gazetteer": "^5.1.0",
     "@mapbox/mapbox-gl-rtl-text": "^0.2.3",
     "@mapbox/mvt-fixtures": "^3.6.0",
@@ -43,59 +43,49 @@
     "@rollup/plugin-replace": "^3.0.1",
     "@rollup/plugin-strip": "^2.1.0",
     "@rollup/plugin-typescript": "^8.3.0",
-    "@types/babel__core": "^7.1.18",
-    "@types/babelify": "^7.3.7",
+    "@swc/cli": "^0.1.55",
+    "@swc/core": "^1.2.135",
+    "@swc/jest": "^0.2.17",
     "@types/benchmark": "^2.1.1",
     "@types/browserify": "^12.0.37",
     "@types/cssnano": "^5.0.0",
     "@types/d3": "^7.1.0",
     "@types/diff": "^5.0.2",
     "@types/earcut": "^2.1.1",
-    "@types/ejs": "^3.1.0",
     "@types/eslint": "^8.4.1",
     "@types/geojson": "^7946.0.8",
     "@types/gl": "^4.1.0",
     "@types/glob": "^7.2.0",
     "@types/jest": "^27.4.0",
     "@types/jsdom": "^16.2.14",
-    "@types/lodash.template": "^4.5.0",
     "@types/mapbox__point-geometry": "^0.1.2",
     "@types/mapbox__vector-tile": "^1.3.0",
     "@types/minimist": "^1.2.2",
     "@types/murmurhash-js": "^1.0.3",
-    "@types/node-notifier": "^8.0.2",
+    "@types/nise": "^1.4.0",
     "@types/offscreencanvas": "^2019.6.4",
     "@types/pbf": "^3.0.2",
     "@types/pixelmatch": "^5.2.4",
     "@types/pngjs": "^6.0.1",
-    "@types/puppeteer": "^5.4.4",
     "@types/react": "^17.0.38",
     "@types/react-dom": "^17.0.11",
     "@types/request": "^2.48.8",
     "@types/rollup-plugin-json": "^3.0.3",
-    "@types/selenium-webdriver": "^4.0.16",
     "@types/shuffle-seed": "^1.1.0",
-    "@types/sinon": "^10.0.9",
     "@types/supercluster": "^5.0.3",
-    "@types/tape": "^4.13.2",
     "@types/window-or-global": "^1.0.4",
     "@typescript-eslint/eslint-plugin": "^5.10.1",
     "@typescript-eslint/parser": "^5.10.1",
     "address": "^1.1.2",
-    "babel-eslint": "^10.0.1",
-    "babel-jest": "^27.4.6",
-    "babelify": "^10.0.0",
     "benchmark": "^2.1.4",
     "browserify": "^17.0.0",
     "canvas": "^2.9.0",
-    "chokidar": "^3.5.3",
     "cssnano": "^5.0.16",
     "d3": "^7.3.0",
     "d3-queue": "^3.0.7",
     "diff": "^5.0.0",
     "documentation": "13.0.2",
     "dts-bundle-generator": "^6.4.0",
-    "ejs": "^3.1.6",
     "eslint": "^8.7.0",
     "eslint-config-mourner": "^3.0.0",
     "eslint-plugin-html": "^6.2.0",
@@ -106,27 +96,26 @@
     "gl": "^5.0.0",
     "glob": "^7.2.0",
     "is-builtin-module": "^3.1.0",
-    "jest": "^27.4.7",
+    "jest": "^27.5.1",
     "jest-canvas-mock": "^2.3.1",
-    "jest-raw-loader": "^1.0.1",
+    "jest-playwright-preset": "^1.7.0",
     "jsdom": "^19.0.0",
     "json-stringify-pretty-compact": "^3.0.0",
     "mapbox-gl-styles": "^2.0.2",
     "minimist": "^1.2.5",
     "mock-geolocation": "^1.0.11",
-    "node-notifier": "^10.0.0",
+    "nise": "^5.1.1",
     "node-plantuml": "^0.9.0",
     "npm-font-open-sans": "^1.1.0",
     "npm-run-all": "^4.1.5",
-    "nyc": "^15.1.0",
     "pdf-merger-js": "^3.3.2",
     "pixelmatch": "^5.2.1",
+    "playwright": "^1.18.1",
     "pngjs": "^6.0.0",
     "postcss": "^8.4.5",
     "postcss-cli": "^9.1.0",
     "postcss-inline-svg": "^5.0.0",
     "pretty-bytes": "^5.6.0",
-    "puppeteer": "^13.1.2",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
     "request": "^2.88.0",
@@ -134,66 +123,56 @@
     "rollup-plugin-sourcemaps": "^0.6.3",
     "rollup-plugin-terser": "^7.0.2",
     "rollup-plugin-unassert": "^0.3.0",
-    "rollup-pluginutils": "^2.8.2",
     "rw": "^1.3.3",
-    "selenium-webdriver": "^4.1.1",
     "semver": "^7.3.5",
     "shuffle-seed": "^1.1.6",
-    "sinon": "^12.0.1",
     "source-map-explorer": "^2.5.2",
     "st": "^3.0.0",
     "stylelint": "^14.3.0",
     "stylelint-config-standard": "^24.0.0",
-    "tap-parser": "^10.1.0",
-    "tape": "^5.5.0",
-    "tape-filter": "^1.0.4",
-    "testem": "^3.6.0",
-    "ts-jest": "^27.1.3",
-    "ts-node": "^10.4.0",
+    "ts-node": "^10.5.0",
     "typescript": "^4.5.5"
   },
-  "browser": {
-    "./rollup/build/tsc/src/util/web_worker.js": "./build/web_worker_replacement.js"
-  },
   "scripts": {
-    "build-post-ts": "node build/post-ts-build.js ./rollup/build/tsc/src/shaders",
-    "build-post-ts-min": "node build/post-ts-build.js ./rollup/build/tsc/src/shaders true",
-    "build-tsc": "tsc --outDir rollup/build/tsc && npm run build-post-ts",
-    "build-tsc-min": "tsc --outDir rollup/build/tsc && npm run build-post-ts-min",
-    "build-dev": "npm run build-tsc && rollup -c --environment BUILD:dev",
-    "watch-dev": "rollup -c --environment BUILD:dev --watch",
-    "build-prod": "npm run build-tsc && rollup -c --environment BUILD:production",
-    "build-prod-min": "npm run build-tsc-min && rollup -c --environment BUILD:production,MINIFY:true",
-    "build-csp": "rollup -c rollup.config.csp.js",
-    "build-query-suite": "rollup -c test/integration/rollup.config.test.js",
+    "generate-shaders": "node --loader ts-node/esm --experimental-specifier-resolution=node build/generate-shaders.ts",
+    "generate-struct-arrays": "node --loader ts-node/esm --experimental-specifier-resolution=node build/generate-struct-arrays.ts",
+    "generate-style-code": "node --loader ts-node/esm --experimental-specifier-resolution=node build/generate-style-code.ts",
+    "generate-style-spec": "node --loader ts-node/esm --experimental-specifier-resolution=node build/generate-style-spec.ts",
+    "generate-typings": "node --loader ts-node/esm --experimental-specifier-resolution=node build/generate-typings.ts",
+    "generate-query-test-fixtures": "node --loader ts-node/esm --experimental-specifier-resolution=node build/generate-query-test-fixtures.ts",
+    "build-dev": "rollup --configPlugin @rollup/plugin-typescript -c --environment BUILD:dev",
+    "watch-dev": "rollup --configPlugin @rollup/plugin-typescript -c --environment BUILD:dev --watch",
+    "build-prod": "rollup --configPlugin @rollup/plugin-typescript -c --environment BUILD:production",
+    "build-prod-min": "rollup --configPlugin @rollup/plugin-typescript -c --environment BUILD:production,MINIFY:true",
+    "build-csp": "rollup --configPlugin @rollup/plugin-typescript -c rollup.config.csp.ts",
     "build-css": "postcss -o dist/maplibre-gl.css src/css/maplibre-gl.css",
-    "build-style-spec": "npm run build-tsc && rollup -c rollup.config.style-spec.js && rollup -c rollup.config.style-spec.js --environment esm",
+    "build-style-spec": "rollup --configPlugin @rollup/plugin-typescript -c rollup.config.style-spec.ts && rollup --configPlugin @rollup/plugin-typescript -c rollup.config.style-spec.ts --environment esm",
     "build-diagrams": "cd docs/diagrams; ls *.plantuml | xargs -I {} puml generate --svg {} -o {}.svg",
     "watch-css": "postcss --watch -o dist/maplibre-gl.css src/css/maplibre-gl.css",
-    "build-benchmarks": "npm run build-dev && BENCHMARK_VERSION=${BENCHMARK_VERSION:-\"$(git rev-parse --abbrev-ref HEAD) $(git rev-parse --short=7 HEAD)\"} rollup -c bench/rollup_config_benchmarks.js",
-    "watch-benchmarks": "BENCHMARK_VERSION=${BENCHMARK_VERSION:-\"$(git rev-parse --abbrev-ref HEAD) $(git rev-parse --short=7 HEAD)\"} rollup -c bench/rollup_config_benchmarks.js --watch",
+    "build-benchmarks": "npm run build-dev && rollup --configPlugin @rollup/plugin-typescript -c test/bench/rollup_config_benchmarks.ts",
+    "watch-benchmarks": "rollup --configPlugin @rollup/plugin-typescript -c test/bench/rollup_config_benchmarks.ts --watch",
     "start-server": "st --no-cache -H 0.0.0.0 --port 9966 --index index.html .",
-    "start": "run-p watch-css watch-query start-server",
+    "start-server-at-test": "st --no-cache -H 0.0.0.0 --port 9966 --index index.html -d test",
+    "start": "run-p watch-css start-server",
     "start-debug": "run-p watch-css watch-dev start-server",
-    "start-tests": "run-p watch-css watch-query start-server",
-    "start-bench": "run-p watch-css watch-benchmarks start-server",
-    "lint": "eslint --ext \".ts,.js,.html\" --ignore-path .gitignore src build debug/*.html bench",
+    "start-bench": "run-p watch-css watch-benchmarks start-server-at-test",
+    "lint": "eslint --cache --ext \".ts,.js,.html\" --ignore-path .gitignore src test build debug/*.html jest.config.js",
     "lint-docs": "documentation lint src/index.ts",
     "lint-css": "stylelint \"src/css/maplibre-gl.css\"",
     "test": "run-s lint lint-css lint-docs test-unit",
-    "test-suite": "run-s test-render test-query test-expressions",
-    "test-suite-clean": "find test/integration/{render,query, expressions}-tests -mindepth 2 -type d -exec test -e \"{}/actual.png\" \\; -not \\( -exec test -e \"{}/style.json\" \\; \\) -print | xargs -t rm -r",
     "test-build": "jest ./test/build",
-    "test-browser": "jest ./test/browser",
-    "test-render": "node --experimental-specifier-resolution=node --experimental-json-modules --max-old-space-size=2048 test/render.test.js",
-    "watch-query": "testem -f test/integration/testem.cjs",
-    "test-query": "testem ci -f test/integration/testem.cjs -R xunit > test/integration/query-tests/test-results.xml",
-    "test-expressions": "node --experimental-specifier-resolution=node test/expression.test.js",
-    "test-cov": "nyc --reporter=text-summary --reporter=lcov --cache run-s test-unit test-expressions test-query test-render",
+    "test-symbol-shaping": "jest ./test/integration/symbol-shaping",
+    "test-style-spec": "jest ./test/integration/style-spec",
+    "test-browser": "jest -c ./jest.config.e2e.js ./test/integration/browser",
+    "test-render": "node --loader ts-node/esm --experimental-specifier-resolution=node --experimental-json-modules --max-old-space-size=2048 test/integration/render/render.test.ts",
+    "test-query": "jest -c ./jest.config.e2e.js test/integration/query",
+    "test-expression": "jest test/integration/expression",
     "test-unit": "jest ./src",
-    "codegen": "node --loader ts-node/esm --experimental-specifier-resolution=node build/generate-style-code.ts && node --loader ts-node/esm --experimental-specifier-resolution=node build/generate-struct-arrays.ts && node --loader ts-node/esm --experimental-specifier-resolution=node build/generate-style-spec.ts",
-    "benchmark": "node bench/run-benchmarks.js",
-    "gl-stats": "node bench/gl-stats.js"
+    "codegen": "npm run generate-style-code && npm run generate-struct-arrays && npm run generate-style-spec && npm run generate-shaders",
+    "benchmark": "node --loader ts-node/esm --experimental-specifier-resolution=node test/bench/run-benchmarks.ts",
+    "gl-stats": "node --loader ts-node/esm --experimental-specifier-resolution=node test/bench/gl-stats.ts",
+    "postinstall": "npm run codegen && npm run generate-query-test-fixtures",
+    "prepare": "husky install"
   },
   "files": [
     "build/",

package/src/data/bucket/circle_bucket.ts

@@ -1,4 +1,4 @@
-import {CircleLayoutArray} from '../array_types';
+import {CircleLayoutArray} from '../array_types.g';
 
 import {members as layoutAttributes} from './circle_attributes';
 import SegmentVector from '../segment';

package/src/data/bucket/fill_bucket.test.ts

@@ -13,7 +13,7 @@ import ZoomHistory from '../../style/zoom_history';
 import {BucketFeature, BucketParameters} from '../bucket';
 
 // Load a fill feature from fixture tile.
-const vt = new VectorTile(new Protobuf(fs.readFileSync(path.resolve(__dirname, '../../../test/fixtures/mbsv5-6-18-23.vector.pbf'))));
+const vt = new VectorTile(new Protobuf(fs.readFileSync(path.resolve(__dirname, '../../../test/unit/assets/mbsv5-6-18-23.vector.pbf'))));
 const feature = vt.layers.water.feature(0);
 
 function createPolygon(numPoints) {

package/src/data/bucket/fill_bucket.ts

@@ -1,4 +1,4 @@
-import {FillLayoutArray} from '../array_types';
+import {FillLayoutArray} from '../array_types.g';
 
 import {members as layoutAttributes} from './fill_attributes';
 import SegmentVector from '../segment';
@@ -126,14 +126,14 @@ class FillBucket implements Bucket {
     }
 
     update(states: FeatureStates, vtLayer: VectorTileLayer, imagePositions: {
-      [_: string]: ImagePosition;
+        [_: string]: ImagePosition;
     }) {
         if (!this.stateDependentLayers.length) return;
         this.programConfigurations.updatePaintArrays(states, vtLayer, this.stateDependentLayers, imagePositions);
     }
 
     addFeatures(options: PopulateParameters, canonical: CanonicalTileID, imagePositions: {
-      [_: string]: ImagePosition;
+        [_: string]: ImagePosition;
     }) {
         for (const feature of this.patternFeatures) {
             this.addFeature(feature, feature.geometry, feature.index, canonical, imagePositions);
@@ -168,7 +168,7 @@ class FillBucket implements Bucket {
     }
 
     addFeature(feature: BucketFeature, geometry: Array<Array<Point>>, index: number, canonical: CanonicalTileID, imagePositions: {
-      [_: string]: ImagePosition;
+        [_: string]: ImagePosition;
     }) {
         for (const polygon of classifyRings(geometry, EARCUT_MAX_RINGS)) {
             let numVertices = 0;

package/src/data/bucket/fill_extrusion_bucket.ts

@@ -1,4 +1,4 @@
-import {FillExtrusionLayoutArray} from '../array_types';
+import {FillExtrusionLayoutArray} from '../array_types.g';
 
 import {members as layoutAttributes} from './fill_extrusion_attributes';
 import SegmentVector from '../segment';

package/src/data/bucket/line_bucket.test.ts

@@ -11,7 +11,7 @@ import EvaluationParameters from '../../style/evaluation_parameters';
 import {BucketFeature, BucketParameters} from '../bucket';
 
 // Load a line feature from fixture tile.
-const vt = new VectorTile(new Protobuf(fs.readFileSync(path.resolve(__dirname, '../../../test/fixtures/mbsv5-6-18-23.vector.pbf'))));
+const vt = new VectorTile(new Protobuf(fs.readFileSync(path.resolve(__dirname, '../../../test/unit/assets/mbsv5-6-18-23.vector.pbf'))));
 const feature = vt.layers.road.feature(0);
 
 function createLine(numPoints) {

package/src/data/bucket/line_bucket.ts

@@ -1,4 +1,4 @@
-import {LineLayoutArray, LineExtLayoutArray} from '../array_types';
+import {LineLayoutArray, LineExtLayoutArray} from '../array_types.g';
 
 import {members as layoutAttributes} from './line_attributes';
 import {members as layoutAttributesExt} from './line_attributes_ext';
@@ -71,14 +71,14 @@ const LINE_DISTANCE_SCALE = 1 / 2;
 const MAX_LINE_DISTANCE = Math.pow(2, LINE_DISTANCE_BUFFER_BITS - 1) / LINE_DISTANCE_SCALE;
 
 type LineClips = {
-  start: number;
-  end: number;
+    start: number;
+    end: number;
 };
 
 type GradientTexture = {
-  texture?: Texture;
-  gradient?: RGBAImage;
-  version?: number;
+    texture?: Texture;
+    gradient?: RGBAImage;
+    version?: number;
 };
 
 /**

package/src/data/bucket/symbol_bucket.test.ts

@@ -3,7 +3,7 @@ import path from 'path';
 import Protobuf from 'pbf';
 import {VectorTile} from '@mapbox/vector-tile';
 import SymbolBucket from './symbol_bucket';
-import {CollisionBoxArray} from '../../data/array_types';
+import {CollisionBoxArray} from '../../data/array_types.g';
 import {performSymbolLayout} from '../../symbol/symbol_layout';
 import {Placement} from '../../symbol/placement';
 import Transform from '../../geo/transform';
@@ -11,16 +11,16 @@ import {OverscaledTileID} from '../../source/tile_id';
 import Tile from '../../source/tile';
 import CrossTileSymbolIndex from '../../symbol/cross_tile_symbol_index';
 import FeatureIndex from '../../data/feature_index';
-import {createSymbolBucket, createSymbolIconBucket} from '../../../test/util/create_symbol_layer';
+import {createSymbolBucket, createSymbolIconBucket} from '../../../test/unit/lib/create_symbol_layer';
 import {RGBAImage} from '../../util/image';
 import {ImagePosition} from '../../render/image_atlas';
 import {IndexedFeature, PopulateParameters} from '../bucket';
 import {StyleImage} from '../../style/style_image';
-import glyphs from '../../../test/fixtures/fontstack-glyphs.json';
+import glyphs from '../../../test/unit/assets/fontstack-glyphs.json';
 import {StyleGlyph} from '../../style/style_glyph';
 
 // Load a point feature from fixture tile.
-const vt = new VectorTile(new Protobuf(fs.readFileSync(path.resolve(__dirname, '../../../test/fixtures/mbsv5-6-18-23.vector.pbf'))));
+const vt = new VectorTile(new Protobuf(fs.readFileSync(path.resolve(__dirname, '../../../test/unit/assets/mbsv5-6-18-23.vector.pbf'))));
 const feature = vt.layers.place_label.feature(10);
 
 /*eslint new-cap: 0*/
@@ -139,12 +139,12 @@ describe('SymbolBucket', () => {
         const options = {iconDependencies: {}, glyphDependencies: {}} as PopulateParameters;
 
         bucket.populate(
-        [
-            createIndexedFeature(0, 0, 'a'),
-            createIndexedFeature(1, 1, 'b'),
-            createIndexedFeature(2, 2, 'a')
-        ] as any as IndexedFeature[],
-        options, undefined
+            [
+                createIndexedFeature(0, 0, 'a'),
+                createIndexedFeature(1, 1, 'b'),
+                createIndexedFeature(2, 2, 'a')
+            ] as any as IndexedFeature[],
+            options, undefined
         );
 
         const icons = options.iconDependencies as any;
@@ -179,12 +179,12 @@ describe('SymbolBucket', () => {
         const options = {iconDependencies: {}, glyphDependencies: {}} as PopulateParameters;
 
         bucket.populate(
-        [
-            createIndexedFeature(0, 0, 'a'),
-            createIndexedFeature(1, 1, 'b'),
-            createIndexedFeature(2, 2, 'a')
-        ] as any as IndexedFeature[],
-        options, undefined
+            [
+                createIndexedFeature(0, 0, 'a'),
+                createIndexedFeature(1, 1, 'b'),
+                createIndexedFeature(2, 2, 'a')
+            ] as any as IndexedFeature[],
+            options, undefined
         );
 
         const icons = options.iconDependencies as any;

package/src/data/bucket/symbol_bucket.ts

@@ -14,7 +14,7 @@ import {SymbolLayoutArray,
     SymbolInstanceArray,
     GlyphOffsetArray,
     SymbolLineVertexArray
-} from '../array_types';
+} from '../array_types.g';
 
 import Point from '@mapbox/point-geometry';
 import SegmentVector from '../segment';
@@ -46,7 +46,7 @@ import type {
     IndexedFeature,
     PopulateParameters
 } from '../bucket';
-import type {CollisionBoxArray, CollisionBox, SymbolInstance} from '../array_types';
+import type {CollisionBoxArray, CollisionBox, SymbolInstance} from '../array_types.g';
 import type {StructArray, StructArrayMember, ViewType} from '../../util/struct_array';
 import SymbolStyleLayer, {getOverlapMode} from '../../style/style_layer/symbol_style_layer';
 import type Context from '../../gl/context';
@@ -59,41 +59,41 @@ import type {ImagePosition} from '../../render/image_atlas';
 import type {VectorTileLayer} from '@mapbox/vector-tile';
 
 export type SingleCollisionBox = {
-  x1: number;
-  y1: number;
-  x2: number;
-  y2: number;
-  anchorPointX: number;
-  anchorPointY: number;
+    x1: number;
+    y1: number;
+    x2: number;
+    y2: number;
+    anchorPointX: number;
+    anchorPointY: number;
 };
 
 export type CollisionArrays = {
-  textBox?: SingleCollisionBox;
-  verticalTextBox?: SingleCollisionBox;
-  iconBox?: SingleCollisionBox;
-  verticalIconBox?: SingleCollisionBox;
-  textFeatureIndex?: number;
-  verticalTextFeatureIndex?: number;
-  iconFeatureIndex?: number;
-  verticalIconFeatureIndex?: number;
+    textBox?: SingleCollisionBox;
+    verticalTextBox?: SingleCollisionBox;
+    iconBox?: SingleCollisionBox;
+    verticalIconBox?: SingleCollisionBox;
+    textFeatureIndex?: number;
+    verticalTextFeatureIndex?: number;
+    iconFeatureIndex?: number;
+    verticalIconFeatureIndex?: number;
 };
 
 export type SymbolFeature = {
-  sortKey: number | void;
-  text: Formatted | void;
-  icon: ResolvedImage;
-  index: number;
-  sourceLayerIndex: number;
-  geometry: Array<Array<Point>>;
-  properties: any;
-  type: 'Point' | 'LineString' | 'Polygon';
-  id?: any;
+    sortKey: number | void;
+    text: Formatted | void;
+    icon: ResolvedImage;
+    index: number;
+    sourceLayerIndex: number;
+    geometry: Array<Array<Point>>;
+    properties: any;
+    type: 'Point' | 'LineString' | 'Polygon';
+    id?: any;
 };
 
 export type SortKeyRange = {
-  sortKey: number;
-  symbolInstanceStart: number;
-  symbolInstanceEnd: number;
+    sortKey: number;
+    symbolInstanceStart: number;
+    symbolInstanceEnd: number;
 };
 
 // Opacity arrays are frequently updated but don't contain a lot of information, so we pack them
@@ -244,12 +244,12 @@ class CollisionBuffers {
     collisionVertexBuffer: VertexBuffer;
 
     constructor(LayoutArray: {
-      new (...args: any): StructArray;
+        new (...args: any): StructArray;
     },
-                layoutAttributes: Array<StructArrayMember>,
-                IndexArray: {
-                  new (...args: any): TriangleIndexArray | LineIndexArray;
-                }) {
+    layoutAttributes: Array<StructArrayMember>,
+    IndexArray: {
+        new (...args: any): TriangleIndexArray | LineIndexArray;
+    }) {
         this.layoutVertexArray = new LayoutArray();
         this.layoutAttributes = layoutAttributes;
         this.indexArray = new IndexArray();
@@ -624,17 +624,17 @@ class SymbolBucket implements Bucket {
     }
 
     addSymbols(arrays: SymbolBuffers,
-               quads: Array<SymbolQuad>,
-               sizeVertex: any,
-               lineOffset: [number, number],
-               alongLine: boolean,
-               feature: SymbolFeature,
-               writingMode: WritingMode,
-               labelAnchor: Anchor,
-               lineStartIndex: number,
-               lineLength: number,
-               associatedIconIndex: number,
-               canonical: CanonicalTileID) {
+        quads: Array<SymbolQuad>,
+        sizeVertex: any,
+        lineOffset: [number, number],
+        alongLine: boolean,
+        feature: SymbolFeature,
+        writingMode: WritingMode,
+        labelAnchor: Anchor,
+        lineStartIndex: number,
+        lineLength: number,
+        associatedIconIndex: number,
+        canonical: CanonicalTileID) {
         const indexArray = arrays.indexArray;
         const layoutVertexArray = arrays.layoutVertexArray;
 
@@ -766,15 +766,15 @@ class SymbolBucket implements Bucket {
     // These flat arrays are meant to be quicker to iterate over than the source
     // CollisionBoxArray
     _deserializeCollisionBoxesForSymbol(
-      collisionBoxArray: CollisionBoxArray,
-      textStartIndex: number,
-      textEndIndex: number,
-      verticalTextStartIndex: number,
-      verticalTextEndIndex: number,
-      iconStartIndex: number,
-      iconEndIndex: number,
-      verticalIconStartIndex: number,
-      verticalIconEndIndex: number
+        collisionBoxArray: CollisionBoxArray,
+        textStartIndex: number,
+        textEndIndex: number,
+        verticalTextStartIndex: number,
+        verticalTextEndIndex: number,
+        iconStartIndex: number,
+        iconEndIndex: number,
+        verticalIconStartIndex: number,
+        verticalIconEndIndex: number
     ): CollisionArrays {
 
         const collisionArrays = {} as CollisionArrays;