maplibre-gl 2.2.0 → 2.3.1-pre.1

package/src/style-spec/migrate/v8.test.ts

@@ -1,5 +1,3 @@
-// @ts-nocheck
-
 import migrate from './v8';
 
 describe('migrate v8', () => {
@@ -23,7 +21,7 @@ describe('migrate v8', () => {
                     }
                 }
             ]
-        };
+        } as any;
 
         const output = {
             'version': 8,
@@ -68,7 +66,7 @@ describe('migrate v8', () => {
                     }
                 }
             ]
-        };
+        } as any;
 
         const output = {
             'version': 8,
@@ -103,7 +101,7 @@ describe('migrate v8', () => {
                 }
             },
             'layers': []
-        };
+        } as any;
 
         const output = {
             'version': 8,
@@ -140,7 +138,7 @@ describe('migrate v8', () => {
                     }
                 }
             }]
-        };
+        } as any;
 
         const output = {
             'version': 8,
@@ -187,7 +185,7 @@ describe('migrate v8', () => {
                     }
                 }
             }]
-        };
+        } as any;
 
         const output = {
             'version': 8,
@@ -233,7 +231,7 @@ describe('migrate v8', () => {
                     }
                 }
             ]
-        };
+        } as any;
 
         const output = {
             'version': 8,
@@ -276,7 +274,7 @@ describe('migrate v8', () => {
                     }
                 }
             ]
-        };
+        } as any;
 
         const output = {
             'version': 8,
@@ -328,7 +326,7 @@ describe('migrate v8', () => {
                     }
                 }
             ]
-        };
+        } as any;
 
         const output = {
             'version': 8,
@@ -389,7 +387,7 @@ describe('migrate v8', () => {
                     }
                 }
             ]
-        };
+        } as any;
 
         const output = {
             'version': 8,
@@ -445,7 +443,7 @@ describe('migrate v8', () => {
                     }
                 }
             ]
-        };
+        } as any;
 
         const output = {
             'version': 8,
@@ -479,7 +477,7 @@ describe('migrate v8', () => {
             'version': 7,
             'glyphs': 'mapbox://fontstack/{fontstack}/{range}.pbf',
             'layers': []
-        };
+        } as any;
 
         const output = {
             'version': 8,
@@ -495,7 +493,7 @@ describe('migrate v8', () => {
             'version': 7,
             'glyphs': 'mapbox://fonts/v1/boxmap/{fontstack}/{range}.pbf',
             'layers': []
-        };
+        } as any;
 
         const output = {
             'version': 8,

package/src/style-spec/migrate/v9.test.ts

@@ -1,5 +1,3 @@
-// @ts-nocheck
-
 import migrate from './v9';
 
 describe('migrate v9', () => {
@@ -18,7 +16,7 @@ describe('migrate v9', () => {
                 id: 'child',
                 ref: 'parent'
             }]
-        };
+        } as any;
 
         expect(migrate(input)).toEqual({
             version: 9,
@@ -58,7 +56,7 @@ describe('migrate v9', () => {
                     'fill-color': 'blue'
                 }
             }]
-        };
+        } as any;
 
         expect(migrate(input)).toEqual({
             version: 9,

package/src/style-spec/migrate.test.ts

@@ -1,5 +1,3 @@
-// @ts-nocheck
-
 import migrate from './migrate';
 import * as spec from './style-spec';
 import v8 from './reference/v8.json';
@@ -8,18 +6,18 @@ import validate from './validate_style';
 describe('migrate', () => {
     test('does not migrate from version 5', () => {
         expect(() => {
-            migrate({version: 5, layers: []});
+            migrate({version: 5, layers: []} as any);
         }).toThrow(new Error('Cannot migrate from 5'));
     });
 
     test('does not migrate from version 6', () => {
         expect(() => {
-            migrate({version: 6, layers: []});
+            migrate({version: 6, layers: []} as any);
         }).toThrow(new Error('Cannot migrate from 6'));
     });
 
     test('migrates to latest version from version 7', () => {
-        expect(migrate({version: 7, layers: []}).version).toEqual(spec.latest.$version);
+        expect(migrate({version: 7, layers: []} as any).version).toEqual(spec.latest.$version);
     });
 
     test('converts token strings to expressions', () => {
@@ -30,7 +28,7 @@ describe('migrate', () => {
                 type: 'symbol',
                 layout: {'text-field': 'a{x}', 'icon-image': '{y}'}
             }]
-        });
+        } as any);
         expect(migrated.layers[0].layout['text-field']).toEqual(['concat', 'a', ['get', 'x']]);
         expect(migrated.layers[0].layout['icon-image']).toEqual(['to-string', ['get', 'y']]);
     });
@@ -57,7 +55,7 @@ describe('migrate', () => {
                     }
                 }
             }]
