@mapbox/mapbox-gl-style-spec 14.11.0 → 14.12.0

package/group_by_layout.ts

@@ -2,6 +2,7 @@ import refProperties from './util/ref_properties';
 
 import type {LayerSpecification} from './types';
 
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 function stringify(obj: any) {
     if (typeof obj === 'number' || typeof obj === 'boolean' || typeof obj === 'string' || obj === undefined || obj === null)
         return JSON.stringify(obj);
@@ -31,12 +32,13 @@ function getKey(layer: LayerSpecification) {
         if (layer.type === 'model' && (k === 'minzoom' || k === 'maxzoom')) {
             continue;
         } else {
-            key += `/${stringify((layer as any)[k])}`;
+            key += `/${stringify(layer[k])}`;
         }
     }
     return key;
 }
 
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 function containsKey(obj: any, key: string) {
     function recursiveSearch(item) {
         if (typeof item === 'string' && item === key) {
@@ -77,6 +79,7 @@ export default function groupByLayout(
         [id: string]: string;
     },
 ): Array<Array<LayerSpecification>> {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const groups: Record<string, any> = {};
 
     for (let i = 0; i < layers.length; i++) {
@@ -84,13 +87,18 @@ export default function groupByLayout(
         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'])}`;
+            // Do not group symbol layers together, as their paint properties affect placement
+            if (layer.type === 'symbol') {
+                k = layer.id;
+            } else {
+                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'])}`;
+                    }
                 }
             }
         }
@@ -112,5 +120,6 @@ export default function groupByLayout(
         result.push(groups[k]);
     }
 
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
     return result;
 }

package/migrate/expressions.ts

@@ -3,19 +3,19 @@ import {isExpression} from '../expression/index';
 import convertFunction, {convertTokenString} from '../function/convert';
 import convertFilter from '../feature_filter/convert';
 
-import type {StyleSpecification, FunctionSpecification} from '../types';
+import type {StyleSpecification, FilterSpecification, FunctionSpecification} from '../types';
 
 /**
  * Migrate the given style object in place to use expressions. Specifically,
  * this will convert (a) "stop" functions, and (b) legacy filters to their
  * expression equivalents.
  */
-export default function(style: StyleSpecification): StyleSpecification {
+export default function (style: StyleSpecification): StyleSpecification {
     const converted = [];
 
     eachLayer(style, (layer) => {
         if (layer.filter) {
-            layer.filter = (convertFilter(layer.filter) as any);
+            layer.filter = convertFilter(layer.filter) as FilterSpecification;
         }
     });
 

package/migrate/v8.ts

@@ -20,8 +20,10 @@ function eachPaint(layer, callback) {
 
 function resolveConstant(style, value) {
     if (typeof value === 'string' && value[0] === '@') {
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-return
         return resolveConstant(style, style.constants[value]);
     } else {
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-return
         return value;
     }
 }
@@ -34,7 +36,7 @@ function renameProperty(obj, from, to) {
     obj[to] = obj[from]; delete obj[from];
 }
 
-export default function(style) {
+export default function (style) {
     style.version = 8;
 
     // Rename properties, reverse coordinates in source and layers
@@ -113,6 +115,7 @@ export default function(style) {
         const inputPathnameParts = inputParsed.pathname.split('/');
 
         if (inputParsed.protocol !== 'mapbox:') {
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-return
             return input;
 
         } else if (inputParsed.hostname === 'fontstack') {
@@ -142,22 +145,27 @@ export default function(style) {
 
     function migrateFontStack(font) {
         function splitAndTrim(string) {
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-return
             return string.split(',').map((s) => {
+                // eslint-disable-next-line @typescript-eslint/no-unsafe-return
                 return s.trim();
             });
         }
 
         if (Array.isArray(font)) {
             // Assume it's a previously migrated font-array.
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-return
             return font;
 
         } else if (typeof font === 'string') {
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-return
             return splitAndTrim(font);
 
         } else if (typeof font === 'object') {
             font.stops.forEach((stop) => {
                 stop[1] = splitAndTrim(stop[1]);
             });
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-return
             return font;
 
         } else {
@@ -199,5 +207,6 @@ export default function(style) {
     symbolLayers.reverse();
     style.layers = style.layers.concat(symbolLayers);
 
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
     return style;
 }

package/migrate/v9.ts

@@ -8,7 +8,7 @@ function eachLayer(style, callback) {
     }
 }
 
-export default function(style) {
+export default function (style) {
     style.version = 9;
 
     // remove user-specified refs
@@ -23,5 +23,6 @@ export default function(style) {
         }
     });
 
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
     return style;
 }

package/migrate.ts

@@ -17,7 +17,7 @@ import migrateToExpressions from './migrate/expressions';
  * var style = fs.readFileSync('./style.json', 'utf8');
  * fs.writeFileSync('./style.json', JSON.stringify(migrate(style)));
  */
-export default function(style) {
+export default function (style) {
     let migrated = false;
 
     if (style.version === 7) {
@@ -34,5 +34,6 @@ export default function(style) {
         throw new Error('cannot migrate from', style.version);
     }
 
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
     return style;
 }

package/package.json

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

package/read_style.ts

@@ -6,6 +6,7 @@ import type {StyleSpecification} from './types';
 export default function readStyle(style: string | Buffer | StyleSpecification): StyleSpecification {
     if (style instanceof String || typeof style === 'string' || ArrayBuffer.isView(style)) {
         try {
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-return
             return jsonlint.parse(style.toString());
         } catch (e) {
             throw new ParsingError(e);

package/reference/latest.ts

@@ -1,5 +1,6 @@
 import spec from './v8.json';
 
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 export type StyleReference = Record<any, any>;
 
 export default spec as StyleReference;