azure-maps-control 2.2.0 → 3.0.0-preview.1

package/dist/atlas-core-bare.js

@@ -56,9 +56,9 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
     typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('azuremaps-maplibre-gl')) :
     typeof define === 'function' && define.amd ? define(['exports', 'azuremaps-maplibre-gl'], factory) :
     (global = global || self, factory(global.atlas = global.atlas || {}, global.maplibregl));
-}(this, (function (exports, mapboxgl) { 'use strict';
+}(this, (function (exports, maplibregl) { 'use strict';
 
-    var mapboxgl__default = 'default' in mapboxgl ? mapboxgl['default'] : mapboxgl;
+    maplibregl = maplibregl && Object.prototype.hasOwnProperty.call(maplibregl, 'default') ? maplibregl['default'] : maplibregl;
 
     var env = {
     	domain: "atlas.microsoft.com",
@@ -343,7 +343,7 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
         return Url;
     }());
 
-    var version = "2.2.0";
+    var version = "3.0.0-preview.1";
 
     /**
      * A helper class that provides methods for getting various forms of the map controls current version.
@@ -12574,9 +12574,9 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
                 // Add this layer again if the layer was removed by mapbox after a style change.
                 if (!_this.map._getMap().getLayer(_this.id)) {
                     var map = _this.map;
-                    var before_1 = (_a = _this.map.layers._getUserLayers().find(function (l) { return l.layer.getId() == _this.id; })) === null || _a === void 0 ? void 0 : _a.before;
+                    var before = (_a = _this.map.layers._getUserLayers().find(function (l) { return l.layer.getId() == _this.id; })) === null || _a === void 0 ? void 0 : _a.before;
                     map.layers.remove(_this);
-                    map.layers.add(_this, before_1);
+                    map.layers.add(_this, before);
                 }
             };
             _this.options = new WebGLLayerOptions().merge(cloneDeepWith_1(options, WebGLLayerOptions._cloneCustomizer));
@@ -13243,7 +13243,7 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
             if (options.anchor === "none") {
                 this.autoAnchor = autoAnchor || "bottom";
                 this.containerDiv.classList.add(this.autoAnchor);
-                marker = new mapboxgl.Marker({
+                marker = new maplibregl.Marker({
                     anchor: this.autoAnchor,
                     element: this.containerDiv,
                     offset: options.pixelOffset,
@@ -13251,7 +13251,7 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
             }
             else {
                 this.containerDiv.classList.add(options.anchor);
-                marker = new mapboxgl.Marker({
+                marker = new maplibregl.Marker({
                     anchor: options.anchor,
                     element: this.containerDiv,
                     offset: options.pixelOffset,
@@ -13617,7 +13617,7 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
             if (!options.visible) {
                 this.element.classList.add(HtmlMarker.hiddenClass);
             }
-            this.marker = new mapboxgl.Marker({
+            this.marker = new maplibregl.Marker({
                 element: this.element,
                 offset: options.pixelOffset,
                 draggable: options.draggable,
@@ -14326,13 +14326,13 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
      * Gets the worker count that will get created.
      */
     function getWorkerCount() {
-        return mapboxgl__default.workerCount;
+        return maplibregl.workerCount;
     }
     /**
      * Gets the Maximum number of images (raster tiles, sprites, icons) to load in parallel
      */
     function getMaxParallelImageRequests() {
-        return mapboxgl__default.maxParallelImageRequests;
+        return maplibregl.maxParallelImageRequests;
     }
     /**
      * Gets the default language that was provided.
@@ -14385,7 +14385,7 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
         if (UserAgent.isIE()) {
             return false;
         }
-        return mapboxgl__default.supported({
+        return maplibregl.supported({
             failIfMajorPerformanceCaveat: failIfMajorPerformanceCaveat
         });
     }
@@ -14444,7 +14444,7 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
      */
     function setWorkerCount(workerCount) {
         if (workerCount > 0) {
-            mapboxgl__default.workerCount = workerCount;
+            maplibregl.workerCount = workerCount;
             hasWorkerCount = true;
         }
     }
@@ -14455,7 +14455,7 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
      */
     function setMaxParallelImageRequests(maxParallelImageRequests) {
         if (maxParallelImageRequests > 0) {
-            mapboxgl__default.maxParallelImageRequests = maxParallelImageRequests;
+            maplibregl.maxParallelImageRequests = maxParallelImageRequests;
             hasMaxParallelImageRequests = true;
         }
     }
@@ -14570,7 +14570,7 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
      * created and destroyed.
      */
     function prewarm() {
-        mapboxgl__default.prewarm();
+        maplibregl.prewarm();
     }
     /**
      * Clears up resources that have previously been created by `atlas.prewarm()`.
@@ -14579,7 +14579,7 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
      * in your application.
      */
     function clearPrewarmedResources() {
-        mapboxgl__default.clearPrewarmedResources();
+        maplibregl.clearPrewarmedResources();
     }
     /**
      * Returns if authentication options are set.
@@ -16257,6 +16257,7 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
                     40
                 ];
                 // accessibility recommendation: After using any of the map shortcut keys, NVDA should not read all the shortcut keys again.
+                // // TODO: this should be this.map._getMap().getCanvas
                 var mapCanvas = _this.map._getMap()._canvas;
                 mapCanvas === null || mapCanvas === void 0 ? void 0 : mapCanvas.addEventListener('keyup', function (event) {
                     if (baseShortcutKeyCodes.find(function (code) { return event.keyCode === code; })) {
@@ -23950,6 +23951,7 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
                     // Replace the existing layer with the new one.
                     // Place the new layer behind the specified before layer.
                     var layerIndex = this.layerIndex.findIndex(function (l) { return l.getId() === layer.getId(); });
+                    var userLayerIndex = this.userLayers.findIndex(function (ul) { return ul.layer.getId() === layer.getId(); });
                     var tempLayer = this.layerIndex[layerIndex];
                     this._removeMapboxLayers(layer);
                     this._addMapboxLayers(layer, before);
@@ -23958,8 +23960,9 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
                     this.layerIndex.splice(layerIndex, 1);
                     var beforeIndex = this.layerIndex.findIndex(function (l) { return l.getId() === before; });
                     this.layerIndex.splice(beforeIndex, 0, layer);
-                    if (!(layer instanceof FundamentalMapLayer))
-                        this.userLayers.push({ layer: layer, before: before });
+                    if (!(layer instanceof FundamentalMapLayer)) {
+                        this.userLayers[userLayerIndex] = { layer: layer, before: before };
+                    }
                     tempLayer.onRemove();
                     layer.onAdd(this.map);
                 }
@@ -23969,14 +23972,16 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
                     this.map.events._enableLayerEvents(layer);
                     var beforeIndex = this.layerIndex.findIndex(function (l) { return l.getId() === before; });
                     this.layerIndex.splice(beforeIndex, 0, layer);
-                    if (!(layer instanceof FundamentalMapLayer))
+                    if (!(layer instanceof FundamentalMapLayer)) {
                         this.userLayers.push({ layer: layer, before: before });
+                    }
                     layer.onAdd(this.map);
                 }
             }
             else {
                 var layerIndex = this.layerIndex.findIndex(function (l) { return l.getId() === layer.getId(); });
-                if (layerIndex >= 0) {
+                var userLayerIndex = this.userLayers.findIndex(function (ul) { return ul.layer.getId() === layer.getId(); });
+                if (layerIndex >= 0 && userLayerIndex >= 0) {
                     // Replace the existing layer with the new one.
                     var tempLayer = this.layerIndex[layerIndex];
                     this._removeMapboxLayers(tempLayer);
@@ -23984,6 +23989,9 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
                     this.map.events._disableLayerEvents(tempLayer);
                     this.map.events._enableLayerEvents(layer);
                     this.layerIndex[layerIndex] = layer;
+                    if (!(layer instanceof FundamentalMapLayer)) {
+                        this.userLayers[userLayerIndex] = { layer: layer, before: undefined };
+                    }
                     tempLayer.onRemove();
                     layer.onAdd(this.map);
                 }
@@ -23992,8 +24000,9 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
                     this._addMapboxLayers(layer);
                     this.map.events._enableLayerEvents(layer);
                     this.layerIndex.push(layer);
-                    if (!(layer instanceof FundamentalMapLayer))
+                    if (!(layer instanceof FundamentalMapLayer)) {
                         this.userLayers.push({ layer: layer, before: before });
+                    }
                     layer.onAdd(this.map);
                 }
             }
@@ -24239,6 +24248,11 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
             else {
                 this.layerIndex.push(layer);
             }
+            // Update before property of the user layer
+            var userLayer = this.userLayers.find(function (ul) { return ul.layer.getId() === layerId; });
+            if (userLayer) {
+                userLayer.before = beforeId;
+            }
         };
         LayerManager.prototype._moveMapboxLayers = function (layer, before) {
             var e_7, _a;
@@ -25793,10 +25807,11 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
          */
         LayerGroupComparator.getLayerGroup = function (layer) {
             var _a;
-            if ((layer === null || layer === void 0 ? void 0 : layer.metadata) && layer.metadata['microsoft.maps:layerGroup']) {
-                return layer.metadata['microsoft.maps:layerGroup'];
+            var layerObject = layer;
+            if ((layerObject === null || layerObject === void 0 ? void 0 : layerObject.metadata) && layerObject.metadata['microsoft.maps:layerGroup']) {
+                return layerObject.metadata['microsoft.maps:layerGroup'];
             }
-            var layerId = (_a = layer === null || layer === void 0 ? void 0 : layer.id) !== null && _a !== void 0 ? _a : layer;
+            var layerId = (_a = layerObject === null || layerObject === void 0 ? void 0 : layerObject.id) !== null && _a !== void 0 ? _a : layer;
             if (!layerId.startsWith("microsoft.")) {
                 return undefined;
             }
@@ -26129,16 +26144,153 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
             }
             throw Error("Style definition does not contain neither URL nor style object.");
         };
+        StyleManager.prototype.deriveNewStyle = function (previousStyle, nextStyle) {
+            // Layers in the next style with default properties that do not align with current StyleOptions
+            // should be modified before they are applied to the map.
+            var styleOptions = this.map.getStyle();
+            var trafficOptions = this.map.getTraffic();
+            return __assign(__assign({}, nextStyle), { 
+                // force a replacement of language placeholder in the tileset url to avoid resolution to a same cache with placeholders on language change
+                sources: Object.entries(nextStyle.sources).reduce(function (newSources, _a) {
+                    var _b = __read(_a, 2), sourceKey = _b[0], source = _b[1];
+                    var newSource = __assign({}, source);
+                    if ('url' in newSource && typeof newSource.url === 'string') {
+                        if (newSource.url.includes(constants.languagePlaceHolder)) {
+                            newSource.url = newSource.url.replace(constants.languagePlaceHolder, styleOptions.language);
+                        }
+                    }
+                    newSources[sourceKey] = newSource;
+                    return newSources;
+                }, {}), layers: nextStyle.layers.map(function (layer) {
+                    var _a, _b, _c, _d, _e;
+                    var nextLayer = __assign({}, layer);
+                    var layerGroup = LayerGroupComparator.getLayerGroup(nextLayer);
+                    if (!layerGroup) {
+                        return nextLayer;
+                    }
+                    // 1. Set visiblity of fill-extrusion layers according to StyleOptions.showBuildingModels
+                    if (!styleOptions.showBuildingModels && nextLayer.type === "fill-extrusion") {
+                        nextLayer.layout = (_a = nextLayer.layout) !== null && _a !== void 0 ? _a : {};
+                        nextLayer.layout.visibility = "none";
+                    }
+                    else if (nextLayer.type === "fill-extrusion") {
+                        nextLayer.layout = (_b = nextLayer.layout) !== null && _b !== void 0 ? _b : {};
+                        nextLayer.layout.visibility = "visible";
+                    }
+                    // 2. Set visibility of traffic layers depending on traffic settings.
+                    if (trafficOptions.flow !== "none" && layerGroup) {
+                        if (layerGroup === "traffic_" + trafficOptions.flow && nextLayer.type == "line") {
+                            nextLayer.layout = (_c = nextLayer.layout) !== null && _c !== void 0 ? _c : {};
+                            nextLayer.layout.visibility = "visible";
+                        }
+                    }
+                    // 3. Set visibility of labels
+                    var isLabelLayerGroup = layerGroup === 'labels' || layerGroup === 'labels_places' || layerGroup === 'labels_indoor';
+                    if (isLabelLayerGroup && nextLayer.type === 'symbol') {
+                        if (styleOptions.showLabels) {
+                            nextLayer.layout = (_d = nextLayer.layout) !== null && _d !== void 0 ? _d : {};
+                            nextLayer.layout.visibility = "visible";
+                        }
+                        else {
+                            nextLayer.layout = (_e = nextLayer.layout) !== null && _e !== void 0 ? _e : {};
+                            nextLayer.layout.visibility = "none";
+                        }
+                    }
+                    return nextLayer;
+                }) });
+        };
+        StyleManager.prototype.injectUserLayersIntoStyle = function (previousStyle, nextStyle, layerGroupLayers) {
+            // Custom layers added to mapbox through this SDK should be carried over to the next style.
+            return !previousStyle
+                ? nextStyle
+                : this.map.layers._getUserLayers().reduce(function (style, userLayer) {
+                    if (userLayer.layer instanceof WebGLLayer) {
+                        // mapbox custom layers cannot be serialized and preserved,
+                        // return to continue to the next user layer.
+                        return style;
+                    }
+                    var before = layerGroupLayers[userLayer.before] && layerGroupLayers[userLayer.before].length > 0
+                        ? layerGroupLayers[userLayer.before][0]
+                        : undefined;
+                    var layer = previousStyle.layers.find(function (layer) { return layer.id === userLayer.layer.getId(); });
+                    // when setStyle diff attempt is unsuccesful, _load will be called on the style that may have already injected user layers -> clean it up
+                    var existingLayerIdx = nextStyle.layers.findIndex(function (layer) { return layer.id === userLayer.layer.getId(); });
+                    if (existingLayerIdx > -1) {
+                        nextStyle.layers.splice(existingLayerIdx, 1);
+                    }
+                    if (layer) {
+                        var sourcesToCopy = new Set(Array.from(userLayer.layer._getSourceIds())
+                            .map(function (sourceId) { return previousStyle.sources[sourceId] ? { source: previousStyle.sources[sourceId], id: sourceId } : undefined; })
+                            .filter(function (source) { return source !== undefined; }));
+                        var insertIdx = before ? style.layers.findIndex(function (layer) { return layer.id === before.id; }) : -1;
+                        if (insertIdx > -1) {
+                            style.layers.splice(insertIdx, 0, layer);
+                        }
+                        else {
+                            style.layers.push(layer);
+                        }
+                        sourcesToCopy.forEach(function (_a) {
+                            var source = _a.source, id = _a.id;
+                            style.sources[id] = source;
+                        });
+                    }
+                    return style;
+                }, __assign({}, nextStyle));
+        };
         /**
          * @internal
          */
         StyleManager.prototype.setStyle = function (styleOptions, diff) {
+            var _this = this;
             if (diff === void 0) { diff = true; }
             try {
                 this.map._getMap().setStyle(this.getStyle(styleOptions), {
                     diff: diff,
-                    stylePatch: this._stylePatch.bind(this),
-                    validate: this.serviceOptions.validateStyle
+                    validate: this.serviceOptions.validateStyle,
+                    transformStyle: function (previousStyle, nextStyle) {
+                        // 1. derive the base new style (without user layers)
+                        var targetStyle = _this.deriveNewStyle(previousStyle, nextStyle);
+                        // 2. derive layer groups for the new style
+                        var layerGroupLayers = targetStyle.layers
+                            .map(function (nextLayer) { return ({ nextLayer: nextLayer, layerGroup: LayerGroupComparator.getLayerGroup(nextLayer) }); })
+                            .filter(function (_a) {
+                            var nextLayer = _a.nextLayer, layerGroup = _a.layerGroup;
+                            return layerGroup !== undefined;
+                        })
+                            .reduce(function (layerGroupLayers, _a) {
+                            var _b;
+                            var nextLayer = _a.nextLayer, layerGroup = _a.layerGroup;
+                            return (__assign(__assign({}, layerGroupLayers), (_b = {}, _b[layerGroup] = layerGroup in layerGroupLayers ? __spread(layerGroupLayers[layerGroup], [nextLayer]) : [nextLayer], _b)));
+                        }, {});
+                        // 3. copy user layers and sources from previous style into new one
+                        var targetStyleWithUserLayers = _this.injectUserLayersIntoStyle(previousStyle, nextStyle, layerGroupLayers);
+                        // 4. side effects: sync our control's LayerManager and SourceManager
+                        var nextFundamentalLayers = Object.entries(layerGroupLayers).map(function (_a) {
+                            var _b = __read(_a, 2), layerGroupId = _b[0], layers = _b[1];
+                            return _this._buildFundamentalLayerFrom(layers, layerGroupId);
+                        });
+                        var layerIndex = _this.map.layers._getUserLayers().reduce(function (layerIndex, userLayer) {
+                            var layerInsertIndex = userLayer.before ? layerIndex.findIndex(function (layer) { return layer.getId() === userLayer.before; }) : -1;
+                            if (layerInsertIndex > -1) {
+                                layerIndex.splice(layerInsertIndex, 0, userLayer.layer);
+                            }
+                            else {
+                                layerIndex.push(userLayer.layer);
+                            }
+                            return layerIndex;
+                        }, nextFundamentalLayers);
+                        _this.map.layers['layerIndex'] = layerIndex;
+                        _this.map.sources._syncSources(targetStyleWithUserLayers.sources);
+                        // 5. temporarily patch style data event
+                        // FIXME: below diffing will be soon fixed on the maplibre side
+                        // If there was a previous styledata change event attached, remove it.
+                        // When the sprite url changes between style changes then maplibre can't perform the diff
+                        // In such cases it recalculate the style again. Removing previous attached 
+                        // event listener makes sure that style changed event is not fired twice in these cases.
+                        _this.map.events.remove("styledata", _this._onStyleData);
+                        _this.map.events.addOnce("styledata", _this._onStyleData);
+                        return targetStyleWithUserLayers;
+                    }
                 });
             }
             catch (e) {
@@ -26208,145 +26360,6 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
         StyleManager.prototype.clearStyleSet = function () {
             this.unsetIndoorState();
         };
-        /**
-         * Function invoked by mapbox after a style is fetched but before it is committed to the map state.
-         *
-         * @param previousStyle The current style.
-         * @param nextStyle The next style which is to be applied.
-         * @param preserveLayer Preserve a layer from the previous style in the next style.
-         * @param updatePaintProperty Modify paint properties of a layer in the next style before the style is applied.
-         * @param updateLayoutProperty Modify layout properties of a layer in the next style before the style is applied.
-         * @param updateFilter Modify filter property of a layer in the next style before the style is applied.
-         */
-        StyleManager.prototype._stylePatch = function (previousStyle, nextStyle, preserveLayer, updatePaintProperty, updateLayoutProperty, updateFilter) {
-            var _this = this;
-            // Layers in the next style with default properties that do not align with current StyleOptions
-            // should be modified before they are applied to the map.
-            var styleOptions = this.map.getStyle();
-            var trafficOptions = this.map.getTraffic();
-            // force a replacement of language placeholder in the tileset url to avoid resolution to a same cache with placeholders on language change
-            nextStyle.sources = Object.entries(nextStyle.sources).reduce(function (newSources, _a) {
-                var _b = __read(_a, 2), sourceKey = _b[0], source = _b[1];
-                var newSource = __assign({}, source);
-                if ('url' in newSource && typeof newSource.url === 'string') {
-                    if (newSource.url.includes(constants.languagePlaceHolder)) {
-                        newSource.url = newSource.url.replace(constants.languagePlaceHolder, styleOptions.language);
-                    }
-                }
-                newSources[sourceKey] = newSource;
-                return newSources;
-            }, {});
-            // A FundamentalMapLayer (grouped layer) representation of the next style must be built.
-            var previousLayers = this.map.layers.getLayers();
-            var nextLayers = [];
-            var layerGroupLayers = {};
-            nextStyle.layers.forEach(function (nextLayer) {
-                var _a, _b, _c, _d, _e;
-                var layerGroup = LayerGroupComparator.getLayerGroup(nextLayer);
-                if (layerGroup) {
-                    // Set visiblity of fill-extrusion layers according to StyleOptions.showBuildingModels
-                    if (!styleOptions.showBuildingModels && nextLayer.type === "fill-extrusion") {
-                        updateLayoutProperty(nextLayer.id, "visibility", "none");
-                        nextLayer.layout = (_a = nextLayer.layout) !== null && _a !== void 0 ? _a : {};
-                        nextLayer.layout.visibility = "none";
-                    }
-                    else if (nextLayer.type === "fill-extrusion") {
-                        updateLayoutProperty(nextLayer.id, "visibility", "visible");
-                        nextLayer.layout = (_b = nextLayer.layout) !== null && _b !== void 0 ? _b : {};
-                        nextLayer.layout.visibility = "visible";
-                    }
-                    // Set visibility of traffic layers depending on traffic settings.
-                    if (trafficOptions.flow !== "none" && layerGroup) {
-                        if (layerGroup === "traffic_" + trafficOptions.flow && nextLayer.type == "line") {
-                            updateLayoutProperty(nextLayer.id, "visibility", "visible");
-                            nextLayer.layout = (_c = nextLayer.layout) !== null && _c !== void 0 ? _c : {};
-                            nextLayer.layout.visibility = "visible";
-                        }
-                    }
-                    // Set visibility of labels
-                    var isLabelLayerGroup = layerGroup === 'labels' || layerGroup === 'labels_places' || layerGroup === 'labels_indoor';
-                    if (isLabelLayerGroup && nextLayer.type === 'symbol') {
-                        if (styleOptions.showLabels) {
-                            updateLayoutProperty(nextLayer.id, "visibility", "visible");
-                            nextLayer.layout = (_d = nextLayer.layout) !== null && _d !== void 0 ? _d : {};
-                            nextLayer.layout.visibility = "visible";
-                        }
-                        else {
-                            updateLayoutProperty(nextLayer.id, "visibility", "none");
-                            nextLayer.layout = (_e = nextLayer.layout) !== null && _e !== void 0 ? _e : {};
-                            nextLayer.layout.visibility = "none";
-                        }
-                    }
-                    // Once this _stylePatch returns control to maplibre the next style will be applied immediately in the same context.
-                    // To avoid potential data races update LayerManager with new a new set of FundamentalMapLayers from here instead of 
-                    // waiting for a styledata.load event to trigger a sync in a different context.
-                    if (layerGroupLayers[layerGroup]) {
-                        layerGroupLayers[layerGroup].push(nextLayer);
-                    }
-                    else {
-                        layerGroupLayers[layerGroup] = [nextLayer];
-                    }
-                }
-            });
-            Object.entries(layerGroupLayers).forEach(function (_a) {
-                var _b = __read(_a, 2), layerGroupId = _b[0], layerGroupMapboxLayers = _b[1];
-                nextLayers.push(_this._buildFundamentalLayerFrom(layerGroupMapboxLayers, layerGroupId));
-            });
-            // Update FundamentalMapLayers in LayerManager
-            var userLayers = this.map.layers._getUserLayers();
-            var firstUserLayer = userLayers[0];
-            var layersToRemove = previousLayers.filter(function (c) {
-                return (nextLayers.findIndex(function (n) { return c.getId() === n.getId(); }) < 0 &&
-                    userLayers.findIndex(function (n) { return c.getId() === n.layer.getId(); }) < 0);
-            });
-            var prevNextIntersection = nextLayers.filter(function (n) { return previousLayers.find(function (c) { return c.getId() === n.getId(); }); });
-            var ePrevNextIntersection = prevNextIntersection.entries();
-            var replace = ePrevNextIntersection.next();
-            nextLayers.forEach(function (newFundamentalLayer) {
-                if (replace.value && replace.value[1].getId() === newFundamentalLayer.getId()) {
-                    // Replace the existing layer with this ID with the new one.
-                    var insertBefore = previousLayers.findIndex(function (l) { return l.getId() === newFundamentalLayer.getId(); });
-                    _this.map.layers.remove(newFundamentalLayer.getId());
-                    _this.map.layers.add(newFundamentalLayer, previousLayers[insertBefore].getId());
-                    replace = ePrevNextIntersection.next();
-                }
-                else {
-                    if (replace.value) {
-                        // Insert new layer before the next common layer.
-                        _this.map.layers.add(newFundamentalLayer, replace.value[1]);
-                    }
-                    else {
-                        // Insert new layer underneath the first user layer, or the .
-                        _this.map.layers.add(newFundamentalLayer, firstUserLayer === null || firstUserLayer === void 0 ? void 0 : firstUserLayer.layer);
-                    }
-                }
-            });
-            layersToRemove.forEach(function (layer) {
-                _this.map.layers.remove(layer);
-            });
-            // Layers added to mapbox through this SDK since loading the last style should be
-            // carried over to the next style.
-            userLayers.forEach(function (userLayer) {
-                if (userLayer.layer instanceof WebGLLayer) {
-                    // mapbox custom layers cannot be serialized and preserved,
-                    // return to continue to the next user layer.
-                    return;
-                }
-                var before = undefined;
-                if (_this.map.layers.getLayerById(userLayer.before)) {
-                    var beforeCandidates = _this.map.layers.getLayerById(userLayer.before)._buildLayers();
-                    before = (beforeCandidates.length > 0) ? beforeCandidates[0] : undefined;
-                }
-                preserveLayer(userLayer.layer.getId(), before === null || before === void 0 ? void 0 : before.id);
-            });
-            this.map.sources._syncSources(nextStyle.sources);
-            // If there was a previous styledata change event attached, remove it.
-            // When the sprite url changes between style changes then mapbox can't perform the diff
-            // In such cases it recalculate the style again. Removing previous attached 
-            // event listener makes sure that style changed event is not fired twice in these cases.
-            this.map.events.remove("styledata", this._onStyleData);
-            this.map.events.addOnce("styledata", this._onStyleData);
-        };
         StyleManager.prototype._buildFundamentalLayerFrom = function (layers, id) {
             if (layers && layers.length > 0) {
                 var newLayer = new FundamentalMapLayer(layers, id);
@@ -26518,10 +26531,11 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
                         if (_this.serviceOptions.transformRequest) {
                             merge_1(requestParams, _this.serviceOptions.transformRequest(requestParams.url, resourceType));
                         }
+                        // TODO: fix type variation
                         return requestParams;
                     }
                 };
-                mapboxMap = new mapboxgl__default.Map(mapboxMapOptions);
+                mapboxMap = new maplibregl.Map(mapboxMapOptions);
             }
             try {
                 _this.map = mapboxMap;
@@ -26689,6 +26703,7 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
          */
         Map.prototype.removeRequestTransformer = function (transformer) { this.serviceOptions.removeTransformer(transformer); };
         Map.prototype.setCamera = function (options, fromControl) {
+            var _a;
             if (fromControl === void 0) { fromControl = false; }
             var mapboxCameraOptions;
             var maxBounds;
@@ -26697,13 +26712,22 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
                 var cameraBoundsOptions = new CameraBoundsOptions()
                     .merge({ maxZoom: this.getCamera().maxZoom }, options);
                 var bounds = this._generateSafeBounds(cameraBoundsOptions.bounds);
-                mapboxCameraOptions = this.map.cameraForBounds(bounds, {
+                var cameraForBoundsOptions = {
                     padding: cameraBoundsOptions.padding,
                     offset: cameraBoundsOptions.offset,
                     maxZoom: cameraBoundsOptions.maxZoom
-                });
+                };
+                mapboxCameraOptions = this.map.cameraForBounds(bounds, cameraForBoundsOptions);
                 if (!mapboxCameraOptions) {
-                    throw new Error("The map cannot be fit to the current canvas with the given CameraBoundsOptions.");
+                    var currentContainer = (_a = this.map) === null || _a === void 0 ? void 0 : _a.getContainer();
+                    var errorDetails = {
+                        message: "The map cannot be fit to the current canvas with the given CameraBoundsOptions.",
+                        containerWidth: currentContainer === null || currentContainer === void 0 ? void 0 : currentContainer.clientWidth,
+                        containerHeight: currentContainer === null || currentContainer === void 0 ? void 0 : currentContainer.clientHeight,
+                        safeBounds: bounds,
+                        cameraForBoundsOptions: cameraForBoundsOptions
+                    };
+                    throw new Error(JSON.stringify(errorDetails));
                 }
                 this.map.setMaxZoom(cameraBoundsOptions.maxZoom);
                 this._invokeEvent("maxzoomchanged", this.map.getMaxZoom());
@@ -28266,7 +28290,7 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
         domain: env.staticAssetsDomain,
         path: "sdk/javascript/mapcontrol/" + Version.getEndpointVersion() + "/mapbox-gl-rtl-text.min.js"
     });
-    mapboxgl.setRTLTextPlugin(rtlPluginUrl.toString(), function (error) {
+    maplibregl.setRTLTextPlugin(rtlPluginUrl.toString(), function (error) {
         if (error) {
             console.warn(error);
         }