-        });
+        } as any);
         expect(migrated.layers[0].paint['background-opacity']).toEqual([
             'interpolate',
             ['linear'],
@@ -101,7 +99,7 @@ describe('migrate', () => {
                     }
                 }
             }]
-        });
+        } as any);
         expect(migrated.layers[0].layout['icon-image']).toEqual([
             'match',
             ['get', 'type'],

package/src/style-spec/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@maplibre/maplibre-gl-style-spec",
   "description": "a specification for maplibre gl styles",
-  "version": "16.1.0",
+  "version": "17.0.1",
   "author": "MapLibre",
   "keywords": [
     "mapbox",
@@ -14,6 +14,7 @@
   "license": "ISC",
   "main": "./dist/index.cjs",
   "module": "./dist/index.mjs",
+  "types": "./dist/index.d.ts",
   "type": "module",
   "scripts": {
   },

package/src/style-spec/reference/latest.ts

@@ -1,3 +1,3 @@
 
 import spec from './v8.json' assert {type: 'json'};
-export default spec;
+export default spec as any;

package/src/style-spec/style-spec.ts

@@ -1,7 +1,7 @@
 type ExpressionType = 'data-driven' | 'cross-faded' | 'cross-faded-data-driven' | 'color-ramp' | 'data-constant' | 'constant';
 type ExpressionParameters = Array<'zoom' | 'feature' | 'feature-state' | 'heatmap-density' | 'line-progress'>;
 
-type ExpressionSpecification = {
+type ExpressionSpecificationDefinition = {
     interpolated: boolean;
     parameters: ExpressionParameters;
 };
@@ -9,33 +9,33 @@ type ExpressionSpecification = {
 export 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]: {}};
     transition: boolean;
     default?: string;
 } | {
     type: 'color';
     'property-type': ExpressionType;
-    expression?: ExpressionSpecification;
+    expression?: ExpressionSpecificationDefinition;
     transition: boolean;
     default?: string;
     overridable: boolean;
@@ -43,7 +43,7 @@ export type StylePropertySpecification = {
     type: 'array';
     value: 'number';
     'property-type': ExpressionType;
-    expression?: ExpressionSpecification;
+    expression?: ExpressionSpecificationDefinition;
     length?: number;
     transition: boolean;
     default?: Array<number>;
@@ -51,19 +51,20 @@ export 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?: ExpressionSpecification;
+    expression?: ExpressionSpecificationDefinition;
     transition: boolean;
     default?: number | Array<number>;
 };
 
-import v8 from './reference/v8.json';
+import v8Spec from './reference/v8.json' assert {type: 'json'};
+const v8 = v8Spec as any;
 import latest from './reference/latest';
 import format from './format';
 import migrate from './migrate';

package/src/style-spec/types.g.ts

@@ -24,7 +24,7 @@ export type InterpolationSpecification =
     | ['linear'] 
     | ['exponential', number | ExpressionSpecification] 
     | ['cubic-bezier', number | ExpressionSpecification, number | ExpressionSpecification, number | ExpressionSpecification, number | ExpressionSpecification]
-    
+
 export type ExpressionSpecification = 
     // types
     | ['array', unknown | ExpressionSpecification] // array
@@ -79,8 +79,7 @@ export type ExpressionSpecification =
     | ['within', unknown | ExpressionSpecification]
     // Ramps, scales, curves
     | ['interpolate', InterpolationSpecification, 
-        number | ExpressionSpecification, number | ExpressionSpecification, ExpressionInputType | ExpressionSpecification, 
-        ...(number | ExpressionInputType | ExpressionSpecification)[]]
+        number | ExpressionSpecification, ...(number | ExpressionInputType | ExpressionSpecification)[]]
     | ['interpolate-hcl', InterpolationSpecification,
         number | ExpressionSpecification, number | ExpressionSpecification, ExpressionInputType | ExpressionSpecification, 
         ...(number | ColorSpecification | ExpressionSpecification)[]]

package/src/symbol/collision_index.ts

@@ -6,7 +6,6 @@ import * as intersectionTests from '../util/intersection_tests';
 import GridIndex from './grid_index';
 import {mat4, vec4} from 'gl-matrix';
 import ONE_EM from '../symbol/one_em';
-import assert from 'assert';
 
 import * as projection from '../symbol/projection';
 
@@ -181,7 +180,6 @@ class CollisionIndex {
             for (let i = 1; i < last.path.length; i++) {
                 projectedPath.push(last.path[i]);
             }
-            assert(projectedPath.length >= 2);
 
             // Tolerate a slightly longer distance than one diameter between two adjacent circles
             const circleDist = radius * 2.5;
@@ -229,7 +227,6 @@ class CollisionIndex {
 
             for (const seg of segments) {
                 // interpolate positions for collision circles. Add a small padding to both ends of the segment
-                assert(seg.length > 0);
                 interpolator.reset(seg, radius * 0.25);
 
                 let numCircles = 0;

package/src/symbol/path_interpolator.ts

@@ -1,6 +1,5 @@
 import {clamp} from '../util/util';
 import Point from '@mapbox/point-geometry';
-import assert from 'assert';
 
 class PathInterpolator {
     points: Array<Point>;
@@ -30,7 +29,6 @@ class PathInterpolator {
     }
 
     lerp(t: number): Point {
-        assert(this.points.length > 0);
         if (this.points.length === 1) {
             return this.points[0];
         }

package/src/symbol/placement.ts

@@ -6,7 +6,6 @@ import * as projection from './projection';
 import {getAnchorJustification, evaluateVariableOffset} from './symbol_layout';
 import {getAnchorAlignment, WritingMode} from './shaping';
 import {mat4} from 'gl-matrix';
-import assert from 'assert';
 import pixelsToTileUnits from '../source/pixels_to_tile_units';
 import Point from '@mapbox/point-geometry';
 import type Transform from '../geo/transform';
@@ -23,6 +22,7 @@ import type FeatureIndex from '../data/feature_index';
 import type {OverscaledTileID} from '../source/tile_id';
 import type {TextAnchor} from './symbol_layout';
 import Terrain from '../render/terrain';
+import {warnOnce} from '../util/util';
 
 class OpacityState {
     opacity: number;
@@ -391,7 +391,7 @@ export class Placement {
                 this.prevPlacement.placements[symbolInstance.crossTileID].text) {
                 prevAnchor = this.prevPlacement.variableOffsets[symbolInstance.crossTileID].anchor;
             }
-            assert(symbolInstance.crossTileID !== 0);
+            if (symbolInstance.crossTileID === 0) throw new Error('symbolInstance.crossTileID can\'t be 0');
             this.variableOffsets[symbolInstance.crossTileID] = {
                 textOffset,
                 width,
@@ -676,7 +676,10 @@ export class Placement {
                     getElevation
                 );
 
-                assert(!placedGlyphCircles.circles.length || (!placedGlyphCircles.collisionDetected || showCollisionBoxes));
+                if (placedGlyphCircles.circles.length && placedGlyphCircles.collisionDetected && !showCollisionBoxes) {
+                    warnOnce('Collisions detected, but collision boxes are not shown');
+                }
+
                 // If text-overlap is set to 'always', force "placedCircles" to true
                 // In theory there should always be at least one circle placed
                 // in this case, but for now quirks in text-anchor
@@ -781,15 +784,15 @@ export class Placement {
                 }
             }
 
-            assert(symbolInstance.crossTileID !== 0);
-            assert(bucket.bucketInstanceId !== 0);
+            if (symbolInstance.crossTileID === 0) throw new Error('symbolInstance.crossTileID can\'t be 0');
+            if (bucket.bucketInstanceId === 0) throw new Error('bucket.bucketInstanceId can\'t be 0');
 
             this.placements[symbolInstance.crossTileID] = new JointPlacement(placeText || alwaysShowText, placeIcon || alwaysShowIcon, offscreen || bucket.justReloaded);
             seenCrossTileIDs[symbolInstance.crossTileID] = true;
         };
 
         if (zOrderByViewportY) {
-            assert(bucketPart.symbolInstanceStart === 0);
+            if (bucketPart.symbolInstanceStart !== 0) throw new Error('bucket.bucketInstanceId should be 0');
             const symbolIndexes = bucket.getSortedSymbolIndexes(this.transform.angle);
             for (let i = symbolIndexes.length - 1; i >= 0; --i) {
                 const symbolIndex = symbolIndexes[i];
@@ -920,7 +923,9 @@ export class Placement {
         // this.lastPlacementChangeTime is the time of the last commit() that
         // resulted in a placement change -- in other words, the start time of
         // the last symbol fade animation
-        assert(!prevPlacement || prevPlacement.lastPlacementChangeTime !== undefined);
+        if (prevPlacement && prevPlacement.lastPlacementChangeTime === undefined) {
+            throw new Error('Last placement time for previous placement is not defined');
+        }
         if (placementChanged) {
             this.lastPlacementChangeTime = now;
         } else if (typeof this.lastPlacementChangeTime !== 'number') {
@@ -1133,8 +1138,8 @@ export class Placement {
             bucket.textCollisionBox.collisionVertexBuffer.updateData(bucket.textCollisionBox.collisionVertexArray);
         }
 
-        assert(bucket.text.opacityVertexArray.length === bucket.text.layoutVertexArray.length / 4);
-        assert(bucket.icon.opacityVertexArray.length === bucket.icon.layoutVertexArray.length / 4);
+        if (bucket.text.opacityVertexArray.length !== bucket.text.layoutVertexArray.length / 4) throw new Error(`bucket.text.opacityVertexArray.length (= ${bucket.text.opacityVertexArray.length}) !== bucket.text.layoutVertexArray.length (= ${bucket.text.layoutVertexArray.length}) / 4`);
+        if (bucket.icon.opacityVertexArray.length !== bucket.icon.layoutVertexArray.length / 4) throw new Error(`bucket.icon.opacityVertexArray.length (= ${bucket.icon.opacityVertexArray.length}) !== bucket.icon.layoutVertexArray.length (= ${bucket.icon.layoutVertexArray.length}) / 4`);
 
         // Push generated collision circles to the bucket for debug rendering
         if (bucket.bucketInstanceId in this.collisionCircleArrays) {

package/src/symbol/shaping.ts

@@ -1,4 +1,3 @@
-import assert from 'assert';
 import {
     charHasUprightVerticalOrientation,
     charAllowsIdeographicBreaking,
@@ -811,9 +810,6 @@ function fitIconToText(
     iconOffset: [number, number],
     fontScale: number
 ): PositionedIcon {
-    assert(textFit !== 'none');
-    assert(Array.isArray(padding) && padding.length === 4);
-    assert(Array.isArray(iconOffset) && iconOffset.length === 2);
 
     const image = shapedIcon.image;