azure-maps-control 2.1.17 → 2.2.0

package/dist/atlas-core.js

@@ -43209,7 +43209,7 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 		domain: "atlas.microsoft.com",
 		staticAssetsDomain: "atlas.microsoft.com",
 		stylePath: "styling",
-		styleDefinitionsVersion: "2021-02-01",
+		styleDefinitionsVersion: "2022-08-05",
 		appInsightsKey: "e96cb745-c6f5-409c-a775-c4313e468c1d",
 		aadInstance: "https://login.microsoftonline.com/"
 	};
@@ -43488,7 +43488,7 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	    return Url;
 	}());
 
-	var version = "2.1.17";
+	var version = "2.2.0";
 
 	/**
 	 * A helper class that provides methods for getting various forms of the map controls current version.
@@ -47499,7 +47499,7 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	                _this.setSelectedStyle(newStyle);
 	            }
 	        };
-	        _this.onStylesetChange = function (definitions) {
+	        _this.onMapConfigurationChange = function (definitions) {
 	            if (!_this.styleOpsGrid) {
 	                return;
 	            }
@@ -47507,8 +47507,8 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	            _this.styleButtons.clear();
 	            _this.populateOpsGridFromDefinitions(definitions);
 	        };
-	        _this.mapToFriendlyStyleName = function (name, styleset) {
-	            var style = styleset.styles.find(function (style) { return style.name === name; });
+	        _this.mapToFriendlyStyleName = function (name, mapConfiguration) {
+	            var style = mapConfiguration.configurations.find(function (style) { return style.name === name; });
 	            return (style === null || style === void 0 ? void 0 : style.displayName) || name;
 	        };
 	        _this.options = new StyleControlOptions().merge(cloneDeep_1(options));
@@ -47604,7 +47604,7 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	        this.styleOpsGrid = null;
 	        this.styleButtons.clear();
 	        this.map.events.remove("stylechanged", this.onStyleChange);
-	        this.map.events.remove("stylesetchanged", this.onStylesetChange);
+	        this.map.events.remove("mapconfigurationchanged", this.onMapConfigurationChange);
 	    };
 	    /**
 	     * Set the style that need to be displayed as currently selected.
@@ -47623,8 +47623,8 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	                var _b = __read(_a, 2), buttonStyleName = _b[0], button = _b[1];
 	                return button.setAttribute('aria-current', buttonStyleName === styleName ? 'true' : 'false');
 	            });
-	            this.map.styles.definitions().then(function (styleset) {
-	                var newAlt = _this.mapToFriendlyStyleName(styleName, styleset);
+	            this.map.styles.definitions().then(function (mapConfiguration) {
+	                var newAlt = _this.mapToFriendlyStyleName(styleName, mapConfiguration);
 	                if (image_1.alt !== newAlt) {
 	                    image_1.alt = newAlt;
 	                }
@@ -47654,10 +47654,10 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	            styleButton.removeAttribute("disabled");
 	        }
 	    };
-	    StyleControl.prototype.buildSelectStyleBtn = function (name, styleset, fetchIconPromise) {
+	    StyleControl.prototype.buildSelectStyleBtn = function (name, mapConfiguration, fetchIconPromise) {
 	        var _this = this;
 	        var styleOptionButton = document.createElement("button");
-	        var friendlyName = this.mapToFriendlyStyleName(name, styleset);
+	        var friendlyName = this.mapToFriendlyStyleName(name, mapConfiguration);
 	        styleOptionButton.setAttribute("aria-label", friendlyName);
 	        styleOptionButton.setAttribute("type", "button");
 	        var styleIconImage = new Image();
@@ -47742,12 +47742,12 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	        // If a style is one of those to be shown by the style picker also create it's element.
 	        this.map.styles.definitions().then(function (definitions) { return __awaiter(_this, void 0, void 0, function () {
 	            return __generator(this, function (_a) {
-	                this.onStylesetChange(definitions);
+	                this.onMapConfigurationChange(definitions);
 	                this.map.events.add("stylechanged", this.onStyleChange);
 	                return [2 /*return*/];
 	            });
 	        }); });
-	        this.map.events.add("stylesetchanged", this.onStylesetChange);
+	        this.map.events.add("mapconfigurationchanged", this.onMapConfigurationChange);
 	        return styleOpsGrid;
 	    };
 	    StyleControl.prototype.populateOpsGridFromDefinitions = function (definitions) {
@@ -47755,7 +47755,7 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	        if (!this.styleOpsGrid) {
 	            return;
 	        }
-	        var styles = definitions.styles;
+	        var styles = definitions.configurations;
 	        if (Array.isArray(this.options.mapStyles)) {
 	            styles = styles.filter(function (style) { return _this.options.mapStyles.includes(style.name.split("_indoor")[0]); });
 	        }
@@ -52222,6 +52222,151 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	    return MultiPolygon;
 	}());
 
