@mapbox/mapbox-gl-style-spec 14.8.0 → 14.9.0

package/expression/values.ts

@@ -13,14 +13,14 @@ export function validateRGBA(r: unknown, g: unknown, b: unknown, a?: unknown): s
         typeof g === 'number' && g >= 0 && g <= 255 &&
         typeof b === 'number' && b >= 0 && b <= 255
     )) {
-        const value = typeof a === 'number' ? [r, g, b, a] : [r, g, b];
+        const value = (typeof a === 'number' ? [r, g, b, a] : [r, g, b]) as number[];
         return `Invalid rgba value [${value.join(', ')}]: 'r', 'g', and 'b' must be between 0 and 255.`;
     }
 
     if (!(
         typeof a === 'undefined' || (typeof a === 'number' && a >= 0 && a <= 1)
     )) {
-        return `Invalid rgba value [${[r, g, b, a].join(', ')}]: 'a' must be between 0 and 1.`;
+        return `Invalid rgba value [${([r, g, b, a] as number[]).join(', ')}]: 'a' must be between 0 and 1.`;
     }
 
     return null;
@@ -30,7 +30,7 @@ export function validateHSLA(h: unknown, s: unknown, l: unknown, a?: unknown): s
     if (!(
         typeof h === 'number' && h >= 0 && h <= 360
     )) {
-        const value = typeof a === 'number' ? [h, s, l, a] : [h, s, l];
+        const value = (typeof a === 'number' ? [h, s, l, a] : [h, s, l]) as number[];
         return `Invalid hsla value [${value.join(', ')}]: 'h' must be between 0 and 360.`;
     }
 
@@ -38,14 +38,14 @@ export function validateHSLA(h: unknown, s: unknown, l: unknown, a?: unknown): s
         typeof s === 'number' && s >= 0 && s <= 100 &&
         typeof l === 'number' && l >= 0 && l <= 100
     )) {
-        const value = typeof a === 'number' ? [h, s, l, a] : [h, s, l];
+        const value = (typeof a === 'number' ? [h, s, l, a] : [h, s, l]) as number[];
         return `Invalid hsla value [${value.join(', ')}]: 's', and 'l' must be between 0 and 100.`;
     }
 
     if (!(
         typeof a === 'undefined' || (typeof a === 'number' && a >= 0 && a <= 1)
     )) {
-        return `Invalid hsla value [${[h, s, l, a].join(', ')}]: 'a' must be between 0 and 1.`;
+        return `Invalid hsla value [${([h, s, l, a] as number[]).join(', ')}]: 'a' must be between 0 and 1.`;
     }
 
     return null;
@@ -136,8 +136,10 @@ export function toString(value: Value): string {
     if (value === null) {
         return '';
     } else if (type === 'string' || type === 'number' || type === 'boolean') {
-        return String(value);
-    } else if (value instanceof Color || value instanceof Formatted || value instanceof ResolvedImage) {
+        return String(value as string | number | boolean);
+    } else if (value instanceof Color) {
+        return value.toStringPremultipliedAlpha();
+    } else if (value instanceof Formatted || value instanceof ResolvedImage) {
         return value.toString();
     } else {
         return JSON.stringify(value);

package/feature_filter/index.ts

@@ -22,6 +22,7 @@ export type FilterExpression = (
     featureTileCoord?: Point,
     featureDistanceData?: FeatureDistanceData,
 ) => boolean;
+
 export type FeatureFilter = {
     filter: FilterExpression;
     dynamicFilter?: FilterExpression;

package/function/index.ts

@@ -204,7 +204,7 @@ function evaluateIdentityFunction(parameters, propertySpec, input) {
     } else if (propertySpec.type === 'formatted') {
         input = Formatted.fromString(input.toString());
     } else if (propertySpec.type === 'resolvedImage') {
-        input = ResolvedImage.fromString(input.toString());
+        input = ResolvedImage.build(input.toString());
     } else if (getType(input) !== propertySpec.type && (propertySpec.type !== 'enum' || !propertySpec.values[input])) {
         input = undefined;
     }

package/group_by_layout.ts

@@ -29,6 +29,25 @@ function getKey(layer: LayerSpecification) {
     return key;
 }
 
+function containsKey(obj: any, key: string) {
+    function recursiveSearch(item) {
+        if (typeof item === 'string' && item === key) {
+            return true;
+        }
+
+        if (Array.isArray(item)) {
+            return item.some(recursiveSearch);
+        }
+
+        if (item && typeof item === 'object') {
+            return Object.values(item).some(recursiveSearch);
+        }
+
+        return false;
+    }
+    return recursiveSearch(obj);
+}
+
 /**
  * Given an array of layers, return an array of arrays of layers where all
  * layers in each group have identical layout-affecting properties. These
@@ -53,17 +72,30 @@ export default function groupByLayout(
     const groups: Record<string, any> = {};
 
     for (let i = 0; i < layers.length; i++) {
+        const layer = layers[i];
+        let k = cachedKeys && cachedKeys[layer.id];
+
+        if (!k) {
+            k =  getKey(layer);
+            // The usage of "line-progress" inside "line-width" makes the property act like a layout property.
+            // We need to split it from the group to avoid conflicts in the bucket creation.
+            if (layer.type === 'line' && layer["paint"]) {
+                const lineWidth = layer["paint"]['line-width'];
+                if (containsKey(lineWidth, 'line-progress')) {
+                    k += `/${stringify(layer["paint"]['line-width'])}`;
+                }
+            }
+        }
 
-        const k = (cachedKeys && cachedKeys[layers[i].id]) || getKey(layers[i]);
         // update the cache if there is one
         if (cachedKeys)
-            cachedKeys[layers[i].id] = k;
+            cachedKeys[layer.id] = k;
 
         let group = groups[k];
         if (!group) {
             group = groups[k] = [];
         }
-        group.push(layers[i]);
+        group.push(layer);
     }
 
     const result = [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mapbox/mapbox-gl-style-spec",
-  "version": "14.8.0",
+  "version": "14.9.0",
   "description": "a specification for mapbox gl styles",
   "author": "Mapbox",
   "license": "SEE LICENSE IN LICENSE.txt",