@vcmap/core 6.3.3 → 6.3.5

package/dist/src/cesium/wallpaperMaterial.js

@@ -12,8 +12,8 @@ Material._materialCache.addMaterial('Wallpaper', {
             anchor: new Cartesian2(0, 0),
         },
         components: {
-            diffuse: 'texture2D(image, fract((gl_FragCoord.xy - anchor.xy) / vec2(imageDimensions.xy))).rgb',
-            alpha: 'texture2D(image, fract((gl_FragCoord.xy - anchor.xy) / vec2(imageDimensions.xy))).a',
+            diffuse: 'texture(image, fract((gl_FragCoord.xy - anchor.xy) / vec2(imageDimensions.xy))).rgb',
+            alpha: 'texture(image, fract((gl_FragCoord.xy - anchor.xy) / vec2(imageDimensions.xy))).a',
         },
     },
     translucent: false,

package/dist/src/cesium/wallpaperMaterial.js.map

@@ -1 +1 @@
-{"version":3,"file":"wallpaperMaterial.js","sourceRoot":"","sources":["../../../src/cesium/wallpaperMaterial.js"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAE5D;;GAEG;AAEH,wCAAwC;AACxC,gDAAgD;AAChD,QAAQ,CAAC,cAAc,CAAC,WAAW,CAAC,WAAW,EAAE;IAC/C,MAAM,EAAE;QACN,IAAI,EAAE,WAAW;QACjB,QAAQ,EAAE;YACR,KAAK,EAAE,QAAQ,CAAC,cAAc;YAC9B,MAAM,EAAE,IAAI,UAAU,CAAC,CAAC,EAAE,CAAC,CAAC;SAC7B;QACD,UAAU,EAAE;YACV,OAAO,EACL,uFAAuF;YACzF,KAAK,EACH,qFAAqF;SACxF;KACF;IACD,WAAW,EAAE,KAAK;CACnB,CAAC,CAAC;AAEH,4EAA4E;AAC5E,sBAAsB;AACtB,yEAAyE;AACzE,sFAAsF;AACtF,mEAAmE;AACnE,yBAAyB;AACzB,yBAAyB;AACzB,2BAA2B;AAC3B,iDAAiD;AACjD,4BAA4B;AAC5B,KAAK;AACL,EAAE;AACF,iEAAiE;AACjE,wBAAwB;AACxB,KAAK;AACL,EAAE;AACF,0EAA0E;AAC1E,mCAAmC;AACnC,iBAAiB;AACjB,2BAA2B;AAC3B,2BAA2B;AAC3B,SAAS;AACT,MAAM;AACN,EAAE;AACF,gCAAgC;AAChC,sHAAsH;AACtH,uCAAuC;AACvC,qDAAqD;AACrD,qDAAqD;AACrD,aAAa;AACb,mDAAmD;AACnD,MAAM;AACN,mBAAmB;AACnB,KAAK;AACL,EAAE;AACF,iEAAiE;AACjE,gCAAgC;AAChC,yDAAyD;AACzD,uCAAuC;AACvC,KAAK"}
+{"version":3,"file":"wallpaperMaterial.js","sourceRoot":"","sources":["../../../src/cesium/wallpaperMaterial.js"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAE5D;;GAEG;AAEH,wCAAwC;AACxC,gDAAgD;AAChD,QAAQ,CAAC,cAAc,CAAC,WAAW,CAAC,WAAW,EAAE;IAC/C,MAAM,EAAE;QACN,IAAI,EAAE,WAAW;QACjB,QAAQ,EAAE;YACR,KAAK,EAAE,QAAQ,CAAC,cAAc;YAC9B,MAAM,EAAE,IAAI,UAAU,CAAC,CAAC,EAAE,CAAC,CAAC;SAC7B;QACD,UAAU,EAAE;YACV,OAAO,EACL,qFAAqF;YACvF,KAAK,EACH,mFAAmF;SACtF;KACF;IACD,WAAW,EAAE,KAAK;CACnB,CAAC,CAAC;AAEH,4EAA4E;AAC5E,sBAAsB;AACtB,yEAAyE;AACzE,sFAAsF;AACtF,mEAAmE;AACnE,yBAAyB;AACzB,yBAAyB;AACzB,2BAA2B;AAC3B,iDAAiD;AACjD,4BAA4B;AAC5B,KAAK;AACL,EAAE;AACF,iEAAiE;AACjE,wBAAwB;AACxB,KAAK;AACL,EAAE;AACF,0EAA0E;AAC1E,mCAAmC;AACnC,iBAAiB;AACjB,2BAA2B;AAC3B,2BAA2B;AAC3B,SAAS;AACT,MAAM;AACN,EAAE;AACF,gCAAgC;AAChC,sHAAsH;AACtH,uCAAuC;AACvC,qDAAqD;AACrD,qDAAqD;AACrD,aAAa;AACb,mDAAmD;AACnD,MAAM;AACN,mBAAmB;AACnB,KAAK;AACL,EAAE;AACF,iEAAiE;AACjE,gCAAgC;AAChC,yDAAyD;AACzD,uCAAuC;AACvC,KAAK"}

package/dist/src/featureProvider/mapboxFeatureProvider.d.ts

@@ -1,16 +1,17 @@
+import type LayerGroup from 'ol/layer/Group.js';
 import type Feature from 'ol/Feature.js';
 import type { Coordinate } from 'ol/coordinate.js';
-import type LayerGroup from 'ol/layer/Group.js';
 import type Layer from '../layer/layer.js';
 import AbstractFeatureProvider, { type AbstractFeatureProviderOptions } from './abstractFeatureProvider.js';
 export type MapboxFeatureProviderOptions = AbstractFeatureProviderOptions & {
-    styledMapboxLayerGroup: LayerGroup;
+    createStyledLayerGroup: () => Promise<LayerGroup>;
     excludeLayerFromPicking?: string[];
 };
 export default class MapboxFeatureProvider extends AbstractFeatureProvider {
     static get className(): string;
     protected _inRenderingOrder: boolean;
     private _renderMap;
+    private _styledLayerGroup?;
     private _excludeLayerFromPicking?;
     constructor(options: MapboxFeatureProviderOptions);
     getFeaturesByCoordinate(coordinate: Coordinate, resolution: number, layer: Layer): Promise<Feature[]>;

package/dist/src/featureProvider/mapboxFeatureProvider.js

@@ -10,11 +10,24 @@ export default class MapboxFeatureProvider extends AbstractFeatureProvider {
     }
     _inRenderingOrder = true;
     _renderMap = new OLMap({ target: document.createElement('div') });
+    _styledLayerGroup;
     _excludeLayerFromPicking;
     constructor(options) {
         super(options);
         this._renderMap.setSize([256, 256]);
-        this._renderMap.addLayer(options.styledMapboxLayerGroup);
+        options
+            .createStyledLayerGroup()
+            .then((layerGroup) => {
+            if (this.isDestroyed) {
+                layerGroup.dispose();
+                return;
+            }
+            this._styledLayerGroup = layerGroup;
+            this._renderMap.addLayer(layerGroup);
+        })
+            .catch((error) => {
+            this.getLogger().error('Error creating styled layer group', error);
+        });
         this._excludeLayerFromPicking = options.excludeLayerFromPicking;
     }
     getFeaturesByCoordinate(coordinate, resolution, layer) {
@@ -41,6 +54,11 @@ export default class MapboxFeatureProvider extends AbstractFeatureProvider {
         return Promise.resolve(features);
     }
     destroy() {
+        if (this._styledLayerGroup) {
+            this._renderMap.removeLayer(this._styledLayerGroup);
+            this._styledLayerGroup.dispose();
+            this._styledLayerGroup = undefined;
+        }
         this._renderMap.setTarget(undefined);
         this._renderMap.dispose();
         super.destroy();

package/dist/src/featureProvider/mapboxFeatureProvider.js.map

@@ -1 +1 @@
-{"version":3,"file":"mapboxFeatureProvider.js","sourceRoot":"","sources":["../../../src/featureProvider/mapboxFeatureProvider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,IAAI,IAAI,EAAE,MAAM,MAAM,CAAC;AAClC,OAAO,KAAK,MAAM,WAAW,CAAC;AAK9B,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAEjD,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,uBAEN,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAOhE,MAAM,CAAC,OAAO,OAAO,qBAAsB,SAAQ,uBAAuB;IACxE,MAAM,KAAK,SAAS;QAClB,OAAO,uBAAuB,CAAC;IACjC,CAAC;IAES,iBAAiB,GAAG,IAAI,CAAC;IAE3B,UAAU,GAAG,IAAI,KAAK,CAAC,EAAE,MAAM,EAAE,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IAClE,wBAAwB,CAAY;IAE5C,YAAY,OAAqC;QAC/C,KAAK,CAAC,OAAO,CAAC,CAAC;QAEf,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;QACpC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,OAAO,CAAC,sBAAsB,CAAC,CAAC;QACzD,IAAI,CAAC,wBAAwB,GAAG,OAAO,CAAC,uBAAuB,CAAC;IAClE,CAAC;IAED,uBAAuB,CACrB,UAAsB,EACtB,UAAkB,EAClB,KAAY;QAEZ,MAAM,IAAI,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC;QACvC,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;QAC3B,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;QAE/B,IAAI,CAAC,UAAU,CAAC,UAAU,EAAE,CAAC;QAE7B,MAAM,eAAe,GAAG,IAAI,CAAC,UAAU,CAAC,kBAAkB,CAAC;YACzD,GAAG,EAAE,GAAG;SACT,CAAoB,CAAC;QACtB,MAAM,QAAQ,GAAG,eAAe;aAC7B,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE;YACb,MAAM,WAAW,GAAG,EAAE,CAAC,GAAG,CAAC,WAAW,CAAW,CAAC;YAClD,OAAO,CAAC,IAAI,CAAC,wBAAwB,EAAE,QAAQ,CAAC,WAAW,CAAC,CAAC;QAC/D,CAAC,CAAC;aACD,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;QAE5B,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;YACrB,CAAC,CAAC,YAAY,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC;YAC7B,CAAC,CAAC,iBAAiB,CAAC,GAAG,IAAI,CAAC;YAC5B,IAAI,CAAC,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC;gBACf,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC;YAClB,CAAC;QACH,CAAC,CAAC,CAAC;QACH,OAAO,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IACnC,CAAC;IAED,OAAO;QACL,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;QACrC,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC;QAC1B,KAAK,CAAC,OAAO,EAAE,CAAC;IAClB,CAAC;CACF"}
+{"version":3,"file":"mapboxFeatureProvider.js","sourceRoot":"","sources":["../../../src/featureProvider/mapboxFeatureProvider.ts"],"names":[],"mappings":"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"}

package/dist/src/layer/cesium/mapboxStyleCesiumImpl.d.ts

@@ -6,7 +6,7 @@ import type { LayerImplementationOptions } from '../layer.js';
 import MapboxStyleImageryProvider from './imageryProvider/mapboxStyleImageryProvider.js';
 import RasterLayerCesiumImpl from './rasterLayerCesiumImpl.js';
 export type MapboxStyleLayerImplementationOptions = LayerImplementationOptions & {
-    styledMapboxLayerGroup: LayerGroup;
+    createStyledLayerGroup: () => Promise<LayerGroup>;
     splitDirection: SplitDirection;
     minRenderingLevel?: number;
     maxRenderingLevel?: number;
@@ -14,6 +14,7 @@ export type MapboxStyleLayerImplementationOptions = LayerImplementationOptions &
 declare class MapboxStyleCesiumImpl extends RasterLayerCesiumImpl {
     static get className(): string;
     private _styledMapboxLayerGroup;
+    private _createStyledLayerGroup;
     minRenderingLevel: number | undefined;
     maxRenderingLevel: number | undefined;
     imageryProvider: MapboxStyleImageryProvider | undefined;

package/dist/src/layer/cesium/mapboxStyleCesiumImpl.js

@@ -9,6 +9,7 @@ class MapboxStyleCesiumImpl extends RasterLayerCesiumImpl {
         return 'MapboxStyleCesiumImpl';
     }
     _styledMapboxLayerGroup;
+    _createStyledLayerGroup;
     minRenderingLevel;
     maxRenderingLevel;
     imageryProvider = undefined;
@@ -20,17 +21,18 @@ class MapboxStyleCesiumImpl extends RasterLayerCesiumImpl {
             tilingSchema: TilingScheme.MERCATOR,
             opacity: 1,
         });
-        this._styledMapboxLayerGroup = options.styledMapboxLayerGroup;
+        this._createStyledLayerGroup = options.createStyledLayerGroup;
         this.minRenderingLevel = options.minRenderingLevel;
         this.maxRenderingLevel = options.maxRenderingLevel;
     }
     async activate() {
         await super.activate();
-        if (this.active) {
+        if (this.active && this._styledMapboxLayerGroup) {
             this._styledMapboxLayerGroup.setVisible(true);
         }
     }
-    getCesiumLayer() {
+    async getCesiumLayer() {
+        this._styledMapboxLayerGroup = await this._createStyledLayerGroup();
         const options = {
             headers: this.headers,
             styledMapboxLayerGroup: this._styledMapboxLayerGroup,
@@ -45,12 +47,13 @@ class MapboxStyleCesiumImpl extends RasterLayerCesiumImpl {
             const extent = this.extent.getCoordinatesInProjection(wgs84Projection);
             layerOptions.rectangle = Rectangle.fromDegrees(extent[0], extent[1], extent[2], extent[3]);
         }
-        return Promise.resolve(
         // @ts-expect-error mistyped
-        new CesiumImageryLayer(this.imageryProvider, layerOptions));
+        return new CesiumImageryLayer(this.imageryProvider, layerOptions);
     }
     destroy() {
         this.imageryProvider?.destroy();
+        this._styledMapboxLayerGroup?.dispose();
+        this._styledMapboxLayerGroup = undefined;
         super.destroy();
     }
 }

package/dist/src/layer/cesium/mapboxStyleCesiumImpl.js.map

@@ -1 +1 @@
-{"version":3,"file":"mapboxStyleCesiumImpl.js","sourceRoot":"","sources":["../../../../src/layer/cesium/mapboxStyleCesiumImpl.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,IAAI,kBAAkB,EAClC,SAAS,GACV,MAAM,sBAAsB,CAAC;AAI9B,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEjD,OAAO,YAAY,MAAM,iCAAiC,CAAC;AAC3D,OAAO,0BAEN,MAAM,iDAAiD,CAAC;AACzD,OAAO,qBAAqB,MAAM,4BAA4B,CAAC;AAU/D,MAAM,qBAAsB,SAAQ,qBAAqB;IACvD,MAAM,KAAK,SAAS;QAClB,OAAO,uBAAuB,CAAC;IACjC,CAAC;IAEO,uBAAuB,CAAa;IAE5C,iBAAiB,CAAqB;IAEtC,iBAAiB,CAAqB;IAEtC,eAAe,GAA2C,SAAS,CAAC;IAEpE,YACE,GAAkB,EAClB,OAA8C;QAE9C,KAAK,CAAC,GAAG,EAAE;YACT,GAAG,OAAO;YACV,QAAQ,EAAE,CAAC;YACX,QAAQ,EAAE,EAAE;YACZ,YAAY,EAAE,YAAY,CAAC,QAAQ;YACnC,OAAO,EAAE,CAAC;SACX,CAAC,CAAC;QACH,IAAI,CAAC,uBAAuB,GAAG,OAAO,CAAC,sBAAsB,CAAC;QAC9D,IAAI,CAAC,iBAAiB,GAAG,OAAO,CAAC,iBAAiB,CAAC;QACnD,IAAI,CAAC,iBAAiB,GAAG,OAAO,CAAC,iBAAiB,CAAC;IACrD,CAAC;IAED,KAAK,CAAC,QAAQ;QACZ,MAAM,KAAK,CAAC,QAAQ,EAAE,CAAC;QACvB,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YAChB,IAAI,CAAC,uBAAuB,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QAChD,CAAC;IACH,CAAC;IAED,cAAc;QACZ,MAAM,OAAO,GAAsC;YACjD,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,sBAAsB,EAAE,IAAI,CAAC,uBAAuB;YACpD,mBAAmB,EAAE,IAAI,CAAC,iBAAiB;YAC3C,mBAAmB,EAAE,IAAI,CAAC,iBAAiB;YAC3C,YAAY,EAAE,IAAI,YAAY,CAAC,EAAE,CAAC;YAClC,QAAQ,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC;SACrB,CAAC;QAEF,IAAI,CAAC,eAAe,GAAG,IAAI,0BAA0B,CAAC,OAAO,CAAC,CAAC;QAE/D,MAAM,YAAY,GAAG,IAAI,CAAC,qBAAqB,EAAE,CAAC;QAClD,IAAI,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE,CAAC;YACzC,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,0BAA0B,CAAC,eAAe,CAAC,CAAC;YACvE,YAAY,CAAC,SAAS,GAAG,SAAS,CAAC,WAAW,CAC5C,MAAM,CAAC,CAAC,CAAC,EACT,MAAM,CAAC,CAAC,CAAC,EACT,MAAM,CAAC,CAAC,CAAC,EACT,MAAM,CAAC,CAAC,CAAC,CACV,CAAC;QACJ,CAAC;QACD,OAAO,OAAO,CAAC,OAAO;QACpB,4BAA4B;QAC5B,IAAI,kBAAkB,CAAC,IAAI,CAAC,eAAe,EAAE,YAAY,CAAC,CAC3D,CAAC;IACJ,CAAC;IAED,OAAO;QACL,IAAI,CAAC,eAAe,EAAE,OAAO,EAAE,CAAC;QAChC,KAAK,CAAC,OAAO,EAAE,CAAC;IAClB,CAAC;CACF;AAED,eAAe,qBAAqB,CAAC"}
+{"version":3,"file":"mapboxStyleCesiumImpl.js","sourceRoot":"","sources":["../../../../src/layer/cesium/mapboxStyleCesiumImpl.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,IAAI,kBAAkB,EAClC,SAAS,GACV,MAAM,sBAAsB,CAAC;AAI9B,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEjD,OAAO,YAAY,MAAM,iCAAiC,CAAC;AAC3D,OAAO,0BAEN,MAAM,iDAAiD,CAAC;AACzD,OAAO,qBAAqB,MAAM,4BAA4B,CAAC;AAU/D,MAAM,qBAAsB,SAAQ,qBAAqB;IACvD,MAAM,KAAK,SAAS;QAClB,OAAO,uBAAuB,CAAC;IACjC,CAAC;IAEO,uBAAuB,CAAyB;IAEhD,uBAAuB,CAA4B;IAE3D,iBAAiB,CAAqB;IAEtC,iBAAiB,CAAqB;IAEtC,eAAe,GAA2C,SAAS,CAAC;IAEpE,YACE,GAAkB,EAClB,OAA8C;QAE9C,KAAK,CAAC,GAAG,EAAE;YACT,GAAG,OAAO;YACV,QAAQ,EAAE,CAAC;YACX,QAAQ,EAAE,EAAE;YACZ,YAAY,EAAE,YAAY,CAAC,QAAQ;YACnC,OAAO,EAAE,CAAC;SACX,CAAC,CAAC;QACH,IAAI,CAAC,uBAAuB,GAAG,OAAO,CAAC,sBAAsB,CAAC;QAC9D,IAAI,CAAC,iBAAiB,GAAG,OAAO,CAAC,iBAAiB,CAAC;QACnD,IAAI,CAAC,iBAAiB,GAAG,OAAO,CAAC,iBAAiB,CAAC;IACrD,CAAC;IAED,KAAK,CAAC,QAAQ;QACZ,MAAM,KAAK,CAAC,QAAQ,EAAE,CAAC;QACvB,IAAI,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,uBAAuB,EAAE,CAAC;YAChD,IAAI,CAAC,uBAAuB,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QAChD,CAAC;IACH,CAAC;IAED,KAAK,CAAC,cAAc;QAClB,IAAI,CAAC,uBAAuB,GAAG,MAAM,IAAI,CAAC,uBAAuB,EAAE,CAAC;QAEpE,MAAM,OAAO,GAAsC;YACjD,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,sBAAsB,EAAE,IAAI,CAAC,uBAAuB;YACpD,mBAAmB,EAAE,IAAI,CAAC,iBAAiB;YAC3C,mBAAmB,EAAE,IAAI,CAAC,iBAAiB;YAC3C,YAAY,EAAE,IAAI,YAAY,CAAC,EAAE,CAAC;YAClC,QAAQ,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC;SACrB,CAAC;QAEF,IAAI,CAAC,eAAe,GAAG,IAAI,0BAA0B,CAAC,OAAO,CAAC,CAAC;QAE/D,MAAM,YAAY,GAAG,IAAI,CAAC,qBAAqB,EAAE,CAAC;QAClD,IAAI,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE,CAAC;YACzC,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,0BAA0B,CAAC,eAAe,CAAC,CAAC;YACvE,YAAY,CAAC,SAAS,GAAG,SAAS,CAAC,WAAW,CAC5C,MAAM,CAAC,CAAC,CAAC,EACT,MAAM,CAAC,CAAC,CAAC,EACT,MAAM,CAAC,CAAC,CAAC,EACT,MAAM,CAAC,CAAC,CAAC,CACV,CAAC;QACJ,CAAC;QACD,4BAA4B;QAC5B,OAAO,IAAI,kBAAkB,CAAC,IAAI,CAAC,eAAe,EAAE,YAAY,CAAC,CAAC;IACpE,CAAC;IAED,OAAO;QACL,IAAI,CAAC,eAAe,EAAE,OAAO,EAAE,CAAC;QAChC,IAAI,CAAC,uBAAuB,EAAE,OAAO,EAAE,CAAC;QACxC,IAAI,CAAC,uBAAuB,GAAG,SAAS,CAAC;QACzC,KAAK,CAAC,OAAO,EAAE,CAAC;IAClB,CAAC;CACF;AAED,eAAe,qBAAqB,CAAC"}

package/dist/src/layer/layerImplementation.d.ts

@@ -11,6 +11,7 @@ declare class LayerImplementation<M extends VcsMap> extends VcsObject {
     url: string | undefined;
     protected _state: LayerState;
     private _initialized;
+    private _loadingPromise;
     headers?: Record<string, string>;
     constructor(map: M, options: LayerImplementationOptions);
     get map(): M;

package/dist/src/layer/layerImplementation.js

@@ -11,6 +11,7 @@ class LayerImplementation extends VcsObject {
     url;
     _state = LayerState.INACTIVE;
     _initialized = false;
+    _loadingPromise = null;
     headers;
     constructor(map, options) {
         super(options);
@@ -49,12 +50,28 @@ class LayerImplementation extends VcsObject {
      * Once the promise resolves, the layer can still be inactive, if deactivate was called while initializing the layer.
      */
     async activate() {
-        if (this.map.active && !this.active) {
-            this._state = LayerState.LOADING;
-            await this.initialize();
-            if (this.loading) {
-                this._state = LayerState.ACTIVE;
-            }
+        if (this._loadingPromise) {
+            await this._loadingPromise;
+            return;
+        }
+        if (this.map.active && this._state === LayerState.INACTIVE) {
+            this._loadingPromise = (async () => {
+                this._state = LayerState.LOADING;
+                await this.initialize();
+                if (this.loading) {
+                    this._state = LayerState.ACTIVE;
+                }
+            })()
+                .catch((err) => {
+                if (this.loading) {
+                    this._state = LayerState.INACTIVE;
+                }
+                return Promise.reject(err);
+            })
+                .finally(() => {
+                this._loadingPromise = null;
+            });
+            await this._loadingPromise;
         }
     }
     /**

package/dist/src/layer/layerImplementation.js.map

@@ -1 +1 @@
-{"version":3,"file":"layerImplementation.js","sourceRoot":"","sources":["../../../src/layer/layerImplementation.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,iBAAiB,CAAC;AACxC,OAAO,UAAU,MAAM,iBAAiB,CAAC;AAIzC;;GAEG;AACH,MAAM,mBAAsC,SAAQ,SAAS;IAC3D,MAAM,KAAK,SAAS;QAClB,OAAO,qBAAqB,CAAC;IAC/B,CAAC;IAEO,IAAI,CAAgB;IAE5B,GAAG,CAAqB;IAEd,MAAM,GAAe,UAAU,CAAC,QAAQ,CAAC;IAE3C,YAAY,GAAG,KAAK,CAAC;IAE7B,OAAO,CAA0B;IAEjC,YAAY,GAAM,EAAE,OAAmC;QACrD,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC;QAChB,IAAI,CAAC,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC;QACvB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IACjC,CAAC;IAED,IAAI,GAAG;QACL,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;YACf,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;QACxD,CAAC;QACD,OAAO,IAAI,CAAC,IAAI,CAAC;IACnB,CAAC;IAED;;OAEG;IACH,IAAI,WAAW;QACb,OAAO,IAAI,CAAC,YAAY,CAAC;IAC3B,CAAC;IAED,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,MAAM,KAAK,UAAU,CAAC,MAAM,CAAC;IAC3C,CAAC;IAED,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,MAAM,KAAK,UAAU,CAAC,OAAO,CAAC;IAC5C,CAAC;IAED;;;OAGG;IACH,UAAU;QACR,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;QACzB,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC3B,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,QAAQ;QACZ,IAAI,IAAI,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YACpC,IAAI,CAAC,MAAM,GAAG,UAAU,CAAC,OAAO,CAAC;YACjC,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC;YACxB,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;gBACjB,IAAI,CAAC,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC;YAClC,CAAC;QACH,CAAC;IACH,CAAC;IAED;;OAEG;IACH,UAAU;QACR,IAAI,CAAC,MAAM,GAAG,UAAU,CAAC,QAAQ,CAAC;IACpC,CAAC;IAED;;OAEG;IACH,OAAO;QACL,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC;QAC1B,IAAI,CAAC,MAAM,GAAG,UAAU,CAAC,QAAQ,CAAC;QAClC,IAAI,CAAC,IAAI,GAAG,SAAS,CAAC;QACtB,KAAK,CAAC,OAAO,EAAE,CAAC;IAClB,CAAC;CACF;AAED,eAAe,mBAAmB,CAAC"}
+{"version":3,"file":"layerImplementation.js","sourceRoot":"","sources":["../../../src/layer/layerImplementation.ts"],"names":[],"mappings":"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"}

package/dist/src/layer/mapboxStyleLayer.d.ts

@@ -28,10 +28,10 @@ declare class MapboxStyleLayer extends Layer<MaboxStyleImplementation> implement
     static get className(): string;
     static getDefaultOptions(): MapboxStyleOptions;
     protected _supportedMaps: string[];
-    private _mapboxLayerGroup;
     private _sources?;
     private _excludeLayerFromPicking?;
     private _splitDirection;
+    private _boundCreateStyledLayerGroup;
     splitDirectionChanged: VcsEvent<SplitDirection>;
     /**
      * defines the visible level in the rendered map, maps to Openlayers `minZoom` and Cesium `minimiumTerrainLevel`.
@@ -44,6 +44,7 @@ declare class MapboxStyleLayer extends Layer<MaboxStyleImplementation> implement
      */
     maxRenderingLevel: number | undefined;
     constructor(options: MapboxStyleOptions);
+    private _createStyledLayerGroup;
     initialize(): Promise<void>;
     get splitDirection(): SplitDirection;
     set splitDirection(direction: SplitDirection);

package/dist/src/layer/mapboxStyleLayer.js

@@ -1,9 +1,6 @@
 import { SplitDirection } from '@vcmap-cesium/engine';
 import { parseInteger } from '@vcsuite/parsers';
 import { is } from '@vcsuite/check';
-import Collection from 'ol/Collection.js';
-import LayerGroup from 'ol/layer/Group.js';
-import { apply } from 'ol-mapbox-style';
 import { layerClassRegistry } from '../classRegistry.js';
 import AbstractAttributeProvider from '../featureProvider/abstractAttributeProvider.js';
 import CompositeFeatureProvider from '../featureProvider/compositeFeatureProvider.js';
@@ -16,8 +13,8 @@ import PanoramaMap from '../map/panoramaMap.js';
 import VcsEvent from '../vcsEvent.js';
 import MapboxVectorRasterTileCesiumImpl from './cesium/mapboxStyleCesiumImpl.js';
 import Layer from './layer.js';
+import { createStyledMapboxLayerGroup } from './mapboxStyleLayerHelpers.js';
 import MapboxVectorTileOpenlayersImpl from './openlayers/mapboxStyleOpenlayersImpl.js';
-import { allowPicking, vcsLayerName } from './layerSymbols.js';
 /**
  * Layer class for Mapbox Style layers.
  * @group Layer
@@ -39,10 +36,10 @@ class MapboxStyleLayer extends Layer {
         OpenlayersMap.className,
         PanoramaMap.className,
     ];
-    _mapboxLayerGroup;
     _sources;
     _excludeLayerFromPicking;
     _splitDirection = SplitDirection.NONE;
+    _boundCreateStyledLayerGroup;
     splitDirectionChanged = new VcsEvent();
     /**
      * defines the visible level in the rendered map, maps to Openlayers `minZoom` and Cesium `minimiumTerrainLevel`.
@@ -67,32 +64,22 @@ class MapboxStyleLayer extends Layer {
         }
         this.minRenderingLevel = parseInteger(options.minRenderingLevel, defaultOptions.minRenderingLevel);
         this.maxRenderingLevel = parseInteger(options.maxRenderingLevel, defaultOptions.maxRenderingLevel);
-        this._mapboxLayerGroup = new LayerGroup({
-            minZoom: this.minRenderingLevel,
-            maxZoom: this.maxRenderingLevel,
+        this._boundCreateStyledLayerGroup = this._createStyledLayerGroup.bind(this);
+    }
+    _createStyledLayerGroup() {
+        return createStyledMapboxLayerGroup({
+            url: this.url,
+            name: this.name,
+            allowPicking: this.allowPicking,
+            sources: this._sources,
+            minRenderingLevel: this.minRenderingLevel,
+            maxRenderingLevel: this.maxRenderingLevel,
         });
     }
     async initialize() {
-        if (!this.initialized) {
-            await apply(this._mapboxLayerGroup, this.url);
-            const layers = this._mapboxLayerGroup.getLayersArray();
-            layers.forEach((layer) => {
-                layer[vcsLayerName] = this.name;
-                layer[allowPicking] = super.allowPicking;
-            });
-            if (this._sources && this._sources.length > 0) {
-                const filteredCollection = new Collection();
-                layers
-                    .filter((layer) => this._sources.includes(layer.get('mapbox-source')))
-                    .forEach((layer) => {
-                    filteredCollection.push(layer);
-                });
-                this._mapboxLayerGroup.setLayers(filteredCollection);
-            }
-        }
         if (!this.featureProvider) {
             this.featureProvider = new MapboxFeatureProvider({
-                styledMapboxLayerGroup: this._mapboxLayerGroup,
+                createStyledLayerGroup: this._boundCreateStyledLayerGroup,
                 excludeLayerFromPicking: this._excludeLayerFromPicking,
             });
         }
@@ -101,7 +88,7 @@ class MapboxStyleLayer extends Layer {
                 attributeProviders: [this.featureProvider],
                 featureProviders: [
                     new MapboxFeatureProvider({
-                        styledMapboxLayerGroup: this._mapboxLayerGroup,
+                        createStyledLayerGroup: this._boundCreateStyledLayerGroup,
                         excludeLayerFromPicking: this._excludeLayerFromPicking,
                     }),
                 ],
@@ -124,7 +111,7 @@ class MapboxStyleLayer extends Layer {
     getImplementationOptions() {
         return {
             ...super.getImplementationOptions(),
-            styledMapboxLayerGroup: this._mapboxLayerGroup,
+            createStyledLayerGroup: this._boundCreateStyledLayerGroup,
             splitDirection: this._splitDirection,
             minRenderingLevel: this.minRenderingLevel,
             maxRenderingLevel: this.maxRenderingLevel,
@@ -145,6 +132,33 @@ class MapboxStyleLayer extends Layer {
     }
     toJSON(defaultOptions = MapboxStyleLayer.getDefaultOptions()) {
         const config = { ...super.toJSON() };
+        if (config.featureProvider?.type ===
+            MapboxFeatureProvider.className) {
+            delete config.featureProvider;
+        }
+        else if (config.featureProvider?.type ===
+            CompositeFeatureProvider.className) {
+            const compositeConfig = config.featureProvider;
+            const featureProviders = (compositeConfig.featureProviders || []).filter((providerConfig) => providerConfig.type !==
+                MapboxFeatureProvider.className);
+            const attributeProviders = compositeConfig.attributeProviders || [];
+            if (featureProviders.length === 0 && attributeProviders.length === 0) {
+                delete config.featureProvider;
+            }
+            else if (featureProviders.length === 0 &&
+                attributeProviders.length === 1) {
+                config.featureProvider =
+                    attributeProviders[0];
+            }
+            else {
+                const filteredComposite = {
+                    ...compositeConfig,
+                    featureProviders,
+                    attributeProviders,
+                };
+                config.featureProvider = filteredComposite;
+            }
+        }
         if (this._sources && this._sources.length > 0) {
             config.sources = this._sources.slice();
         }
@@ -166,7 +180,6 @@ class MapboxStyleLayer extends Layer {
     }
     destroy() {
         this.splitDirectionChanged.destroy();
-        this._mapboxLayerGroup.dispose();
         this.featureProvider?.destroy();
         super.destroy();
     }

package/dist/src/layer/mapboxStyleLayer.js.map

@@ -1 +1 @@
-{"version":3,"file":"mapboxStyleLayer.js","sourceRoot":"","sources":["../../../src/layer/mapboxStyleLayer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,EAAE,EAAE,MAAM,gBAAgB,CAAC;AACpC,OAAO,UAAU,MAAM,kBAAkB,CAAC;AAC1C,OAAO,UAAU,MAAM,mBAAmB,CAAC;AAE3C,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,yBAAyB,MAAM,iDAAiD,CAAC;AACxF,OAAO,wBAAwB,MAAM,gDAAgD,CAAC;AACtF,OAAO,qBAAqB,MAAM,6CAA6C,CAAC;AAEhF,OAAO,aAAa,MAAM,yBAAyB,CAAC;AACpD,OAAO,SAAS,MAAM,qBAAqB,CAAC;AAC5C,OAAO,UAAU,MAAM,sBAAsB,CAAC;AAC9C,OAAO,aAAa,MAAM,yBAAyB,CAAC;AACpD,OAAO,WAAW,MAAM,uBAAuB,CAAC;AAChD,OAAO,QAAQ,MAAM,gBAAgB,CAAC;AACtC,OAAO,gCAEN,MAAM,mCAAmC,CAAC;AAC3C,OAAO,KAAK,MAAM,YAAY,CAAC;AAG/B,OAAO,8BAA8B,MAAM,2CAA2C,CAAC;AACvF,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAmB/D;;;GAGG;AACH,MAAM,gBACJ,SAAQ,KAA+B;IAGvC,MAAM,KAAK,SAAS;QAClB,OAAO,kBAAkB,CAAC;IAC5B,CAAC;IAED,MAAM,CAAC,iBAAiB;QACtB,OAAO;YACL,GAAG,KAAK,CAAC,iBAAiB,EAAE;YAC5B,iBAAiB,EAAE,SAAS;YAC5B,iBAAiB,EAAE,SAAS;SAC7B,CAAC;IACJ,CAAC;IAES,cAAc,GAAG;QACzB,SAAS,CAAC,SAAS;QACnB,UAAU,CAAC,SAAS;QACpB,aAAa,CAAC,SAAS;QACvB,WAAW,CAAC,SAAS;KACtB,CAAC;IACM,iBAAiB,CAAa;IAC9B,QAAQ,CAAY;IACpB,wBAAwB,CAAY;IACpC,eAAe,GAAmB,cAAc,CAAC,IAAI,CAAC;IAC9D,qBAAqB,GAAG,IAAI,QAAQ,EAAkB,CAAC;IACvD;;;OAGG;IACH,iBAAiB,CAAqB;IACtC;;;OAGG;IACH,iBAAiB,CAAqB;IAEtC,YAAY,OAA2B;QACrC,MAAM,cAAc,GAAG,gBAAgB,CAAC,iBAAiB,EAAE,CAAC;QAC5D,KAAK,CAAC,EAAE,GAAG,cAAc,EAAE,GAAG,OAAO,EAAE,CAAC,CAAC;QAEzC,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC;QAChC,IAAI,CAAC,wBAAwB,GAAG,OAAO,CAAC,uBAAuB,CAAC;QAChE,IAAI,OAAO,CAAC,cAAc,EAAE,CAAC;YAC3B,IAAI,CAAC,eAAe;gBAClB,OAAO,CAAC,cAAc,KAAK,MAAM;oBAC/B,CAAC,CAAC,cAAc,CAAC,IAAI;oBACrB,CAAC,CAAC,cAAc,CAAC,KAAK,CAAC;QAC7B,CAAC;QACD,IAAI,CAAC,iBAAiB,GAAG,YAAY,CACnC,OAAO,CAAC,iBAAiB,EACzB,cAAc,CAAC,iBAAiB,CACjC,CAAC;QACF,IAAI,CAAC,iBAAiB,GAAG,YAAY,CACnC,OAAO,CAAC,iBAAiB,EACzB,cAAc,CAAC,iBAAiB,CACjC,CAAC;QAEF,IAAI,CAAC,iBAAiB,GAAG,IAAI,UAAU,CAAC;YACtC,OAAO,EAAE,IAAI,CAAC,iBAAiB;YAC/B,OAAO,EAAE,IAAI,CAAC,iBAAiB;SAChC,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,UAAU;QACd,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;YACtB,MAAM,KAAK,CAAC,IAAI,CAAC,iBAAiB,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;YAE9C,MAAM,MAAM,GAAG,IAAI,CAAC,iBAAiB,CAAC,cAAc,EAAE,CAAC;YACvD,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;gBACvB,KAAK,CAAC,YAAY,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC;gBAChC,KAAK,CAAC,YAAY,CAAC,GAAG,KAAK,CAAC,YAAY,CAAC;YAC3C,CAAC,CAAC,CAAC;YAEH,IAAI,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC9C,MAAM,kBAAkB,GAAG,IAAI,UAAU,EAAa,CAAC;gBACvD,MAAM;qBACH,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAChB,IAAI,CAAC,QAAS,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,eAAe,CAAW,CAAC,CAC9D;qBACA,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;oBACjB,kBAAkB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBACjC,CAAC,CAAC,CAAC;gBAEL,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC,kBAAkB,CAAC,CAAC;YACvD,CAAC;QACH,CAAC;QAED,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,CAAC;YAC1B,IAAI,CAAC,eAAe,GAAG,IAAI,qBAAqB,CAAC;gBAC/C,sBAAsB,EAAE,IAAI,CAAC,iBAAiB;gBAC9C,uBAAuB,EAAE,IAAI,CAAC,wBAAwB;aACvD,CAAC,CAAC;QACL,CAAC;aAAM,IAAI,EAAE,CAAC,IAAI,CAAC,eAAe,EAAE,yBAAyB,CAAC,EAAE,CAAC;YAC/D,IAAI,CAAC,eAAe,GAAG,IAAI,wBAAwB,CAAC;gBAClD,kBAAkB,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC;gBAC1C,gBAAgB,EAAE;oBAChB,IAAI,qBAAqB,CAAC;wBACxB,sBAAsB,EAAE,IAAI,CAAC,iBAAiB;wBAC9C,uBAAuB,EAAE,IAAI,CAAC,wBAAwB;qBACvD,CAAC;iBACH;aACF,CAAC,CAAC;QACL,CAAC;QAED,MAAM,KAAK,CAAC,UAAU,EAAE,CAAC;IAC3B,CAAC;IAED,IAAI,cAAc;QAChB,OAAO,IAAI,CAAC,eAAe,CAAC;IAC9B,CAAC;IAED,IAAI,cAAc,CAAC,SAAyB;QAC1C,IAAI,SAAS,KAAK,IAAI,CAAC,eAAe,EAAE,CAAC;YACvC,IAAI,CAAC,eAAe,GAAG,SAAS,CAAC;YACjC,IAAI,CAAC,kBAAkB,EAAE,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;gBACzC,IAAI,CAAC,oBAAoB,CAAC,SAAS,CAAC,CAAC;YACvC,CAAC,CAAC,CAAC;YACH,IAAI,CAAC,qBAAqB,CAAC,UAAU,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QAC9D,CAAC;IACH,CAAC;IAED,wBAAwB;QACtB,OAAO;YACL,GAAG,KAAK,CAAC,wBAAwB,EAAE;YACnC,sBAAsB,EAAE,IAAI,CAAC,iBAAiB;YAC9C,cAAc,EAAE,IAAI,CAAC,eAAe;YACpC,iBAAiB,EAAE,IAAI,CAAC,iBAAiB;YACzC,iBAAiB,EAAE,IAAI,CAAC,iBAAiB;SAC1C,CAAC;IACJ,CAAC;IAED,2BAA2B,CAAC,GAAW;QACrC,IAAI,GAAG,YAAY,aAAa,EAAE,CAAC;YACjC,OAAO;gBACL,IAAI,gCAAgC,CAClC,GAAG,EACH,IAAI,CAAC,wBAAwB,EAAE,CAChC;aACF,CAAC;QACJ,CAAC;QAED,IAAI,GAAG,YAAY,aAAa,EAAE,CAAC;YACjC,OAAO;gBACL,IAAI,8BAA8B,CAChC,GAAG,EACH,IAAI,CAAC,wBAAwB,EAAE,CAChC;aACF,CAAC;QACJ,CAAC;QACD,OAAO,KAAK,CAAC,2BAA2B,CAAC,GAAG,CAAC,CAAC;IAChD,CAAC;IAED,MAAM,CACJ,cAAc,GAAG,gBAAgB,CAAC,iBAAiB,EAAE;QAErD,MAAM,MAAM,GAAuB,EAAE,GAAG,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC;QAEzD,IAAI,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC9C,MAAM,CAAC,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;QACzC,CAAC;QAED,IACE,IAAI,CAAC,wBAAwB;YAC7B,IAAI,CAAC,wBAAwB,CAAC,MAAM,GAAG,CAAC,EACxC,CAAC;YACD,MAAM,CAAC,uBAAuB,GAAG,IAAI,CAAC,wBAAwB,CAAC,KAAK,EAAE,CAAC;QACzE,CAAC;QAED,IAAI,IAAI,CAAC,eAAe,KAAK,cAAc,CAAC,IAAI,EAAE,CAAC;YACjD,MAAM,CAAC,cAAc;gBACnB,IAAI,CAAC,eAAe,KAAK,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC;QACpE,CAAC;QAED,IAAI,IAAI,CAAC,iBAAiB,KAAK,cAAc,CAAC,iBAAiB,EAAE,CAAC;YAChE,MAAM,CAAC,iBAAiB,GAAG,IAAI,CAAC,iBAAiB,CAAC;QACpD,CAAC;QAED,IAAI,IAAI,CAAC,iBAAiB,KAAK,cAAc,CAAC,iBAAiB,EAAE,CAAC;YAChE,MAAM,CAAC,iBAAiB,GAAG,IAAI,CAAC,iBAAiB,CAAC;QACpD,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,OAAO;QACL,IAAI,CAAC,qBAAqB,CAAC,OAAO,EAAE,CAAC;QACrC,IAAI,CAAC,iBAAiB,CAAC,OAAO,EAAE,CAAC;QACjC,IAAI,CAAC,eAAe,EAAE,OAAO,EAAE,CAAC;QAChC,KAAK,CAAC,OAAO,EAAE,CAAC;IAClB,CAAC;CACF;AAED,kBAAkB,CAAC,aAAa,CAAC,gBAAgB,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAC;AAC/E,eAAe,gBAAgB,CAAC"}
+{"version":3,"file":"mapboxStyleLayer.js","sourceRoot":"","sources":["../../../src/layer/mapboxStyleLayer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,EAAE,EAAE,MAAM,gBAAgB,CAAC;AAEpC,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,yBAAyB,MAAM,iDAAiD,CAAC;AACxF,OAAO,wBAEN,MAAM,gDAAgD,CAAC;AACxD,OAAO,qBAEN,MAAM,6CAA6C,CAAC;AAErD,OAAO,aAAa,MAAM,yBAAyB,CAAC;AACpD,OAAO,SAAS,MAAM,qBAAqB,CAAC;AAC5C,OAAO,UAAU,MAAM,sBAAsB,CAAC;AAC9C,OAAO,aAAa,MAAM,yBAAyB,CAAC;AACpD,OAAO,WAAW,MAAM,uBAAuB,CAAC;AAChD,OAAO,QAAQ,MAAM,gBAAgB,CAAC;AACtC,OAAO,gCAEN,MAAM,mCAAmC,CAAC;AAC3C,OAAO,KAAK,MAAM,YAAY,CAAC;AAG/B,OAAO,EAAE,4BAA4B,EAAE,MAAM,8BAA8B,CAAC;AAC5E,OAAO,8BAA8B,MAAM,2CAA2C,CAAC;AAmBvF;;;GAGG;AACH,MAAM,gBACJ,SAAQ,KAA+B;IAGvC,MAAM,KAAK,SAAS;QAClB,OAAO,kBAAkB,CAAC;IAC5B,CAAC;IAED,MAAM,CAAC,iBAAiB;QACtB,OAAO;YACL,GAAG,KAAK,CAAC,iBAAiB,EAAE;YAC5B,iBAAiB,EAAE,SAAS;YAC5B,iBAAiB,EAAE,SAAS;SAC7B,CAAC;IACJ,CAAC;IAES,cAAc,GAAG;QACzB,SAAS,CAAC,SAAS;QACnB,UAAU,CAAC,SAAS;QACpB,aAAa,CAAC,SAAS;QACvB,WAAW,CAAC,SAAS;KACtB,CAAC;IACM,QAAQ,CAAY;IACpB,wBAAwB,CAAY;IACpC,eAAe,GAAmB,cAAc,CAAC,IAAI,CAAC;IACtD,4BAA4B,CAA4B;IAChE,qBAAqB,GAAG,IAAI,QAAQ,EAAkB,CAAC;IACvD;;;OAGG;IACH,iBAAiB,CAAqB;IACtC;;;OAGG;IACH,iBAAiB,CAAqB;IAEtC,YAAY,OAA2B;QACrC,MAAM,cAAc,GAAG,gBAAgB,CAAC,iBAAiB,EAAE,CAAC;QAC5D,KAAK,CAAC,EAAE,GAAG,cAAc,EAAE,GAAG,OAAO,EAAE,CAAC,CAAC;QAEzC,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC;QAChC,IAAI,CAAC,wBAAwB,GAAG,OAAO,CAAC,uBAAuB,CAAC;QAChE,IAAI,OAAO,CAAC,cAAc,EAAE,CAAC;YAC3B,IAAI,CAAC,eAAe;gBAClB,OAAO,CAAC,cAAc,KAAK,MAAM;oBAC/B,CAAC,CAAC,cAAc,CAAC,IAAI;oBACrB,CAAC,CAAC,cAAc,CAAC,KAAK,CAAC;QAC7B,CAAC;QACD,IAAI,CAAC,iBAAiB,GAAG,YAAY,CACnC,OAAO,CAAC,iBAAiB,EACzB,cAAc,CAAC,iBAAiB,CACjC,CAAC;QACF,IAAI,CAAC,iBAAiB,GAAG,YAAY,CACnC,OAAO,CAAC,iBAAiB,EACzB,cAAc,CAAC,iBAAiB,CACjC,CAAC;QACF,IAAI,CAAC,4BAA4B,GAAG,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC9E,CAAC;IAEO,uBAAuB;QAC7B,OAAO,4BAA4B,CAAC;YAClC,GAAG,EAAE,IAAI,CAAC,GAAG;YACb,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,YAAY,EAAE,IAAI,CAAC,YAAY;YAC/B,OAAO,EAAE,IAAI,CAAC,QAAQ;YACtB,iBAAiB,EAAE,IAAI,CAAC,iBAAiB;YACzC,iBAAiB,EAAE,IAAI,CAAC,iBAAiB;SAC1C,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,UAAU;QACd,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,CAAC;YAC1B,IAAI,CAAC,eAAe,GAAG,IAAI,qBAAqB,CAAC;gBAC/C,sBAAsB,EAAE,IAAI,CAAC,4BAA4B;gBACzD,uBAAuB,EAAE,IAAI,CAAC,wBAAwB;aACvD,CAAC,CAAC;QACL,CAAC;aAAM,IAAI,EAAE,CAAC,IAAI,CAAC,eAAe,EAAE,yBAAyB,CAAC,EAAE,CAAC;YAC/D,IAAI,CAAC,eAAe,GAAG,IAAI,wBAAwB,CAAC;gBAClD,kBAAkB,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC;gBAC1C,gBAAgB,EAAE;oBAChB,IAAI,qBAAqB,CAAC;wBACxB,sBAAsB,EAAE,IAAI,CAAC,4BAA4B;wBACzD,uBAAuB,EAAE,IAAI,CAAC,wBAAwB;qBACvD,CAAC;iBACH;aACF,CAAC,CAAC;QACL,CAAC;QAED,MAAM,KAAK,CAAC,UAAU,EAAE,CAAC;IAC3B,CAAC;IAED,IAAI,cAAc;QAChB,OAAO,IAAI,CAAC,eAAe,CAAC;IAC9B,CAAC;IAED,IAAI,cAAc,CAAC,SAAyB;QAC1C,IAAI,SAAS,KAAK,IAAI,CAAC,eAAe,EAAE,CAAC;YACvC,IAAI,CAAC,eAAe,GAAG,SAAS,CAAC;YACjC,IAAI,CAAC,kBAAkB,EAAE,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;gBACzC,IAAI,CAAC,oBAAoB,CAAC,SAAS,CAAC,CAAC;YACvC,CAAC,CAAC,CAAC;YACH,IAAI,CAAC,qBAAqB,CAAC,UAAU,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QAC9D,CAAC;IACH,CAAC;IAED,wBAAwB;QACtB,OAAO;YACL,GAAG,KAAK,CAAC,wBAAwB,EAAE;YACnC,sBAAsB,EAAE,IAAI,CAAC,4BAA4B;YACzD,cAAc,EAAE,IAAI,CAAC,eAAe;YACpC,iBAAiB,EAAE,IAAI,CAAC,iBAAiB;YACzC,iBAAiB,EAAE,IAAI,CAAC,iBAAiB;SAC1C,CAAC;IACJ,CAAC;IAED,2BAA2B,CAAC,GAAW;QACrC,IAAI,GAAG,YAAY,aAAa,EAAE,CAAC;YACjC,OAAO;gBACL,IAAI,gCAAgC,CAClC,GAAG,EACH,IAAI,CAAC,wBAAwB,EAAE,CAChC;aACF,CAAC;QACJ,CAAC;QAED,IAAI,GAAG,YAAY,aAAa,EAAE,CAAC;YACjC,OAAO;gBACL,IAAI,8BAA8B,CAChC,GAAG,EACH,IAAI,CAAC,wBAAwB,EAAE,CAChC;aACF,CAAC;QACJ,CAAC;QACD,OAAO,KAAK,CAAC,2BAA2B,CAAC,GAAG,CAAC,CAAC;IAChD,CAAC;IAED,MAAM,CACJ,cAAc,GAAG,gBAAgB,CAAC,iBAAiB,EAAE;QAErD,MAAM,MAAM,GAAuB,EAAE,GAAG,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC;QAEzD,IACG,MAAM,CAAC,eAAgD,EAAE,IAAI;YAC9D,qBAAqB,CAAC,SAAS,EAC/B,CAAC;YACD,OAAO,MAAM,CAAC,eAAe,CAAC;QAChC,CAAC;aAAM,IACJ,MAAM,CAAC,eAAmD,EAAE,IAAI;YACjE,wBAAwB,CAAC,SAAS,EAClC,CAAC;YACD,MAAM,eAAe,GACnB,MAAM,CAAC,eAAkD,CAAC;YAC5D,MAAM,gBAAgB,GAAG,CAAC,eAAe,CAAC,gBAAgB,IAAI,EAAE,CAAC,CAAC,MAAM,CACtE,CAAC,cAAc,EAAE,EAAE,CAChB,cAA+C,CAAC,IAAI;gBACrD,qBAAqB,CAAC,SAAS,CAClC,CAAC;YACF,MAAM,kBAAkB,GAAG,eAAe,CAAC,kBAAkB,IAAI,EAAE,CAAC;YAEpE,IAAI,gBAAgB,CAAC,MAAM,KAAK,CAAC,IAAI,kBAAkB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACrE,OAAO,MAAM,CAAC,eAAe,CAAC;YAChC,CAAC;iBAAM,IACL,gBAAgB,CAAC,MAAM,KAAK,CAAC;gBAC7B,kBAAkB,CAAC,MAAM,KAAK,CAAC,EAC/B,CAAC;gBACD,MAAM,CAAC,eAAe;oBACpB,kBAAkB,CAAC,CAAC,CAA8B,CAAC;YACvD,CAAC;iBAAM,CAAC;gBACN,MAAM,iBAAiB,GAAoC;oBACzD,GAAG,eAAe;oBAClB,gBAAgB;oBAChB,kBAAkB;iBACnB,CAAC;gBACF,MAAM,CAAC,eAAe,GAAG,iBAAiB,CAAC;YAC7C,CAAC;QACH,CAAC;QAED,IAAI,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC9C,MAAM,CAAC,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;QACzC,CAAC;QAED,IACE,IAAI,CAAC,wBAAwB;YAC7B,IAAI,CAAC,wBAAwB,CAAC,MAAM,GAAG,CAAC,EACxC,CAAC;YACD,MAAM,CAAC,uBAAuB,GAAG,IAAI,CAAC,wBAAwB,CAAC,KAAK,EAAE,CAAC;QACzE,CAAC;QAED,IAAI,IAAI,CAAC,eAAe,KAAK,cAAc,CAAC,IAAI,EAAE,CAAC;YACjD,MAAM,CAAC,cAAc;gBACnB,IAAI,CAAC,eAAe,KAAK,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC;QACpE,CAAC;QAED,IAAI,IAAI,CAAC,iBAAiB,KAAK,cAAc,CAAC,iBAAiB,EAAE,CAAC;YAChE,MAAM,CAAC,iBAAiB,GAAG,IAAI,CAAC,iBAAiB,CAAC;QACpD,CAAC;QAED,IAAI,IAAI,CAAC,iBAAiB,KAAK,cAAc,CAAC,iBAAiB,EAAE,CAAC;YAChE,MAAM,CAAC,iBAAiB,GAAG,IAAI,CAAC,iBAAiB,CAAC;QACpD,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,OAAO;QACL,IAAI,CAAC,qBAAqB,CAAC,OAAO,EAAE,CAAC;QACrC,IAAI,CAAC,eAAe,EAAE,OAAO,EAAE,CAAC;QAChC,KAAK,CAAC,OAAO,EAAE,CAAC;IAClB,CAAC;CACF;AAED,kBAAkB,CAAC,aAAa,CAAC,gBAAgB,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAC;AAC/E,eAAe,gBAAgB,CAAC"}

package/dist/src/layer/mapboxStyleLayerHelpers.d.ts

@@ -0,0 +1,10 @@
+import LayerGroup from 'ol/layer/Group.js';
+export type StyledMapboxLayerGroupOptions = {
+    url: string;
+    name: string;
+    allowPicking: boolean;
+    sources?: string[];
+    minRenderingLevel?: number;
+    maxRenderingLevel?: number;
+};
+export declare function createStyledMapboxLayerGroup(options: StyledMapboxLayerGroupOptions): Promise<LayerGroup>;

package/dist/src/layer/mapboxStyleLayerHelpers.js

@@ -0,0 +1,30 @@
+import Collection from 'ol/Collection.js';
+import LayerGroup from 'ol/layer/Group.js';
+import { apply } from 'ol-mapbox-style';
+import { allowPicking, vcsLayerName } from './layerSymbols.js';
+async function applyStyleAndConfigureGroup(mapboxLayerGroup, options) {
+    await apply(mapboxLayerGroup, options.url);
+    const layers = mapboxLayerGroup.getLayersArray();
+    layers.forEach((layer) => {
+        layer[vcsLayerName] = options.name;
+        layer[allowPicking] = options.allowPicking;
+    });
+    if (options.sources && options.sources.length > 0) {
+        const filteredCollection = new Collection();
+        layers
+            .filter((layer) => options.sources.includes(layer.get('mapbox-source')))
+            .forEach((layer) => {
+            filteredCollection.push(layer);
+        });
+        mapboxLayerGroup.setLayers(filteredCollection);
+    }
+}
+export async function createStyledMapboxLayerGroup(options) {
+    const mapboxLayerGroup = new LayerGroup({
+        minZoom: options.minRenderingLevel,
+        maxZoom: options.maxRenderingLevel,
+    });
+    await applyStyleAndConfigureGroup(mapboxLayerGroup, options);
+    return mapboxLayerGroup;
+}
+//# sourceMappingURL=mapboxStyleLayerHelpers.js.map

package/dist/src/layer/mapboxStyleLayerHelpers.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mapboxStyleLayerHelpers.js","sourceRoot":"","sources":["../../../src/layer/mapboxStyleLayerHelpers.ts"],"names":[],"mappings":"AAAA,OAAO,UAAU,MAAM,kBAAkB,CAAC;AAE1C,OAAO,UAAU,MAAM,mBAAmB,CAAC;AAC3C,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAW/D,KAAK,UAAU,2BAA2B,CACxC,gBAA4B,EAC5B,OAAsC;IAEtC,MAAM,KAAK,CAAC,gBAAgB,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC;IAE3C,MAAM,MAAM,GAAG,gBAAgB,CAAC,cAAc,EAAE,CAAC;IACjD,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;QACvB,KAAK,CAAC,YAAY,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;QACnC,KAAK,CAAC,YAAY,CAAC,GAAG,OAAO,CAAC,YAAY,CAAC;IAC7C,CAAC,CAAC,CAAC;IAEH,IAAI,OAAO,CAAC,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAClD,MAAM,kBAAkB,GAAG,IAAI,UAAU,EAAa,CAAC;QACvD,MAAM;aACH,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAChB,OAAO,CAAC,OAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,eAAe,CAAW,CAAC,CAChE;aACA,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;YACjB,kBAAkB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACjC,CAAC,CAAC,CAAC;QAEL,gBAAgB,CAAC,SAAS,CAAC,kBAAkB,CAAC,CAAC;IACjD,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,4BAA4B,CAChD,OAAsC;IAEtC,MAAM,gBAAgB,GAAG,IAAI,UAAU,CAAC;QACtC,OAAO,EAAE,OAAO,CAAC,iBAAiB;QAClC,OAAO,EAAE,OAAO,CAAC,iBAAiB;KACnC,CAAC,CAAC;IAEH,MAAM,2BAA2B,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;IAC7D,OAAO,gBAAgB,CAAC;AAC1B,CAAC"}

package/dist/src/layer/openlayers/mapboxStyleOpenlayersImpl.d.ts

@@ -6,8 +6,10 @@ import LayerOpenlayersImpl from './layerOpenlayersImpl.js';
 declare class MapboxVectorTileOpenlayersImpl extends LayerOpenlayersImpl {
     static get className(): string;
     private _styledMapboxLayerGroup;
+    private _createStyledLayerGroup;
     private _removeChildLayerListeners;
     constructor(map: OpenlayersMap, options: MapboxStyleLayerImplementationOptions);
+    initialize(): Promise<void>;
     getOLLayer(): OLLayerLike;
     updateSplitDirection(splitDirection: SplitDirection): void;
     destroy(): void;

package/dist/src/layer/openlayers/mapboxStyleOpenlayersImpl.js

@@ -6,12 +6,22 @@ class MapboxVectorTileOpenlayersImpl extends LayerOpenlayersImpl {
         return 'MapboxVectorTileOpenlayersImpl';
     }
     _styledMapboxLayerGroup;
+    _createStyledLayerGroup;
     _removeChildLayerListeners = null;
     constructor(map, options) {
         super(map, options);
-        this._styledMapboxLayerGroup = options.styledMapboxLayerGroup;
+        this._createStyledLayerGroup = options.createStyledLayerGroup;
+    }
+    async initialize() {
+        if (!this.initialized) {
+            this._styledMapboxLayerGroup = await this._createStyledLayerGroup();
+        }
+        await super.initialize();
     }
     getOLLayer() {
+        if (!this._styledMapboxLayerGroup) {
+            throw new Error('Mapbox layer group must be initialized before use');
+        }
         return this._styledMapboxLayerGroup;
     }
     updateSplitDirection(splitDirection) {
@@ -19,6 +29,9 @@ class MapboxVectorTileOpenlayersImpl extends LayerOpenlayersImpl {
         if (this.initialized) {
             this._removeChildLayerListeners?.();
             this._removeChildLayerListeners = null;
+            if (!this._styledMapboxLayerGroup) {
+                return;
+            }
             if (splitDirection !== SplitDirection.NONE) {
                 const childLayers = this._styledMapboxLayerGroup.getLayersArray();
                 const listenerKeys = [];
@@ -42,6 +55,8 @@ class MapboxVectorTileOpenlayersImpl extends LayerOpenlayersImpl {
     destroy() {
         this._removeChildLayerListeners?.();
         this._removeChildLayerListeners = null;
+        this._styledMapboxLayerGroup?.dispose();
+        this._styledMapboxLayerGroup = undefined;
         super.destroy();
     }
 }

package/dist/src/layer/openlayers/mapboxStyleOpenlayersImpl.js.map

@@ -1 +1 @@
-{"version":3,"file":"mapboxStyleOpenlayersImpl.js","sourceRoot":"","sources":["../../../../src/layer/openlayers/mapboxStyleOpenlayersImpl.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAK3C,OAAO,mBAAmB,MAAM,0BAA0B,CAAC;AAE3D,MAAM,8BAA+B,SAAQ,mBAAmB;IAC9D,MAAM,KAAK,SAAS;QAClB,OAAO,gCAAgC,CAAC;IAC1C,CAAC;IAEO,uBAAuB,CAAa;IAEpC,0BAA0B,GAAwB,IAAI,CAAC;IAE/D,YACE,GAAkB,EAClB,OAA8C;QAE9C,KAAK,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QACpB,IAAI,CAAC,uBAAuB,GAAG,OAAO,CAAC,sBAAsB,CAAC;IAChE,CAAC;IAED,UAAU;QACR,OAAO,IAAI,CAAC,uBAAsC,CAAC;IACrD,CAAC;IAED,oBAAoB,CAAC,cAA8B;QACjD,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;QACrC,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;YACrB,IAAI,CAAC,0BAA0B,EAAE,EAAE,CAAC;YACpC,IAAI,CAAC,0BAA0B,GAAG,IAAI,CAAC;YAEvC,IAAI,cAAc,KAAK,cAAc,CAAC,IAAI,EAAE,CAAC;gBAC3C,MAAM,WAAW,GAAG,IAAI,CAAC,uBAAuB,CAAC,cAAc,EAAE,CAAC;gBAClE,MAAM,YAAY,GAAgB,EAAE,CAAC;gBACrC,WAAW,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;oBAC5B,YAAY,CAAC,IAAI,CACf,KAAK,CAAC,EAAE,CAAC,WAAW,EAAE,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CACvD,CAAC;oBACF,YAAY,CAAC,IAAI,CACf,KAAK,CAAC,EAAE,CAAC,YAAY,EAAE,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CACxD,CAAC;oBACF,KAAK,CAAC,OAAO,EAAE,CAAC;gBAClB,CAAC,CAAC,CAAC;gBACH,IAAI,CAAC,0BAA0B,GAAG,GAAS,EAAE;oBAC3C,OAAO,CAAC,YAAY,CAAC,CAAC;gBACxB,CAAC,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACN,MAAM,WAAW,GAAG,IAAI,CAAC,uBAAuB,CAAC,cAAc,EAAE,CAAC;gBAClE,WAAW,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;oBAC5B,KAAK,CAAC,OAAO,EAAE,CAAC;gBAClB,CAAC,CAAC,CAAC;YACL,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO;QACL,IAAI,CAAC,0BAA0B,EAAE,EAAE,CAAC;QACpC,IAAI,CAAC,0BAA0B,GAAG,IAAI,CAAC;QACvC,KAAK,CAAC,OAAO,EAAE,CAAC;IAClB,CAAC;CACF;AAED,eAAe,8BAA8B,CAAC"}
+{"version":3,"file":"mapboxStyleOpenlayersImpl.js","sourceRoot":"","sources":["../../../../src/layer/openlayers/mapboxStyleOpenlayersImpl.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAK3C,OAAO,mBAAmB,MAAM,0BAA0B,CAAC;AAE3D,MAAM,8BAA+B,SAAQ,mBAAmB;IAC9D,MAAM,KAAK,SAAS;QAClB,OAAO,gCAAgC,CAAC;IAC1C,CAAC;IAEO,uBAAuB,CAAyB;IAEhD,uBAAuB,CAA4B;IAEnD,0BAA0B,GAAwB,IAAI,CAAC;IAE/D,YACE,GAAkB,EAClB,OAA8C;QAE9C,KAAK,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QACpB,IAAI,CAAC,uBAAuB,GAAG,OAAO,CAAC,sBAAsB,CAAC;IAChE,CAAC;IAED,KAAK,CAAC,UAAU;QACd,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;YACtB,IAAI,CAAC,uBAAuB,GAAG,MAAM,IAAI,CAAC,uBAAuB,EAAE,CAAC;QACtE,CAAC;QACD,MAAM,KAAK,CAAC,UAAU,EAAE,CAAC;IAC3B,CAAC;IAED,UAAU;QACR,IAAI,CAAC,IAAI,CAAC,uBAAuB,EAAE,CAAC;YAClC,MAAM,IAAI,KAAK,CAAC,mDAAmD,CAAC,CAAC;QACvE,CAAC;QACD,OAAO,IAAI,CAAC,uBAAsC,CAAC;IACrD,CAAC;IAED,oBAAoB,CAAC,cAA8B;QACjD,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;QACrC,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;YACrB,IAAI,CAAC,0BAA0B,EAAE,EAAE,CAAC;YACpC,IAAI,CAAC,0BAA0B,GAAG,IAAI,CAAC;YAEvC,IAAI,CAAC,IAAI,CAAC,uBAAuB,EAAE,CAAC;gBAClC,OAAO;YACT,CAAC;YAED,IAAI,cAAc,KAAK,cAAc,CAAC,IAAI,EAAE,CAAC;gBAC3C,MAAM,WAAW,GAAG,IAAI,CAAC,uBAAuB,CAAC,cAAc,EAAE,CAAC;gBAClE,MAAM,YAAY,GAAgB,EAAE,CAAC;gBACrC,WAAW,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;oBAC5B,YAAY,CAAC,IAAI,CACf,KAAK,CAAC,EAAE,CAAC,WAAW,EAAE,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CACvD,CAAC;oBACF,YAAY,CAAC,IAAI,CACf,KAAK,CAAC,EAAE,CAAC,YAAY,EAAE,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CACxD,CAAC;oBACF,KAAK,CAAC,OAAO,EAAE,CAAC;gBAClB,CAAC,CAAC,CAAC;gBACH,IAAI,CAAC,0BAA0B,GAAG,GAAS,EAAE;oBAC3C,OAAO,CAAC,YAAY,CAAC,CAAC;gBACxB,CAAC,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACN,MAAM,WAAW,GAAG,IAAI,CAAC,uBAAuB,CAAC,cAAc,EAAE,CAAC;gBAClE,WAAW,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;oBAC5B,KAAK,CAAC,OAAO,EAAE,CAAC;gBAClB,CAAC,CAAC,CAAC;YACL,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO;QACL,IAAI,CAAC,0BAA0B,EAAE,EAAE,CAAC;QACpC,IAAI,CAAC,0BAA0B,GAAG,IAAI,CAAC;QACvC,IAAI,CAAC,uBAAuB,EAAE,OAAO,EAAE,CAAC;QACxC,IAAI,CAAC,uBAAuB,GAAG,SAAS,CAAC;QACzC,KAAK,CAAC,OAAO,EAAE,CAAC;IAClB,CAAC;CACF;AAED,eAAe,8BAA8B,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vcmap/core",
-  "version": "6.3.3",
+  "version": "6.3.5",
   "description": "",
   "main": "dist/index.js",
   "type": "module",
@@ -53,10 +53,10 @@
     "@types/sinon-chai": "^3.2.12",
     "@vcsuite/eslint-config": "^4.0.0",
     "c8": "^10.1.2",
-    "canvas": "^2.11.2",
+    "canvas": "^3.2.3",
     "chai": "^4.4.1",
     "chai-as-promised": "^8.0.1",
-    "jsdom": "^24.1.0",
+    "jsdom": "^26.1.0",
     "jsdom-global": "^3.0.2",
     "madge": "^8.0.0",
     "mocha": "^10.0.0",
@@ -86,7 +86,10 @@
     "proj4": "^2.15.0",
     "rbush": ">=4.0.0",
     "rbush-knn": "^4.0.0",
-    "uuid": "^11.1.0"
+    "uuid": "^14.0.0"
+  },
+  "overrides": {
+    "serialize-javascript": "^7.0.5"
   },
   "engines": {
     "node": "^20.0.0"

package/src/cesium/wallpaperMaterial.js

@@ -15,9 +15,9 @@ Material._materialCache.addMaterial('Wallpaper', {
     },
     components: {
       diffuse:
-        'texture2D(image, fract((gl_FragCoord.xy - anchor.xy) / vec2(imageDimensions.xy))).rgb',
+        'texture(image, fract((gl_FragCoord.xy - anchor.xy) / vec2(imageDimensions.xy))).rgb',
       alpha:
-        'texture2D(image, fract((gl_FragCoord.xy - anchor.xy) / vec2(imageDimensions.xy))).a',
+        'texture(image, fract((gl_FragCoord.xy - anchor.xy) / vec2(imageDimensions.xy))).a',
     },
   },
   translucent: false,

package/src/featureProvider/mapboxFeatureProvider.ts

@@ -1,8 +1,8 @@
 import { v4 as uuid } from 'uuid';
 import OLMap from 'ol/Map.js';
+import type LayerGroup from 'ol/layer/Group.js';
 import type Feature from 'ol/Feature.js';
 import type { Coordinate } from 'ol/coordinate.js';
-import type LayerGroup from 'ol/layer/Group.js';
 import type RenderFeature from 'ol/render/Feature.js';
 import { toFeature } from 'ol/render/Feature.js';
 import type Layer from '../layer/layer.js';
@@ -13,7 +13,7 @@ import AbstractFeatureProvider, {
 import { isProvidedFeature } from './featureProviderSymbols.js';
 
 export type MapboxFeatureProviderOptions = AbstractFeatureProviderOptions & {
-  styledMapboxLayerGroup: LayerGroup;
+  createStyledLayerGroup: () => Promise<LayerGroup>;
   excludeLayerFromPicking?: string[];
 };
 
@@ -23,15 +23,27 @@ export default class MapboxFeatureProvider extends AbstractFeatureProvider {
   }
 
   protected _inRenderingOrder = true;
-
   private _renderMap = new OLMap({ target: document.createElement('div') });
+  private _styledLayerGroup?: LayerGroup;
   private _excludeLayerFromPicking?: string[];
 
   constructor(options: MapboxFeatureProviderOptions) {
     super(options);
 
     this._renderMap.setSize([256, 256]);
-    this._renderMap.addLayer(options.styledMapboxLayerGroup);
+    options
+      .createStyledLayerGroup()
+      .then((layerGroup) => {
+        if (this.isDestroyed) {
+          layerGroup.dispose();
+          return;
+        }
+        this._styledLayerGroup = layerGroup;
+        this._renderMap.addLayer(layerGroup);
+      })
+      .catch((error: unknown) => {
+        this.getLogger().error('Error creating styled layer group', error);
+      });
     this._excludeLayerFromPicking = options.excludeLayerFromPicking;
   }
 
@@ -67,6 +79,11 @@ export default class MapboxFeatureProvider extends AbstractFeatureProvider {
   }
 
   destroy(): void {
+    if (this._styledLayerGroup) {
+      this._renderMap.removeLayer(this._styledLayerGroup);
+      this._styledLayerGroup.dispose();
+      this._styledLayerGroup = undefined;
+    }
     this._renderMap.setTarget(undefined);
     this._renderMap.dispose();
     super.destroy();

package/src/layer/cesium/mapboxStyleCesiumImpl.ts

@@ -16,7 +16,7 @@ import RasterLayerCesiumImpl from './rasterLayerCesiumImpl.js';
 
 export type MapboxStyleLayerImplementationOptions =
   LayerImplementationOptions & {
-    styledMapboxLayerGroup: LayerGroup;
+    createStyledLayerGroup: () => Promise<LayerGroup>;
     splitDirection: SplitDirection;
     minRenderingLevel?: number;
     maxRenderingLevel?: number;
@@ -27,7 +27,9 @@ class MapboxStyleCesiumImpl extends RasterLayerCesiumImpl {
     return 'MapboxStyleCesiumImpl';
   }
 
-  private _styledMapboxLayerGroup: LayerGroup;
+  private _styledMapboxLayerGroup: LayerGroup | undefined;
+
+  private _createStyledLayerGroup: () => Promise<LayerGroup>;
 
   minRenderingLevel: number | undefined;
 
@@ -46,19 +48,21 @@ class MapboxStyleCesiumImpl extends RasterLayerCesiumImpl {
       tilingSchema: TilingScheme.MERCATOR,
       opacity: 1,
     });
-    this._styledMapboxLayerGroup = options.styledMapboxLayerGroup;
+    this._createStyledLayerGroup = options.createStyledLayerGroup;
     this.minRenderingLevel = options.minRenderingLevel;
     this.maxRenderingLevel = options.maxRenderingLevel;
   }
 
   async activate(): Promise<void> {
     await super.activate();
-    if (this.active) {
+    if (this.active && this._styledMapboxLayerGroup) {
       this._styledMapboxLayerGroup.setVisible(true);
     }
   }
 
-  getCesiumLayer(): Promise<CesiumImageryLayer> {
+  async getCesiumLayer(): Promise<CesiumImageryLayer> {
+    this._styledMapboxLayerGroup = await this._createStyledLayerGroup();
+
     const options: MapboxStyleImageryProviderOptions = {
       headers: this.headers,
       styledMapboxLayerGroup: this._styledMapboxLayerGroup,
@@ -80,14 +84,14 @@ class MapboxStyleCesiumImpl extends RasterLayerCesiumImpl {
         extent[3],
       );
     }
-    return Promise.resolve(
-      // @ts-expect-error mistyped
-      new CesiumImageryLayer(this.imageryProvider, layerOptions),
-    );
+    // @ts-expect-error mistyped
+    return new CesiumImageryLayer(this.imageryProvider, layerOptions);
   }
 
   destroy(): void {
     this.imageryProvider?.destroy();
+    this._styledMapboxLayerGroup?.dispose();
+    this._styledMapboxLayerGroup = undefined;
     super.destroy();
   }
 }

package/src/layer/layerImplementation.ts

@@ -19,6 +19,8 @@ class LayerImplementation<M extends VcsMap> extends VcsObject {
 
   private _initialized = false;
 
+  private _loadingPromise: Promise<void> | null = null;
+
   headers?: Record<string, string>;
 
   constructor(map: M, options: LayerImplementationOptions) {
@@ -64,12 +66,30 @@ class LayerImplementation<M extends VcsMap> extends VcsObject {
    * Once the promise resolves, the layer can still be inactive, if deactivate was called while initializing the layer.
    */
   async activate(): Promise<void> {
-    if (this.map.active && !this.active) {
-      this._state = LayerState.LOADING;
-      await this.initialize();
-      if (this.loading) {
-        this._state = LayerState.ACTIVE;
-      }
+    if (this._loadingPromise) {
+      await this._loadingPromise;
+      return;
+    }
+
+    if (this.map.active && this._state === LayerState.INACTIVE) {
+      this._loadingPromise = (async (): Promise<void> => {
+        this._state = LayerState.LOADING;
+        await this.initialize();
+        if (this.loading) {
+          this._state = LayerState.ACTIVE;
+        }
+      })()
+        .catch((err: unknown) => {
+          if (this.loading) {
+            this._state = LayerState.INACTIVE;
+          }
+          return Promise.reject(err as Error);
+        })
+        .finally(() => {
+          this._loadingPromise = null;
+        });
+
+      await this._loadingPromise;
     }
   }
 

package/src/layer/mapboxStyleLayer.ts

@@ -1,14 +1,15 @@
 import { SplitDirection } from '@vcmap-cesium/engine';
 import { parseInteger } from '@vcsuite/parsers';
 import { is } from '@vcsuite/check';
-import Collection from 'ol/Collection.js';
-import LayerGroup from 'ol/layer/Group.js';
-import type BaseLayer from 'ol/layer/Base.js';
-import { apply } from 'ol-mapbox-style';
+import type LayerGroup from 'ol/layer/Group.js';
 import { layerClassRegistry } from '../classRegistry.js';
 import AbstractAttributeProvider from '../featureProvider/abstractAttributeProvider.js';
-import CompositeFeatureProvider from '../featureProvider/compositeFeatureProvider.js';
-import MapboxFeatureProvider from '../featureProvider/mapboxFeatureProvider.js';
+import CompositeFeatureProvider, {
+  type CompositeFeatureProviderOptions,
+} from '../featureProvider/compositeFeatureProvider.js';
+import MapboxFeatureProvider, {
+  type MapboxFeatureProviderOptions,
+} from '../featureProvider/mapboxFeatureProvider.js';
 import type VcsMap from '../map/vcsMap.js';
 import BaseCesiumMap from '../map/baseCesiumMap.js';
 import CesiumMap from '../map/cesiumMap.js';
@@ -22,8 +23,8 @@ import MapboxVectorRasterTileCesiumImpl, {
 import Layer from './layer.js';
 import type { LayerOptions, SplitLayer } from './layer.js';
 import type LayerImplementation from './layerImplementation.js';
+import { createStyledMapboxLayerGroup } from './mapboxStyleLayerHelpers.js';
 import MapboxVectorTileOpenlayersImpl from './openlayers/mapboxStyleOpenlayersImpl.js';
-import { allowPicking, vcsLayerName } from './layerSymbols.js';
 
 export type MapboxStyleOptions = LayerOptions & {
   /** The sources from the Mapbox Style to use. If not provided, all sources from the style will be used. */
@@ -68,10 +69,10 @@ class MapboxStyleLayer
     OpenlayersMap.className,
     PanoramaMap.className,
   ];
-  private _mapboxLayerGroup: LayerGroup;
   private _sources?: string[];
   private _excludeLayerFromPicking?: string[];
   private _splitDirection: SplitDirection = SplitDirection.NONE;
+  private _boundCreateStyledLayerGroup: () => Promise<LayerGroup>;
   splitDirectionChanged = new VcsEvent<SplitDirection>();
   /**
    * defines the visible level in the rendered map, maps to Openlayers `minZoom` and Cesium `minimiumTerrainLevel`.
@@ -104,40 +105,24 @@ class MapboxStyleLayer
       options.maxRenderingLevel,
       defaultOptions.maxRenderingLevel,
     );
+    this._boundCreateStyledLayerGroup = this._createStyledLayerGroup.bind(this);
+  }
 
-    this._mapboxLayerGroup = new LayerGroup({
-      minZoom: this.minRenderingLevel,
-      maxZoom: this.maxRenderingLevel,
+  private _createStyledLayerGroup(): Promise<LayerGroup> {
+    return createStyledMapboxLayerGroup({
+      url: this.url,
+      name: this.name,
+      allowPicking: this.allowPicking,
+      sources: this._sources,
+      minRenderingLevel: this.minRenderingLevel,
+      maxRenderingLevel: this.maxRenderingLevel,
     });
   }
 
   async initialize(): Promise<void> {
-    if (!this.initialized) {
-      await apply(this._mapboxLayerGroup, this.url);
-
-      const layers = this._mapboxLayerGroup.getLayersArray();
-      layers.forEach((layer) => {
-        layer[vcsLayerName] = this.name;
-        layer[allowPicking] = super.allowPicking;
-      });
-
-      if (this._sources && this._sources.length > 0) {
-        const filteredCollection = new Collection<BaseLayer>();
-        layers
-          .filter((layer) =>
-            this._sources!.includes(layer.get('mapbox-source') as string),
-          )
-          .forEach((layer) => {
-            filteredCollection.push(layer);
-          });
-
-        this._mapboxLayerGroup.setLayers(filteredCollection);
-      }
-    }
-
     if (!this.featureProvider) {
       this.featureProvider = new MapboxFeatureProvider({
-        styledMapboxLayerGroup: this._mapboxLayerGroup,
+        createStyledLayerGroup: this._boundCreateStyledLayerGroup,
         excludeLayerFromPicking: this._excludeLayerFromPicking,
       });
     } else if (is(this.featureProvider, AbstractAttributeProvider)) {
@@ -145,7 +130,7 @@ class MapboxStyleLayer
         attributeProviders: [this.featureProvider],
         featureProviders: [
           new MapboxFeatureProvider({
-            styledMapboxLayerGroup: this._mapboxLayerGroup,
+            createStyledLayerGroup: this._boundCreateStyledLayerGroup,
             excludeLayerFromPicking: this._excludeLayerFromPicking,
           }),
         ],
@@ -172,7 +157,7 @@ class MapboxStyleLayer
   getImplementationOptions(): MapboxStyleLayerImplementationOptions {
     return {
       ...super.getImplementationOptions(),
-      styledMapboxLayerGroup: this._mapboxLayerGroup,
+      createStyledLayerGroup: this._boundCreateStyledLayerGroup,
       splitDirection: this._splitDirection,
       minRenderingLevel: this.minRenderingLevel,
       maxRenderingLevel: this.maxRenderingLevel,
@@ -205,6 +190,42 @@ class MapboxStyleLayer
   ): MapboxStyleOptions {
     const config: MapboxStyleOptions = { ...super.toJSON() };
 
+    if (
+      (config.featureProvider as MapboxFeatureProviderOptions)?.type ===
+      MapboxFeatureProvider.className
+    ) {
+      delete config.featureProvider;
+    } else if (
+      (config.featureProvider as CompositeFeatureProviderOptions)?.type ===
+      CompositeFeatureProvider.className
+    ) {
+      const compositeConfig =
+        config.featureProvider as CompositeFeatureProviderOptions;
+      const featureProviders = (compositeConfig.featureProviders || []).filter(
+        (providerConfig) =>
+          (providerConfig as MapboxFeatureProviderOptions).type !==
+          MapboxFeatureProvider.className,
+      );
+      const attributeProviders = compositeConfig.attributeProviders || [];
+
+      if (featureProviders.length === 0 && attributeProviders.length === 0) {
+        delete config.featureProvider;
+      } else if (
+        featureProviders.length === 0 &&
+        attributeProviders.length === 1
+      ) {
+        config.featureProvider =
+          attributeProviders[0] as AbstractAttributeProvider;
+      } else {
+        const filteredComposite: CompositeFeatureProviderOptions = {
+          ...compositeConfig,
+          featureProviders,
+          attributeProviders,
+        };
+        config.featureProvider = filteredComposite;
+      }
+    }
+
     if (this._sources && this._sources.length > 0) {
       config.sources = this._sources.slice();
     }
@@ -234,7 +255,6 @@ class MapboxStyleLayer
 
   destroy(): void {
     this.splitDirectionChanged.destroy();
-    this._mapboxLayerGroup.dispose();
     this.featureProvider?.destroy();
     super.destroy();
   }

package/src/layer/mapboxStyleLayerHelpers.ts

@@ -0,0 +1,52 @@
+import Collection from 'ol/Collection.js';
+import type BaseLayer from 'ol/layer/Base.js';
+import LayerGroup from 'ol/layer/Group.js';
+import { apply } from 'ol-mapbox-style';
+import { allowPicking, vcsLayerName } from './layerSymbols.js';
+
+export type StyledMapboxLayerGroupOptions = {
+  url: string;
+  name: string;
+  allowPicking: boolean;
+  sources?: string[];
+  minRenderingLevel?: number;
+  maxRenderingLevel?: number;
+};
+
+async function applyStyleAndConfigureGroup(
+  mapboxLayerGroup: LayerGroup,
+  options: StyledMapboxLayerGroupOptions,
+): Promise<void> {
+  await apply(mapboxLayerGroup, options.url);
+
+  const layers = mapboxLayerGroup.getLayersArray();
+  layers.forEach((layer) => {
+    layer[vcsLayerName] = options.name;
+    layer[allowPicking] = options.allowPicking;
+  });
+
+  if (options.sources && options.sources.length > 0) {
+    const filteredCollection = new Collection<BaseLayer>();
+    layers
+      .filter((layer) =>
+        options.sources!.includes(layer.get('mapbox-source') as string),
+      )
+      .forEach((layer) => {
+        filteredCollection.push(layer);
+      });
+
+    mapboxLayerGroup.setLayers(filteredCollection);
+  }
+}
+
+export async function createStyledMapboxLayerGroup(
+  options: StyledMapboxLayerGroupOptions,
+): Promise<LayerGroup> {
+  const mapboxLayerGroup = new LayerGroup({
+    minZoom: options.minRenderingLevel,
+    maxZoom: options.maxRenderingLevel,
+  });
+
+  await applyStyleAndConfigureGroup(mapboxLayerGroup, options);
+  return mapboxLayerGroup;
+}

package/src/layer/openlayers/mapboxStyleOpenlayersImpl.ts

@@ -12,7 +12,9 @@ class MapboxVectorTileOpenlayersImpl extends LayerOpenlayersImpl {
     return 'MapboxVectorTileOpenlayersImpl';
   }
 
-  private _styledMapboxLayerGroup: LayerGroup;
+  private _styledMapboxLayerGroup: LayerGroup | undefined;
+
+  private _createStyledLayerGroup: () => Promise<LayerGroup>;
 
   private _removeChildLayerListeners: (() => void) | null = null;
 
@@ -21,10 +23,20 @@ class MapboxVectorTileOpenlayersImpl extends LayerOpenlayersImpl {
     options: MapboxStyleLayerImplementationOptions,
   ) {
     super(map, options);
-    this._styledMapboxLayerGroup = options.styledMapboxLayerGroup;
+    this._createStyledLayerGroup = options.createStyledLayerGroup;
+  }
+
+  async initialize(): Promise<void> {
+    if (!this.initialized) {
+      this._styledMapboxLayerGroup = await this._createStyledLayerGroup();
+    }
+    await super.initialize();
   }
 
   getOLLayer(): OLLayerLike {
+    if (!this._styledMapboxLayerGroup) {
+      throw new Error('Mapbox layer group must be initialized before use');
+    }
     return this._styledMapboxLayerGroup as OLLayerLike;
   }
 
@@ -34,6 +46,10 @@ class MapboxVectorTileOpenlayersImpl extends LayerOpenlayersImpl {
       this._removeChildLayerListeners?.();
       this._removeChildLayerListeners = null;
 
+      if (!this._styledMapboxLayerGroup) {
+        return;
+      }
+
       if (splitDirection !== SplitDirection.NONE) {
         const childLayers = this._styledMapboxLayerGroup.getLayersArray();
         const listenerKeys: EventsKey[] = [];
@@ -61,6 +77,8 @@ class MapboxVectorTileOpenlayersImpl extends LayerOpenlayersImpl {
   destroy(): void {
     this._removeChildLayerListeners?.();
     this._removeChildLayerListeners = null;
+    this._styledMapboxLayerGroup?.dispose();
+    this._styledMapboxLayerGroup = undefined;
     super.destroy();
   }
 }