+	//Based on: https://github.com/mapbox/mapbox-gl-js/blob/main/src/geo/mercator_coordinate.js
+	/**
+	 * A `MercatorPoint` object represents a projected three dimensional position.
+	 *
+	 * `MercatorPoint` uses the web mercator projection ([EPSG:3857](https://epsg.io/3857)) with slightly different units:
+	 * - the size of 1 unit is the width of the projected world instead of the "mercator meter"
+	 * - the origin of the coordinate space is at the north-west corner instead of the middle.
+	 *
+	 * For example, `MercatorPoint(0, 0, 0)` is the north-west corner of the mercator world and
+	 * `MercatorPoint(1, 1, 0)` is the south-east corner. If you are familiar with
+	 * [vector tiles](https://github.com/mapbox/vector-tile-spec) it may be helpful to think
+	 * of the coordinate space as the `0/0/0` tile with an extent of `1`.
+	 *
+	 * The `z` dimension of `MercatorPoint` is conformal. A cube in the mercator coordinate space would be rendered as a cube.
+	 */
+	var MercatorPoint = /** @class */ (function (_super) {
+	    __extends(MercatorPoint, _super);
+	    /**
+	     * Constructs a MercatorPoint.
+	     * @param x A points x position in mercator units.
+	     * @param y A points y position in mercator units.
+	     * @param z A points z position in mercator units.
+	     */
+	    function MercatorPoint(x, y, z) {
+	        return _super.call(this, x, y, z ? z : 0) || this;
+	    }
+	    /***********************************
+	     * Public static functions
+	     ***********************************/
+	    /**
+	     * Converts a position into a mercator point.
+	     * @param position Position to convert.
+	     * @returns A mercator point.
+	     */
+	    MercatorPoint.fromPosition = function (position) {
+	        if (position.length >= 2) {
+	            return new MercatorPoint((180 + position[0]) / 360, MercatorPoint._latToMercatorY(position[1]), position.length >= 3 ? MercatorPoint._altitudeToMercatorZ(position[2], position[1]) : 0);
+	        }
+	        return [0, 0, 0];
+	    };
+	    /**
+	     * Converts an array of positions into an array of mercator points.
+	     * @param positions Array of positions to convert.
+	     * @returns An array of  mercator points.
+	     */
+	    MercatorPoint.fromPositions = function (positions) {
+	        var mercators = [];
+	        for (var i = 0, len = positions.length; i < len; i++) {
+	            mercators.push(this.fromPosition(positions[i]));
+	        }
+	        return mercators;
+	    };
+	    /**
+	     * Converts an array of positions into a Float32Array of mercator xyz values.
+	     * @param positions Array of positions to convert.
+	     * @returns A Float32Array of mercator xyz values.
+	     */
+	    MercatorPoint.toFloat32Array = function (positions) {
+	        var arr = new Float32Array(positions.length * 3);
+	        for (var i = 0, len = positions.length; i < len; i++) {
+	            var idx = i * 3;
+	            var p = positions[i];
+	            //x
+	            arr[idx] = (180 + p[0]) / 360;
+	            //y
+	            arr[idx + 1] = MercatorPoint._latToMercatorY(p[1]);
+	            //z
+	            arr[idx + 2] = p.length >= 3 ? MercatorPoint._altitudeToMercatorZ(p[2], p[1]) : 0;
+	        }
+	        return arr;
+	    };
+	    /**
+	     * Converts a mercator point into a map position.
+	     * @param mercator Mercator point to convert.
+	     * @returns A map position.
+	     */
+	    MercatorPoint.toPosition = function (mercator) {
+	        if (mercator.length >= 2) {
+	            var lat = (360 / Math.PI) * Math.atan(Math.exp(((180 - mercator[1] * 360) * Math.PI) / 180)) - 90;
+	            return new Position(mercator[0] * 360 - 180, lat, mercator.length >= 3 ? MercatorPoint._mercatorZToAltitude(mercator[2], mercator[1]) : 0);
+	        }
+	        return [0, 0, 0];
+	    };
+	    /**
+	     * Converts an array of mercator points into an array of map positions.
+	     * @param mercators Mercator points to convert.
+	     * @returns An array of map positions.
+	     */
+	    MercatorPoint.toPositions = function (mercators) {
+	        var positions = [];
+	        for (var i = 0, len = mercators.length; i < len; i++) {
+	            positions.push(this.toPosition(mercators[i]));
+	        }
+	        return positions;
+	    };
+	    /**
+	     * Determine the Mercator scale factor for a given latitude, see
+	     * https://en.wikipedia.org/wiki/Mercator_projection#Scale_factor
+	     *
+	     * At the equator the scale factor will be 1, which increases at higher latitudes.
+	     *
+	     * @param latitude Latitude
+	     * @returns The mercator scale factor.
+	     */
+	    MercatorPoint.mercatorScale = function (latitude) {
+	        return 1 / Math.cos((latitude * Math.PI) / 180);
+	    };
+	    /**
+	     * Returns the distance of 1 meter in `MercatorPoint` units at this latitude.
+	     *
+	     * For coordinates in real world units using meters, this naturally provides the scale
+	     * to transform into `MercatorPoint`s.
+	     *
+	     * @returns {number} Distance of 1 meter in `MercatorPoint` units.
+	     */
+	    MercatorPoint.meterInMercatorUnits = function (latitude) {
+	        // 1 meter / circumference at equator in meters * Mercator projection scale factor at this latitude
+	        return ((1 / MercatorPoint.earthCircumference) *
+	            MercatorPoint.mercatorScale(MercatorPoint._latToMercatorY(latitude)));
+	    };
+	    /***********************************
+	     * Private static functions
+	     ***********************************/
+	    /*
+	     * The circumference at a line of latitude in meters.
+	     */
+	    MercatorPoint._circumferenceAtLatitude = function (latitude) {
+	        return MercatorPoint.earthCircumference * Math.cos((latitude * Math.PI) / 180);
+	    };
+	    MercatorPoint._altitudeToMercatorZ = function (altitude, latitude) {
+	        return altitude / MercatorPoint._circumferenceAtLatitude(latitude);
+	    };
+	    MercatorPoint._mercatorZToAltitude = function (zoom, y) {
+	        return zoom * MercatorPoint._circumferenceAtLatitude(MercatorPoint._latToMercatorY(y));
+	    };
+	    MercatorPoint._latToMercatorY = function (y) {
+	        return (180 - (180 / Math.PI) * Math.log(Math.tan(Math.PI / 4 + (y * Math.PI) / 360))) / 360;
+	    };
+	    /*
+	     * The average circumference of the world in meters.
+	     */
+	    MercatorPoint.earthCircumference = 2 * Math.PI * getEarthRadius(); // meters
+	    return MercatorPoint;
+	}(Array));
+
 
 
 	var index$1 = /*#__PURE__*/Object.freeze({
@@ -52233,6 +52378,7 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 		Polygon: Polygon,
 		Position: Position,
 		BoundingBox: BoundingBox,
+		MercatorPoint: MercatorPoint,
 		MultiLineString: MultiLineString,
 		MultiPoint: MultiPoint,
 		MultiPolygon: MultiPolygon,
@@ -52649,6 +52795,7 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	        return this.container;
 	    };
 	    ZoomControl.prototype.onRemove = function () {
+	        _super.prototype.onRemove.call(this);
 	        if (this.map) {
 	            this.map.events.remove('zoom', this.zoomChanged);
 	            this.map.events.remove('minzoomchanged', this.minZoomChanged);
@@ -55516,6 +55663,155 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	    return TileLayer;
 	}(SourceBuildingLayer));
 
+	/**
+	 * Options used to render graphics in a WebGLLayer.
+	 */
+	var WebGLLayerOptions = /** @class */ (function (_super) {
+	    __extends(WebGLLayerOptions, _super);
+	    function WebGLLayerOptions() {
+	        var _this = _super !== null && _super.apply(this, arguments) || this;
+	        /**
+	         * An object that contains the rendering logic.
+	         */
+	        _this.renderer = undefined;
+	        return _this;
+	    }
+	    return WebGLLayerOptions;
+	}(LayerOptions));
+
+	/**
+	 * Enables custom rendering logic with access to the WebGL context of the map.
+	 */
+	var WebGLLayer = /** @class */ (function (_super) {
+	    __extends(WebGLLayer, _super);
+	    /**
+	     * Constructs a new WebGLLayer.
+	     * @param id The id of the layer. If not specified a random one will be generated.
+	     * @param options The options of the WebGL layer.
+	     */
+	    function WebGLLayer(id, options) {
+	        var _this = _super.call(this, id) || this;
+	        /**
+	         * Make sure the layer is available after a style change.
+	         * @internal
+	         */
+	        _this._onStyleChange = function () {
+	            var _a;
+	            // Custom layers cannot be serialized and preserved by mapbox.
+	            // 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;
+	                map.layers.remove(_this);
+	                map.layers.add(_this, before_1);
+	            }
+	        };
+	        _this.options = new WebGLLayerOptions().merge(cloneDeepWith_1(options, WebGLLayerOptions._cloneCustomizer));
+	        _this.source = new DataSource();
+	        return _this;
+	    }
+	    /**
+	     * Gets the options of the WebGL layer.
+	     */
+	    WebGLLayer.prototype.getOptions = function () {
+	        // Copy the options so the user can't directly change options.
+	        // They must use setOptions(...).
+	        return cloneDeepWith_1(this.options, WebGLLayerOptions._cloneCustomizer);
+	    };
+	    /**
+	     * Sets the options of the WebGL layer.
+	     * @param options The new options of the WebGL layer.
+	     */
+	    WebGLLayer.prototype.setOptions = function (options) {
+	        var newOptions = new WebGLLayerOptions().merge(this.options, cloneDeepWith_1(options, WebGLLayerOptions._cloneCustomizer));
+	        // Trigger a repaint of the map if the layer options have changed.
+	        if (this.map) {
+	            this.map.triggerRepaint();
+	        }
+	        this.options = newOptions;
+	    };
+	    WebGLLayer.prototype.onAdd = function (map) {
+	        var _a, _b;
+	        _super.prototype.onAdd.call(this, map);
+	        // Make sure the layer is available after a style change.
+	        this.map.events.add("stylechanged", this._onStyleChange);
+	        // Notify the renderer this layer has been added to the map.
+	        if (this.options.renderer && this.glContext) {
+	            (_b = (_a = this.options.renderer).onAdd) === null || _b === void 0 ? void 0 : _b.call(_a, map, this.glContext);
+	        }
+	    };
+	    WebGLLayer.prototype.onRemove = function () {
+	        var _a, _b;
+	        // Notify the renderer this layer has been removed from the map.
+	        if (this.options.renderer && this.glContext) {
+	            (_b = (_a = this.options.renderer).onRemove) === null || _b === void 0 ? void 0 : _b.call(_a, this.map, this.glContext);
+	        }
+	        // Cleanup
+	        this.map.events.remove("stylechanged", this._onStyleChange);
+	        this.glContext = null;
+	        _super.prototype.onRemove.call(this);
+	    };
+	    /**
+	     * @internal
+	     */
+	    WebGLLayer.prototype._buildLayers = function () {
+	        var _this = this;
+	        if (!this.options.renderer) {
+	            throw new Error("Cannot build the WebGL layer because renderer was not set.");
+	        }
+	        return [
+	            {
+	                id: this.id,
+	                type: "custom",
+	                renderingMode: this.options.renderer.renderingMode,
+	                onAdd: function (m, gl) {
+	                    // Capture the GL context to reuse it later.
+	                    // renderer.onAdd will be called in the onAdd callback of this layer.
+	                    _this.glContext = gl;
+	                },
+	                onRemove: function (m, gl) {
+	                    // renderer.onRemove will be called in the onRemove callback of this layer.
+	                },
+	                prerender: function (gl, matrix) {
+	                    var _a, _b;
+	                    if (_this._shouldRender()) {
+	                        (_b = (_a = _this.options.renderer).prerender) === null || _b === void 0 ? void 0 : _b.call(_a, gl, matrix);
+	                    }
+	                },
+	                render: function (gl, matrix) {
+	                    if (_this._shouldRender()) {
+	                        _this.options.renderer.render(gl, matrix);
+	                    }
+	                }
+	            }
+	        ];
+	    };
+	    /**
+	     * @internal
+	     */
+	    WebGLLayer.prototype._getLayerIds = function () {
+	        return [this.id];
+	    };
+	    /**
+	     * @internal
+	     */
+	    WebGLLayer.prototype._getSourceIds = function () {
+	        return new Set().add(this.source.getId());
+	    };
+	    /**
+	     * Returns true if the next frame should be rendered
+	     * @internal
+	     */
+	    WebGLLayer.prototype._shouldRender = function () {
+	        if (this.map) {
+	            var zoom = this.map.getCamera().zoom;
+	            return this.options.visible && this.options.minZoom <= zoom && this.options.maxZoom > zoom;
+	        }
+	        return false;
+	    };
+	    return WebGLLayer;
+	}(Layer));
+
 
 
 	var index$5 = /*#__PURE__*/Object.freeze({
@@ -55528,7 +55824,8 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 		SymbolLayer: SymbolLayer,
 		TileLayer: TileLayer,
 		HeatMapLayer: HeatMapLayer,
-		ImageLayer: ImageLayer
+		ImageLayer: ImageLayer,
+		WebGLLayer: WebGLLayer
 	});
 
 	var Html = /** @class */ (function () {
@@ -66053,6 +66350,7 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 
 	// Disable unified signatures linter rule so we can generate separate docs for function overloads.
 	// tslint:disable:unified-signatures
+	var MAP_CLIENT_EVENTS = ['maxzoomchanged', 'minzoomchanged', 'mapconfigurationchanged'];
 	/**
 	 * A manager for the map control's events.
 	 * Exposed through the events property of the atlas.Map class.
@@ -66164,6 +66462,11 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	     * @private
 	     */
 	    EventManager.prototype._addGlobalListener = function (eventType, callback, legacy, once) {
+	        // add our custom events emitted by Map client to the map (note: they don't utilize modifiedCallback) 
+	        if (MAP_CLIENT_EVENTS.includes(eventType)) {
+	            this.map._addEventListener(eventType, callback, once);
+	            return;
+	        }
 	        var oldModifiedCallback = this.mapCallbackHandler.getModifiedCallback(eventType, "", callback);
 	        // Get a new modified callback.
 	        this.mapCallbackHandler.addCallback(eventType, "", callback, legacy, once);
@@ -66188,9 +66491,6 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	                setTimeout(function () { return modifiedCallback(readyData_1); });
 	            }
 	        }
-	        else if (["minzoomchanged", "maxzoomchanged", "stylesetchanged"].includes(eventType)) {
-	            this.map._addEventListener(eventType, callback, once);
-	        }
 	        else {
 	            // If a callback already exists disable it so the new one can replace it.
 	            if (oldModifiedCallback) {
@@ -66287,6 +66587,11 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	     */
 	    EventManager.prototype._removeListener = function (eventType, target, callback) {
 	        var e_5, _a;
+	        // remove our custom events emitted by Map client to the map (note: they don't utilize modifiedCallback)
+	        if (MAP_CLIENT_EVENTS.includes(eventType)) {
+	            this.map._removeEventListener(eventType, callback);
+	            return;
+	        }
 	        var layerId = target instanceof Layer ? target.getId() : target;
 	        var modifiedCallback = this.mapCallbackHandler.getModifiedCallback(eventType, layerId, callback);
 	        // If a callback already exists disable it so the new one can replace it.
@@ -67194,15 +67499,15 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	     */
 	    LayerManager.prototype._removeLayer = function (layer) {
 	        var layerId = layer instanceof Layer ? layer.getId() : layer;
-	        if (!this.layerIndex.find(function (l) { return l.getId() === layerId; })) {
+	        var layerIndex = this.layerIndex.findIndex(function (l) { return l.getId() === layerId; });
+	        if (layerIndex == -1) {
 	            throw new Error("The layer '" + layerId + "' has not been added to the map and cannot be removed.");
 	        }
-	        var layerIndex = this.layerIndex.findIndex(function (l) { return l.getId() === layerId; });
 	        var tempLayer = this.layerIndex[layerIndex];
 	        this._removeMapboxLayers(tempLayer);
 	        this.layerIndex.splice(layerIndex, 1);
-	        var userLayerIndex = this.userLayers.findIndex(function (ul) { return ul.layer.getId() === tempLayer.getId(); });
-	        if (userLayerIndex >= 0) {
+	        var userLayerIndex = this.userLayers.findIndex(function (ul) { return ul.layer.getId() === layerId; });
+	        if (userLayerIndex != -1) {
 	            this.userLayers.splice(userLayerIndex, 1);
 	        }
 	        tempLayer.onRemove();
@@ -68178,6 +68483,10 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	    __extends(StyleOptions, _super);
 	    function StyleOptions() {
 	        var _this = _super !== null && _super.apply(this, arguments) || this;
+	        /**
+	         * If true, the gl context will be created with MSAA antialiasing, which can be useful for antialiasing WebGL layers.
+	         */
+	        _this.antialias = undefined;
 	        /**
 	         * If true the map will automatically resize whenever the window's size changes.
 	         * Otherwise map.resize() must be called.
@@ -68374,10 +68683,11 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	         */
 	        _this.styleAPIVersion = getStyleAPIVersion();
 	        /**
-	         * The style set of the map. Determines which styles are available to be picked
-	         * and what do they consist of (style names, thumbnails, URLs, etc). If passed
-	         * as a string then the request will be made to resolve it. Use Style Set API
-	         * for modifications of the style set for all your apps in the field.
+	         * The map configuration defines the set of styles available to the map.
+	         */
+	        _this.mapConfiguration = undefined;
+	        /**
+	         * @deprecated use mapConfiguration instead
 	         */
 	        _this.styleSet = undefined;
 	        /**
@@ -68548,6 +68858,14 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	        if (merged.authOptions.authType !== exports.AuthenticationType.subscriptionKey) {
 	            merged["subscription-key"] = merged.subscriptionKey = undefined;
 	        }
+	        // if mapConfiguration is not set and legacy styleSet option is used, assign it to mapConfiguration
+	        if (merged.styleSet !== undefined && merged.mapConfiguration === undefined) {
+	            merged.mapConfiguration = merged.styleSet;
+	        }
+	        // reassign properties from legacy mapConfiguration to new structure if needed
+	        if (merged.mapConfiguration && typeof merged.mapConfiguration !== 'string') {
+	            merged.mapConfiguration = __assign(__assign({}, merged.mapConfiguration), { defaultConfiguration: merged.mapConfiguration.defaultConfiguration || merged.mapConfiguration['defaultStyle'], configurations: merged.mapConfiguration.configurations || merged.mapConfiguration['styles'] });
+	        }
 	        this._transformers = __spread(currentTransforms || [], transformersToMerge.filter(function (toMerge) { return !currentTransforms.includes(toMerge); }));
 	        if (this.transformRequest && !this._transformers.includes(this.transformRequest)) {
 	            this._transformers.push(this.transformRequest);
@@ -68752,9 +69070,9 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	         */
 	        this.indoorState = undefined;
 	        /**
-	         * Preserve the styleset that was used before the indoor styleset was set
+	         * Preserve the map configuration that was used before the indoor map configuration was set
 	         */
-	        this.preservedPreindoorStyleset = undefined;
+	        this.preservedPreindoorMapConfiguration = undefined;
 	        this._onStyleData = function () {
 	            _this._lookUpAsync(_this.map.getStyle()).then(function (style) {
 	                _this.map.events.invoke("stylechanged", {
@@ -68777,11 +69095,11 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	                return null;
 	            }
 	            else {
-	                return definitions.styles.find(function (style) { return style.name === (options.style || definitions.defaultStyle); })
+	                return definitions.configurations.find(function (style) { return style.name === (options.style || definitions.defaultConfiguration); })
 	                    // retrieve default style definition unless option.style's one was found
-	                    || definitions.styles.find(function (style) { return style.name === definitions.defaultStyle; })
-	                    // no default style in the styleSet -> pick the first style
-	                    || definitions.styles[0];
+	                    || definitions.configurations.find(function (style) { return style.name === definitions.defaultConfiguration; })
+	                    // no default style in the mapConfiguration -> pick the first style
+	                    || definitions.configurations[0];
 	            }
 	        };
 	        this._lookUpAsync = function (options) { return __awaiter(_this, void 0, void 0, function () {
@@ -68791,11 +69109,11 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	                    case 0: return [4 /*yield*/, this.definitions()];
 	                    case 1:
 	                        definitions = _a.sent();
-	                        result = definitions.styles.find(function (style) { return style.name === (options.style || definitions.defaultStyle); })
+	                        result = definitions.configurations.find(function (style) { return style.name === (options.style || definitions.defaultConfiguration); })
 	                            // retrieve default style definition unless option.style's one was found
-	                            || definitions.styles.find(function (style) { return style.name === definitions.defaultStyle; })
-	                            // no default style in the styleSet -> pick the first style
-	                            || definitions.styles[0];
+	                            || definitions.configurations.find(function (style) { return style.name === definitions.defaultConfiguration; })
+	                            // no default style in the mapConfiguration -> pick the first style
+	                            || definitions.configurations[0];
 	                        return [2 /*return*/, result];
 	                }
 	            });
@@ -68806,13 +69124,13 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	    StyleManager.prototype.updateIndoorState = function (theme, tilesetId) {
 	        var _this = this;
 	        var _a;
-	        var styleset = this.map.styles.getMapConfiguration();
-	        if (styleset) {
-	            this.preservedPreindoorStyleset = styleset;
+	        var mapConfiguration = this.map.styles.getMapConfiguration();
+	        if (mapConfiguration) {
+	            this.preservedPreindoorMapConfiguration = mapConfiguration;
 	            // tilesetId fallback
 	            // MAGIC: if we are on a default style set - match existing style to the one in the default indoor style set
 	            var desiredIndoorStyle = this.map.getStyle().style ? this.map.getStyle().style + "_indoor" + (theme === 'dark' ? '_dark' : '') + "_tileset_" + tilesetId : undefined;
-	            this.map.styles.setMapConfiguration("defaultIndoor_" + tilesetId, styleset === 'microsoft-maps:default' ? desiredIndoorStyle : undefined);
+	            this.map.styles.setMapConfiguration("defaultIndoor_" + tilesetId, mapConfiguration === 'microsoft-maps:default' ? desiredIndoorStyle : undefined);
 	        }
 	        else {
 	            var didTilesetIdChange_1 = ((_a = this.indoorState) === null || _a === void 0 ? void 0 : _a.tilesetId) !== tilesetId;
@@ -68822,12 +69140,12 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	            };
 	            this.initStyleset();
 	            this.definitions().then(function (definitions) {
-	                var currentStyle = (_this.map.getStyle().style || definitions.defaultStyle)
+	                var currentStyle = (_this.map.getStyle().style || definitions.defaultConfiguration)
 	                    .replace('_indoor_dark', '')
 	                    .replace('_indoor', '');
 	                // we cannot compose the precise style name for auto theme, search for prefix style name match
 	                var targetStylePrefix = currentStyle + "_indoor";
-	                var candidateStyle = definitions.styles.find(function (style) { return style.name.startsWith(targetStylePrefix); });
+	                var candidateStyle = definitions.configurations.find(function (style) { return style.name.startsWith(targetStylePrefix); });
 	                if (candidateStyle) {
 	                    // force style reload if tileset id has changed to make sure the tiles will be re-requested with new tileset applied in indoor source placeholder
 	                    _this.map.setStyle({ style: candidateStyle.name }, !didTilesetIdChange_1);
@@ -68837,10 +69155,10 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	    };
 	    StyleManager.prototype.unsetIndoorState = function () {
 	        var _this = this;
-	        var styleset = this.preservedPreindoorStyleset;
-	        if (styleset) {
+	        var mapConfiguration = this.preservedPreindoorMapConfiguration;
+	        if (mapConfiguration) {
 	            // we need to revert to the styleset that was ap
-	            this.map.styles.setMapConfiguration(styleset);
+	            this.map.styles.setMapConfiguration(mapConfiguration);
 	        }
 	        else {
 	            this.indoorState = undefined;
@@ -68867,11 +69185,11 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	            var baseName = _this.indoorState && styleName.includes('_indoor') ? styleName.split('_indoor')[0] : styleName;
 	            return baseName in styleNamesMap ? styleNamesMap[baseName] : baseName;
 	        };
-	        if (!this.serviceOptions.styleSet) {
+	        if (!this.serviceOptions.mapConfiguration) {
 	            newPromise = new HijackablePromise(this._request(this.serviceOptions.staticAssetsDomain, constants.stylePath + "/" + constants.styleResourcePath, "StyleDefinitions", { version: this.serviceOptions.styleDefinitionsVersion }).then(function (definitions) { return ({
 	                version: isNaN(definitions.version) ? 0 : parseFloat(definitions.version),
-	                defaultStyle: definitions.defaultStyle,
-	                styles: definitions.styles
+	                defaultConfiguration: definitions.defaultStyle,
+	                configurations: definitions.styles
 	                    .filter(function (style) {
 	                    if (!_this.indoorState) {
 	                        return !style.name.includes('indoor');
@@ -68902,11 +69220,13 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	                }); })
 	            }); }));
 	        }
-	        else if (typeof this.serviceOptions.styleSet === 'string') {
-	            newPromise = new HijackablePromise(this._request(this.serviceOptions.domain, constants.styleResourcePath + "/mapconfigurations/metadata/" + this.serviceOptions.styleSet, "StyleDefinitions"));
+	        else if (typeof this.serviceOptions.mapConfiguration === 'string') {
+	            newPromise = new HijackablePromise(this._request(this.serviceOptions.domain, constants.styleResourcePath + "/mapconfigurations/metadata/" + this.serviceOptions.mapConfiguration, "StyleDefinitions"
+	            // reassign properties from legacy mapConfiguration to new structure if needed
+	            ).then(function (definitions) { return (__assign(__assign({}, definitions), { defaultConfiguration: definitions.defaultConfiguration || definitions['defaultStyle'], configurations: definitions.configurations || definitions['styles'] })); }));
 	        }
 	        else {
-	            newPromise = HijackablePromise.resolve(this.serviceOptions.styleSet);
+	            newPromise = HijackablePromise.resolve(this.serviceOptions.mapConfiguration);
 	        }
 	        if (this.initPromise) {
 	            this.initPromise.switchWith(newPromise);
@@ -68916,7 +69236,7 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	            this.initPromise = newPromise;
 	        }
 	        // propagate styleset change
-	        this.initPromise.then(function (styleset) { return _this.map._invokeEvent("stylesetchanged", styleset); });
+	        this.initPromise.then(function (styleset) { return _this.map._invokeEvent("mapconfigurationchanged", styleset); });
 	        return this.initPromise;
 	    };
 	    /**
@@ -68975,30 +69295,30 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	    /**
 	     * Replaces the style set used. Very costly as it reloads all controls and resources.
 	     */
-	    StyleManager.prototype.setMapConfiguration = function (styleSet, styleName) {
+	    StyleManager.prototype.setMapConfiguration = function (mapConfiguration, styleName) {
 	        var _this = this;
-	        this.serviceOptions.styleSet = styleSet;
-	        if (typeof styleSet === 'string') {
+	        this.serviceOptions.mapConfiguration = mapConfiguration;
+	        if (typeof mapConfiguration === 'string') {
 	            this.initStyleset();
 	        }
 	        else {
 	            if (this.initPromise) {
-	                this.initPromise.hijackAndResolve(styleSet);
+	                this.initPromise.hijackAndResolve(mapConfiguration);
 	            }
 	            else {
-	                this.initPromise = HijackablePromise.resolve(styleSet);
+	                this.initPromise = HijackablePromise.resolve(mapConfiguration);
 	            }
 	        }
 	        this.definitions().then(function (definitions) {
-	            var targetStyleName = definitions.defaultStyle;
-	            if (definitions.styles.find(function (s) { return s.name === styleName; })) {
+	            var targetStyleName = definitions.defaultConfiguration;
+	            if (definitions.configurations.find(function (s) { return s.name === styleName; })) {
 	                targetStyleName = styleName;
 	            }
 	            _this.map.setStyle({ style: targetStyleName });
 	        });
 	    };
 	    StyleManager.prototype.getMapConfiguration = function () {
-	        return this.serviceOptions.styleSet;
+	        return this.serviceOptions.mapConfiguration;
 	    };
 	    // backward-compatibility: this method preserves the interface that azure-maps-indoor@2.0.6 assumes
 	    StyleManager.prototype.setStyleSet = function (styleSet) {
@@ -69046,66 +69366,59 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	        // A FundamentalMapLayer (grouped layer) representation of the next style must be built.
 	        var previousLayers = this.map.layers.getLayers();
 	        var nextLayers = [];
-	        var currentLayerGroupId = "";
-	        var currentLayerGroupLayers = [];
-	        var advanceLayerGroup = function (nextLayerGroup) {
-	            nextLayers.push(_this._buildFundamentalLayerFrom(currentLayerGroupLayers, currentLayerGroupId));
-	            currentLayerGroupId = nextLayerGroup;
-	            currentLayerGroupLayers = [];
-	        };
+	        var layerGroupLayers = {};
 	        nextStyle.layers.forEach(function (nextLayer) {
 	            var _a, _b, _c, _d, _e;
 	            var layerGroup = LayerGroupComparator.getLayerGroup(nextLayer);
-	            currentLayerGroupId = currentLayerGroupId ? currentLayerGroupId : 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";
+	            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";
 	                }
-	            }
-	            // Set visibility of labels
-	            var isLabelLayerGroup = layerGroup === 'labels' || layerGroup === 'labels_places' || layerGroup === 'labels_indoor';
-	            if (isLabelLayerGroup && nextLayer.type === 'symbol') {
-	                if (styleOptions.showLabels) {
+	                else if (nextLayer.type === "fill-extrusion") {
 	                    updateLayoutProperty(nextLayer.id, "visibility", "visible");
-	                    nextLayer.layout = (_d = nextLayer.layout) !== null && _d !== void 0 ? _d : {};
+	                    nextLayer.layout = (_b = nextLayer.layout) !== null && _b !== void 0 ? _b : {};
 	                    nextLayer.layout.visibility = "visible";
 	                }
-	                else {
-	                    updateLayoutProperty(nextLayer.id, "visibility", "none");
-	                    nextLayer.layout = (_e = nextLayer.layout) !== null && _e !== void 0 ? _e : {};
-	                    nextLayer.layout.visibility = "none";
+	                // 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";
+	                    }
 	                }
-	            }
-	            // 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 (layerGroup) {
-	                if (currentLayerGroupLayers.length > 0 && layerGroup != currentLayerGroupId) {
-	                    advanceLayerGroup(layerGroup);
+	                // 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];
 	                }
-	                currentLayerGroupLayers.push(nextLayer);
-	            }
-	            else if (currentLayerGroupLayers.length > 0) {
-	                advanceLayerGroup(layerGroup);
 	            }
 	        });
-	        if (currentLayerGroupLayers.length > 0) {
-	            advanceLayerGroup("");
-	        }
+	        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];
@@ -69141,6 +69454,11 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	        // 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();
@@ -69299,6 +69617,7 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	        }
 	        else {
 	            var mapboxMapOptions = {
+	                antialias: _this.styleOptions.antialias,
 	                attributionControl: false,
 	                container: container,
 	                fadeDuration: _this.serviceOptions.fadeDuration,
@@ -70289,6 +70608,16 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	    Map.prototype.stop = function () {
 	        this.map.stop();
 	    };
+	    /**
+	     * Trigger the rendering of a single frame.
+	     * Use this method with WebGL layers to repaint the map when the layer's
+	     * properties or properties associated with the layer's source change.
+	     * Calling this multiple times before the next frame is rendered will still
+	     * result in only a single frame being rendered.
+	     */
+	    Map.prototype.triggerRepaint = function () {
+	        this.map.triggerRepaint();
+	    };
 	    /**
 	     * @internal
 	     */
@@ -70420,9 +70749,9 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	            return;
 	        }
 	        // Check if the default style is set by the client and if it exists in the current style set
-	        this.styles.definitions().then(function (styleSet) {
-	            if (!_this.styleOptions.style || !styleSet.styles.map(function (styleSetStyle) { return styleSetStyle.name; }).includes(_this.styleOptions.style)) {
-	                _this.styleOptions.style = styleSet.defaultStyle;
+	        this.styles.definitions().then(function (mapConfiguration) {
+	            if (!_this.styleOptions.style || !mapConfiguration.configurations.map(function (mapConfigurationStyle) { return mapConfigurationStyle.name; }).includes(_this.styleOptions.style)) {
+	                _this.styleOptions.style = mapConfiguration.defaultConfiguration;
 	            }
 	            _this.styleOptions = styleOptions;
 	            _this._rebuildStyle(diff);