@mapbox/mapbox-gl-style-spec 14.12.0-beta.1 → 14.12.0

package/composite.ts

@@ -21,6 +21,7 @@ export default function (style) {
     }
 
     if (styleIDs.length < 2)
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-return
         return style;
 
     styleIDs.forEach((id) => {
@@ -48,5 +49,6 @@ export default function (style) {
         }
     });
 
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
     return style;
 }

package/deref.ts

@@ -3,7 +3,7 @@ import refProperties from './util/ref_properties';
 import type {LayerSpecification} from './types';
 
 function deref(layer: LayerSpecification, parent: LayerSpecification): LayerSpecification {
-    const result: Record<string, any> = {};
+    const result = {} as LayerSpecification;
 
     for (const k in layer) {
         if (k !== 'ref') {
@@ -13,11 +13,11 @@ function deref(layer: LayerSpecification, parent: LayerSpecification): LayerSpec
 
     refProperties.forEach((k) => {
         if (k in parent) {
-            result[k] = (parent as any)[k];
+            result[k] = parent[k];
         }
     });
 
-    return result as LayerSpecification;
+    return result;
 }
 
 /**
@@ -36,14 +36,14 @@ function deref(layer: LayerSpecification, parent: LayerSpecification): LayerSpec
 export default function derefLayers(layers: Array<LayerSpecification>): Array<LayerSpecification> {
     layers = layers.slice();
 
-    const map: any = Object.create(null);
+    const map: Record<string, LayerSpecification> = Object.create(null);
     for (let i = 0; i < layers.length; i++) {
         map[layers[i].id] = layers[i];
     }
 
     for (let i = 0; i < layers.length; i++) {
         if ('ref' in layers[i]) {
-            layers[i] = deref(layers[i], map[(layers[i] as any).ref]);
+            layers[i] = deref(layers[i], map[(layers[i] as LayerSpecification & {ref: string}).ref]);
         }
     }
 

package/diff.ts

@@ -8,7 +8,7 @@ type Sources = {
 
 type Command = {
     command: string;
-    args: Array<any>;
+    args: unknown[];
 };
 
 export const operations = {
@@ -240,7 +240,16 @@ function diffSources(before: Sources, after: Sources, commands: Array<Command>,
     }
 }
 
-function diffLayerPropertyChanges(before: any, after: any, commands: Array<Command>, layerId: string, klass: string | null | undefined, command: string) {
+function diffLayerPropertyChanges(before: LayerSpecification['layout'], after: LayerSpecification['layout'], commands: Array<Command>, layerId: string, klass: string | null | undefined, command: string): void;
+function diffLayerPropertyChanges(before: LayerSpecification['paint'], after: LayerSpecification['paint'], commands: Array<Command>, layerId: string, klass: string | null | undefined, command: string): void;
+function diffLayerPropertyChanges(
+    before: LayerSpecification['paint'] | LayerSpecification['layout'],
+    after: LayerSpecification['paint'] | LayerSpecification['layout'],
+    commands: Command[],
+    layerId: string,
+    klass: string | null | undefined,
+    command: string
+) {
     before = before || {};
     after = after || {};
 
@@ -260,22 +269,11 @@ function diffLayerPropertyChanges(before: any, after: any, commands: Array<Comma
     }
 }
 
-function pluckId<T extends {
-    id: string;
-}>(item: T): string {
+function pluckId<T extends {id: string}>(item: T): string {
     return item.id;
 }
 
-function indexById<T extends {
-    id: string;
-}>(
-    group: {
-        [key: string]: T;
-    },
-    item: T,
-): {
-    [id: string]: T;
-} {
+function indexById<T extends {id: string}>(group: {[key: string]: T}, item: T): {[id: string]: T} {
     group[item.id] = item;
     return group;
 }
@@ -289,14 +287,14 @@ function diffLayers(before: Array<LayerSpecification>, after: Array<LayerSpecifi
     const afterOrder = after.map(pluckId);
 
     // index of layer by id
-    const beforeIndex = before.reduce<Record<string, any>>(indexById, {});
-    const afterIndex = after.reduce<Record<string, any>>(indexById, {});
+    const beforeIndex = before.reduce(indexById, {});
+    const afterIndex = after.reduce(indexById, {});
 
     // track order of layers as if they have been mutated
     const tracker = beforeOrder.slice();
 
     // layers that have been added do not need to be diffed
-    const clean: any = Object.create(null);
+    const clean = Object.create(null);
 
     let i, d, layerId, beforeLayer: LayerSpecification, afterLayer: LayerSpecification, insertBeforeLayerId, prop;
 
@@ -401,8 +399,8 @@ export function diffImports(before: Array<ImportSpecification> | null | undefine
     const afterOrder = after.map(pluckId);
 
     // index imports by id
-    const beforeIndex = before.reduce<Record<string, any>>(indexById, {});
-    const afterIndex = after.reduce<Record<string, any>>(indexById, {});
+    const beforeIndex = before.reduce(indexById, {});
+    const afterIndex = after.reduce(indexById, {});
 
     // track order of imports as if they have been mutated
     const tracker = beforeOrder.slice();

package/dist/index.cjs

@@ -794,6 +794,16 @@
   		],
   		doc: "An array containing the longitude and latitude of the southwest and northeast corners of the source's bounding box in the following order: `[sw.lng, sw.lat, ne.lng, ne.lat]`. When this property is included in a source, no tiles outside of the given bounds are requested by Mapbox GL."
   	},
+  	extra_bounds: {
+  		type: "array",
+  		value: {
+  			type: "array",
+  			value: "number",
+  			length: 4,
+  			doc: "An array containing the longitude and latitude of the southwest and northeast corners of the source's bounding box in the following order: `[sw.lng, sw.lat, ne.lng, ne.lat]`."
+  		},
+  		doc: "An array of additional discrete geographic regions where tiles are available. When used alongside the `bounds` property, these regions act as an additional filter - Mapbox GL will only request tiles that are both within the `bounds` and any of the regions defined in `extra_bounds`. When used independently (without `bounds`), Mapbox GL will request tiles that fall within any of the regions in `extra_bounds`. This allows for more fine-grained control over tile requests, particularly when dealing with sparse data coverage."
+  	},
   	scheme: {
   		type: "enum",
   		values: {
@@ -873,6 +883,16 @@
   		],
   		doc: "An array containing the longitude and latitude of the southwest and northeast corners of the source's bounding box in the following order: `[sw.lng, sw.lat, ne.lng, ne.lat]`. When this property is included in a source, no tiles outside of the given bounds are requested by Mapbox GL."
   	},
+  	extra_bounds: {
+  		type: "array",
+  		value: {
+  			type: "array",
+  			value: "number",
+  			length: 4,
+  			doc: "An array containing the longitude and latitude of the southwest and northeast corners of the source's bounding box in the following order: `[sw.lng, sw.lat, ne.lng, ne.lat]`."
+  		},
+  		doc: "An array of additional discrete geographic regions where tiles are available. When used alongside the `bounds` property, these regions act as an additional filter - Mapbox GL will only request tiles that are both within the `bounds` and any of the regions defined in `extra_bounds`. When used independently (without `bounds`), Mapbox GL will request tiles that fall within any of the regions in `extra_bounds`. This allows for more fine-grained control over tile requests, particularly when dealing with sparse data coverage."
+  	},
   	minzoom: {
   		type: "number",
   		"default": 0,
@@ -954,6 +974,16 @@
   		],
   		doc: "An array containing the longitude and latitude of the southwest and northeast corners of the source's bounding box in the following order: `[sw.lng, sw.lat, ne.lng, ne.lat]`. When this property is included in a source, no tiles outside of the given bounds are requested by Mapbox GL."
   	},
+  	extra_bounds: {
+  		type: "array",
+  		value: {
+  			type: "array",
+  			value: "number",
+  			length: 4,
+  			doc: "An array containing the longitude and latitude of the southwest and northeast corners of the source's bounding box in the following order: `[sw.lng, sw.lat, ne.lng, ne.lat]`."
+  		},
+  		doc: "An array of additional discrete geographic regions where tiles are available. When used alongside the `bounds` property, these regions act as an additional filter - Mapbox GL will only request tiles that are both within the `bounds` and any of the regions defined in `extra_bounds`. When used independently (without `bounds`), Mapbox GL will request tiles that fall within any of the regions in `extra_bounds`. This allows for more fine-grained control over tile requests, particularly when dealing with sparse data coverage."
+  	},
   	minzoom: {
   		type: "number",
   		"default": 0,
@@ -1036,6 +1066,16 @@
   		],
   		doc: "An array containing the longitude and latitude of the southwest and northeast corners of the source's bounding box in the following order: `[sw.lng, sw.lat, ne.lng, ne.lat]`. When this property is included in a source, no tiles outside of the given bounds are requested by Mapbox GL."
   	},
+  	extra_bounds: {
+  		type: "array",
+  		value: {
+  			type: "array",
+  			value: "number",
+  			length: 4,
+  			doc: "An array containing the longitude and latitude of the southwest and northeast corners of the source's bounding box in the following order: `[sw.lng, sw.lat, ne.lng, ne.lat]`."
+  		},
+  		doc: "An array of additional discrete geographic regions where tiles are available. When used alongside the `bounds` property, these regions act as an additional filter - Mapbox GL will only request tiles that are both within the `bounds` and any of the regions defined in `extra_bounds`. When used independently (without `bounds`), Mapbox GL will request tiles that fall within any of the regions in `extra_bounds`. This allows for more fine-grained control over tile requests, particularly when dealing with sparse data coverage."
+  	},
   	minzoom: {
   		type: "number",
   		"default": 0,
@@ -6450,6 +6490,30 @@
   		},
   		"property-type": "data-driven"
   	},
+  	"fill-pattern-cross-fade": {
+  		type: "number",
+  		"property-type": "data-constant",
+  		"default": 0,
+  		minimum: 0,
+  		maximum: 1,
+  		expression: {
+  			interpolated: true,
+  			parameters: [
+  				"zoom",
+  				"measure-light"
+  			]
+  		},
+  		requires: [
+  			"line-pattern"
+  		],
+  		"sdk-support": {
+  			"basic functionality": {
+  				js: "3.12.0"
+  			}
+  		},
+  		doc: "Controls the transition progress between the image variants of fill-pattern. Zero means the first variant is used, one is the second, and in between they are blended together.",
+  		transition: true
+  	},
   	"fill-emissive-strength": {
   		type: "number",
   		"default": 0,
@@ -7034,6 +7098,30 @@
   		},
   		"property-type": "data-driven"
   	},
+  	"line-pattern-cross-fade": {
+  		type: "number",
+  		"property-type": "data-constant",
+  		"default": 0,
+  		minimum: 0,
+  		maximum: 1,
+  		expression: {
+  			interpolated: true,
+  			parameters: [
+  				"zoom",
+  				"measure-light"
+  			]
+  		},
+  		requires: [
+  			"line-pattern"
+  		],
+  		"sdk-support": {
+  			"basic functionality": {
+  				js: "3.12.0"
+  			}
+  		},
+  		doc: "Controls the transition progress between the image variants of line-pattern. Zero means the first variant is used, one is the second, and in between they are blended together.",
+  		transition: true
+  	},
   	"line-gradient": {
   		type: "color",
   		doc: "A gradient used to color a line feature at various distances along its length. Defined using a `step` or `interpolate` expression which outputs a color for each corresponding `line-progress` input value. `line-progress` is a percentage of the line feature's total length as measured on the webmercator projected coordinate plane (a `number` between `0` and `1`). Can only be used with GeoJSON sources that specify `\"lineMetrics\": true`.",
@@ -8112,7 +8200,7 @@
   	},
   	"icon-image-cross-fade": {
   		type: "number",
-  		"property-type": "data-driven",
+  		"property-type": "data-constant",
   		"default": 0,
   		minimum: 0,
   		maximum: 1,
@@ -8120,8 +8208,6 @@
   			interpolated: true,
   			parameters: [
   				"zoom",
-  				"feature",
-  				"feature-state",
   				"measure-light"
   			]
   		},
@@ -8133,11 +8219,6 @@
   				js: "3.0.0",
   				android: "11.0.0",
   				ios: "11.0.0"
-  			},
-  			"data-driven styling": {
-  				js: "3.0.0",
-  				android: "11.0.0",
-  				ios: "11.0.0"
   			}
   		},
   		doc: "Controls the transition progress between the image variants of icon-image. Zero means the first variant is used, one is the second, and in between they are blended together.",
@@ -10258,6 +10339,30 @@
   		},
   		"property-type": "data-driven"
   	},
+  	"fill-extrusion-pattern-cross-fade": {
+  		type: "number",
+  		"property-type": "data-constant",
+  		"default": 0,
+  		minimum: 0,
+  		maximum: 1,
+  		expression: {
+  			interpolated: true,
+  			parameters: [
+  				"zoom",
+  				"measure-light"
+  			]
+  		},
+  		requires: [
+  			"line-pattern"
+  		],
+  		"sdk-support": {
+  			"basic functionality": {
+  				js: "3.12.0"
+  			}
+  		},
+  		doc: "Controls the transition progress between the image variants of fill-extrusion-pattern. Zero means the first variant is used, one is the second, and in between they are blended together.",
+  		transition: true
+  	},
   	"fill-extrusion-height": {
   		type: "number",
   		"default": 0,
@@ -12925,8 +13030,8 @@
               ])
           });
       }
-      scaleSelf(factor) {
-          this.options.transform.scaleSelf(factor);
+      scaleSelf(factor, yFactor) {
+          this.options.transform.scaleSelf(factor, yFactor);
           return this;
       }
   }
@@ -13221,6 +13326,7 @@
           }
           return new Assertion(type, parsed);
       }
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       evaluate(ctx) {
           for (let i = 0; i < this.args.length; i++) {
               const value = this.args[i].evaluate(ctx);
@@ -13640,6 +13746,7 @@
           }
           return new Coercion(type, parsed);
       }
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       evaluate(ctx) {
           if (this.type.kind === 'boolean') {
               return Boolean(this.args[0].evaluate(ctx));
@@ -15776,6 +15883,7 @@
           }
           return new Config(type, toString(configKey.value));
       }
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       evaluate(ctx) {
           const FQIDSeparator = '\x1F';
           const configKey = [
@@ -15920,6 +16028,7 @@
           }
           return new Var(name, context.scope.get(name));
       }
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       evaluate(ctx) {
           return this.boundExpression.evaluate(ctx);
       }
@@ -16185,6 +16294,7 @@
           }
           return new Step(outputType, input, stops);
       }
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       evaluate(ctx) {
           const labels = this.labels;
           const outputs = this.outputs;
@@ -16587,6 +16697,7 @@
           const needsAnnotation = expectedType && parsedArgs.some(arg => checkSubtype(expectedType, arg.type));
           return needsAnnotation ? new Coalesce(ValueType, parsedArgs) : new Coalesce(outputType, parsedArgs);
       }
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       evaluate(ctx) {
           let result = null;
           let argCount = 0;
@@ -16629,6 +16740,7 @@
           this.bindings = [].concat(bindings);
           this.result = result;
       }
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       evaluate(ctx) {
           return this.result.evaluate(ctx);
       }
@@ -16871,6 +16983,7 @@
               return new IndexOf(needle, haystack);
           }
       }
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       evaluate(ctx) {
           const needle = this.needle.evaluate(ctx);
           const haystack = this.haystack.evaluate(ctx);
@@ -16987,6 +17100,7 @@
           }
           return new Match(inputType, outputType, input, cases, outputs, otherwise);
       }
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       evaluate(ctx) {
           const input = this.input.evaluate(ctx);
           const output = typeOf(input) === this.inputType && this.outputs[this.cases[input]] || this.otherwise;
@@ -17068,6 +17182,7 @@
               return null;
           return new Case(outputType, branches, otherwise);
       }
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       evaluate(ctx) {
           for (const [test, expression] of this.branches) {
               if (test.evaluate(ctx)) {
@@ -17126,6 +17241,7 @@
               return new Slice(input.type, input, beginIndex);
           }
       }
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       evaluate(ctx) {
           const input = this.input.evaluate(ctx);
           const beginIndex = this.beginIndex.evaluate(ctx);
@@ -17646,6 +17762,7 @@
           overloads: [
               [
                   [StringType],
+                  // eslint-disable-next-line @typescript-eslint/no-unsafe-return
                   (ctx, [key]) => get(key.evaluate(ctx), ctx.properties())
               ],
               [
@@ -17653,6 +17770,7 @@
                       StringType,
                       ObjectType
                   ],
+                  // eslint-disable-next-line @typescript-eslint/no-unsafe-return
                   (ctx, [key, obj]) => get(key.evaluate(ctx), obj.evaluate(ctx))
               ]
           ]
@@ -17660,6 +17778,7 @@
       'feature-state': [
           ValueType,
           [StringType],
+          // eslint-disable-next-line @typescript-eslint/no-unsafe-return
           (ctx, [key]) => get(key.evaluate(ctx), ctx.featureState || {})
       ],
       'properties': [
@@ -17857,11 +17976,13 @@
       'min': [
           NumberType,
           varargs(NumberType),
+          // eslint-disable-next-line @typescript-eslint/no-unsafe-return
           (ctx, args) => Math.min(...args.map(arg => arg.evaluate(ctx)))
       ],
       'max': [
           NumberType,
           varargs(NumberType),
+          // eslint-disable-next-line @typescript-eslint/no-unsafe-return
           (ctx, args) => Math.max(...args.map(arg => arg.evaluate(ctx)))
       ],
       'abs': [
@@ -18035,6 +18156,7 @@
                       BooleanType,
                       BooleanType
                   ],
+                  // eslint-disable-next-line @typescript-eslint/no-unsafe-return
                   (ctx, [a, b]) => a.evaluate(ctx) && b.evaluate(ctx)
               ],
               [
@@ -18057,6 +18179,7 @@
                       BooleanType,
                       BooleanType
                   ],
+                  // eslint-disable-next-line @typescript-eslint/no-unsafe-return
                   (ctx, [a, b]) => a.evaluate(ctx) || b.evaluate(ctx)
               ],
               [
@@ -18091,11 +18214,13 @@
       'upcase': [
           StringType,
           [StringType],
+          // eslint-disable-next-line @typescript-eslint/no-unsafe-return
           (ctx, [s]) => s.evaluate(ctx).toUpperCase()
       ],
       'downcase': [
           StringType,
           [StringType],
+          // eslint-disable-next-line @typescript-eslint/no-unsafe-return
           (ctx, [s]) => s.evaluate(ctx).toLowerCase()
       ],
       'concat': [
@@ -18106,6 +18231,7 @@
       'resolved-locale': [
           StringType,
           [CollatorType],
+          // eslint-disable-next-line @typescript-eslint/no-unsafe-return
           (ctx, [collator]) => collator.evaluate(ctx).resolvedLocale()
       ],
       'random': [
@@ -18253,6 +18379,7 @@
               kind: 'composite',
               interpolationType,
               interpolationFactor: Interpolate.interpolationFactor.bind(void 0, interpolationType),
+              // eslint-disable-next-line @typescript-eslint/no-unsafe-return
               zoomStops: featureFunctionStops.map(s => s[0]),
               evaluate({zoom}, properties) {
                   return evaluateExponentialFunction({
@@ -18270,7 +18397,9 @@
               kind: 'camera',
               interpolationType,
               interpolationFactor: Interpolate.interpolationFactor.bind(void 0, interpolationType),
+              // eslint-disable-next-line @typescript-eslint/no-unsafe-return
               zoomStops: parameters.stops.map(s => s[0]),
+              // eslint-disable-next-line @typescript-eslint/no-unsafe-return
               evaluate: ({zoom}) => innerFun(parameters, propertySpec, zoom, hashedStops, categoricalKeyType)
           };
       } else {
@@ -19376,7 +19505,8 @@ ${ JSON.stringify(filterExp, null, 2) }
               negate
           ];
       }
-      return [negate ? 'all' : 'any'].concat(values.map(v => [
+      return [negate ? 'all' : 'any'].concat(// eslint-disable-next-line @typescript-eslint/no-explicit-any
+      values.map(v => [
           negate ? '!=' : '==',
           get,
           v
@@ -22632,7 +22762,7 @@ Use an identity property function instead: ${ example }.`)];
       return !!value.match(regex);
   }
   function getSourceCount(source) {
-      if (source.url) {
+      if ('url' in source) {
           return source.url.split(',').length;
       } else {
           return 0;
@@ -22671,7 +22801,7 @@ Use an identity property function instead: ${ example }.`)];
           errors.push(new ValidationError(`sources[${ i }].type`, source.type, `Expected one of [${ Array.from(acceptedSourceTypes).join(', ') }]`));
       }
       const sourceUrlPattern = /^mapbox:\/\/([^/]*)$/;
-      if (!source.url || !isValid(source.url, sourceUrlPattern)) {
+      if (!('url' in source) || !isValid(source.url, sourceUrlPattern)) {
           errors.push(new ValidationError(`sources[${ i }].url`, source.url, 'Expected a valid Mapbox tileset url'));
       }
       return errors;