Merge branch 'master' into felix/canvas-resize-bug-9.2

chrisgervang · web-flow · commit c622369afa99 · 2025-12-01T08:39:45.000-08:00
diff --git a/modules/carto/src/layers/vector-tile-layer.ts b/modules/carto/src/layers/vector-tile-layer.ts
@@ -227,7 +227,7 @@ export default class VectorTileLayer<
     }
 
     // Sort layers so that label layers are rendered after the main layer
-    const validLayers = layers.flat().filter(Boolean) as Layer[];
+    const validLayers = (layers || []).flat().filter(Boolean) as Layer[];
     validLayers.sort((a: Layer, b: Layer) => {
       const aHasLabel = a.id.includes('labels');
       const bHasLabel = b.id.includes('labels');

Original file line number	Diff line number	Diff line change
`@@ -227,7 +227,7 @@ export default class VectorTileLayer<`
`227`	`227`	`}`
`228`	`228`
`229`	`229`	`// Sort layers so that label layers are rendered after the main layer`
`230`		`- const validLayers = layers.flat().filter(Boolean) as Layer[];`
	`230`	`+ const validLayers = (layers \|\| []).flat().filter(Boolean) as Layer[];`
`231`	`231`	`validLayers.sort((a: Layer, b: Layer) => {`
`232`	`232`	`const aHasLabel = a.id.includes('labels');`
`233`	`233`	`const bHasLabel = b.id.includes('labels');`