azure-maps-control 2.1.11 → 2.1.12

package/dist/atlas-core.js

@@ -43487,7 +43487,7 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	    return Url;
 	}());
 
-	var version = "2.1.11";
+	var version = "2.1.12";
 
 	/**
 	 * A helper class that provides methods for getting various forms of the map controls current version.
@@ -43549,24 +43549,6 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	    else if (typeof themeQuery.addListener === 'function') {
 	        themeQuery.addListener(function (e) { return onThemeChange(e); });
 	    }
-	    if (navigator.userAgent.indexOf('Edg') != -1) {
-	        tooltipContent.classList.add('edge');
-	    }
-	    else if (navigator.userAgent.indexOf('Chrome') != -1) {
-	        tooltipContent.classList.add('chrome');
-	    }
-	    else if (navigator.userAgent.indexOf('Safari') != -1) {
-	        tooltipContent.classList.add('safari');
-	    }
-	    else if (navigator.userAgent.indexOf('Firefox') != -1) {
-	        tooltipContent.classList.add('firefox');
-	    }
-	    if (navigator.userAgent.indexOf('Windows') != -1) {
-	        tooltipContent.classList.add('win');
-	    }
-	    else if (navigator.userAgent.indexOf('Macintosh') != -1) {
-	        tooltipContent.classList.add('mac');
-	    }
 	    return tooltipContent;
 	};
 	/**
@@ -43814,9 +43796,8 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	                    delete _this._observer;
 	                }
 	                // If the style is anything but blank the style definition should decide the theme.
-	                _this._map.styles.getThemeAsync(_this._map.getStyle()).then(function (theme) {
-	                    _this._setTheme(theme);
-	                });
+	                var theme = _this._map.styles.getTheme(_this._map.getStyle());
+	                _this._setTheme(theme);
 	            }
 	        };
 	        /**
@@ -43867,8 +43848,9 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	        }
 	        // Set the style or add the auto listener.
 	        if (style.toLowerCase() === exports.ControlStyle.auto) {
-	            this._map.styles.definitions().then(function (definitions) {
+	            this._map.styles.initialize().then(function () {
 	                if (_this._map) {
+	                    _this._onStyleChange();
 	                    _this._map.events.add("styledata", _this._onStyleChange);
 	                }
 	            });
@@ -43914,11 +43896,6 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	         * @default ControlStyle.light
 	         */
 	        _this.style = exports.ControlStyle.light;
-	        /**
-	         * Inverts the direction of map rotation controls.
-	         * @default false
-	         */
-	        _this.inverted = false;
 	        return _this;
 	    }
 	    return CompassControlOptions;
@@ -44057,7 +44034,7 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	        rotationRightButton.setAttribute("type", "button");
 	        rotationRightButton.addEventListener("click", function () {
 	            map.setCamera({
-	                bearing: map.getCamera().bearing - (_this.options.inverted ? -1 : 1) * _this.options.rotationDegreesDelta,
+	                bearing: map.getCamera().bearing - _this.options.rotationDegreesDelta,
 	                duration: CompassControl.RotationDuration,
 	                type: "ease",
 	            }, true);
@@ -44074,7 +44051,7 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	        rotationLeftButton.setAttribute("type", "button");
 	        rotationLeftButton.addEventListener("click", function () {
 	            map.setCamera({
-	                bearing: map.getCamera().bearing + (_this.options.inverted ? -1 : 1) * _this.options.rotationDegreesDelta,
+	                bearing: map.getCamera().bearing + _this.options.rotationDegreesDelta,
 	                duration: CompassControl.RotationDuration,
 	                type: "ease"
 	            }, true);
@@ -44106,11 +44083,6 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	         * @default ControlStyle.light
 	         */
 	        _this.style = exports.ControlStyle.light;
-	        /**
-	         * Inverts the direction of map pitch controls.
-	         * @default false
-	         */
-	        _this.inverted = false;
 	        return _this;
 	    }
 	    return PitchControlOptions;
@@ -44137,21 +44109,11 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	        _this.updatePitchButtonsState = function () {
 	            var minPitchReached = _this.map.getCamera().pitch <= 0;
 	            var maxPitchReached = _this.map.getCamera().pitch >= 60;
-	            if (_this.options.inverted) {
-	                if (_this.pitchIncrementButton && _this.pitchIncrementButton.disabled != minPitchReached) {
-	                    _this.pitchIncrementButton.disabled = minPitchReached;
-	                }
-	                if (_this.pitchDecrementButton && _this.pitchDecrementButton.disabled != maxPitchReached) {
-	                    _this.pitchDecrementButton.disabled = maxPitchReached;
-	                }
+	            if (_this.pitchIncrementButton && _this.pitchIncrementButton.disabled != maxPitchReached) {
+	                _this.pitchIncrementButton.disabled = maxPitchReached;
 	            }
-	            else {
-	                if (_this.pitchIncrementButton && _this.pitchIncrementButton.disabled != maxPitchReached) {
-	                    _this.pitchIncrementButton.disabled = maxPitchReached;
-	                }
-	                if (_this.pitchDecrementButton && _this.pitchDecrementButton.disabled != minPitchReached) {
-	                    _this.pitchDecrementButton.disabled = minPitchReached;
-	                }
+	            if (_this.pitchDecrementButton && _this.pitchDecrementButton.disabled != minPitchReached) {
+	                _this.pitchDecrementButton.disabled = minPitchReached;
 	            }
 	        };
 	        _this.options = new PitchControlOptions().merge(options);
@@ -44216,7 +44178,6 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	        this.map = map;
 	        this.container = container;
 	        map.events.add('pitch', this.pitchChanged);
-	        this.updatePitchButtonsState();
 	        return container;
 	    };
 	    PitchControl.prototype.onRemove = function () {
@@ -44285,7 +44246,7 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	        pitchDecrementButton.setAttribute("type", "button");
 	        pitchDecrementButton.addEventListener("click", function () {
 	            map.setCamera({
-	                pitch: map.getCamera().pitch - (_this.options.inverted ? -1 : 1) * _this.options.pitchDegreesDelta,
+	                pitch: map.getCamera().pitch - _this.options.pitchDegreesDelta,
 	                duration: PitchControl.PITCH_DURATION_MS,
 	                type: "ease"
 	            }, true);
@@ -44302,7 +44263,7 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	        pitchIncrementButton.setAttribute("type", "button");
 	        pitchIncrementButton.addEventListener("click", function () {
 	            map.setCamera({
-	                pitch: map.getCamera().pitch + (_this.options.inverted ? -1 : 1) * _this.options.pitchDegreesDelta,
+	                pitch: map.getCamera().pitch + _this.options.pitchDegreesDelta,
 	                duration: PitchControl.PITCH_DURATION_MS,
 	                type: "ease"
 	            }, true);
@@ -46798,699 +46759,80 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	var cloneDeep_1 = cloneDeep;
 
 	/**
-	 * This function is like `assignValue` except that it doesn't assign
-	 * `undefined` values.
-	 *
-	 * @private
-	 * @param {Object} object The object to modify.
-	 * @param {string} key The key of the property to assign.
-	 * @param {*} value The value to assign.
-	 */
-	function assignMergeValue(object, key, value) {
-	  if ((value !== undefined && !eq_1(object[key], value)) ||
-	      (value === undefined && !(key in object))) {
-	    _baseAssignValue(object, key, value);
-	  }
-	}
-
-	var _assignMergeValue = assignMergeValue;
-
-	/**
-	 * Creates a base function for methods like `_.forIn` and `_.forOwn`.
-	 *
-	 * @private
-	 * @param {boolean} [fromRight] Specify iterating from right to left.
-	 * @returns {Function} Returns the new base function.
+	 * The options for a StyleControl object.
 	 */
-	function createBaseFor(fromRight) {
-	  return function(object, iteratee, keysFunc) {
-	    var index = -1,
-	        iterable = Object(object),
-	        props = keysFunc(object),
-	        length = props.length;
-
-	    while (length--) {
-	      var key = props[fromRight ? length : ++index];
-	      if (iteratee(iterable[key], key, iterable) === false) {
-	        break;
-	      }
+	var StyleControlOptions = /** @class */ (function (_super) {
+	    __extends(StyleControlOptions, _super);
+	    function StyleControlOptions() {
+	        var _this = _super !== null && _super.apply(this, arguments) || this;
+	        /**
+	         * The layout to display the styles in.
+	         * <p>`"icons"`: A row of clickable icons for each style.</p>
+	         * <p>`"list"`: A scrollable list with the icons and names for each style.</p>
+	         * Default `"icons"`
+	         * @default "icons"
+	         */
+	        _this.layout = "icons";
+	        /**
+	         * The map styles to show in the control.
+	         * Style names are case sensitive.
+	         * If an included style isn't supported by the map it will be ignored.
+	         * Available styles can be found in the
+	         * [supported styles]{@link https://docs.microsoft.com/en-us/azure/azure-maps/supported-map-styles} article.
+	         * If "all" is specified, all map styles will be shown.
+	         * Default `["road", "grayscale_light", "grayscale_dark", "night", "road_shaded_relief"]`
+	         * @default ["road", "grayscale_light", "grayscale_dark", "night", "road_shaded_relief"]
+	         */
+	        _this.mapStyles = [
+	            "road",
+	            "grayscale_light",
+	            "grayscale_dark",
+	            "night",
+	            "road_shaded_relief",
+	        ];
+	        /**
+	         * The style of the control.
+	         * Default `ControlStyle.light`.
+	         * @default ControlStyle.light
+	         */
+	        _this.style = exports.ControlStyle.light;
+	        /**
+	         * Whether to let style control automatically set the style, once user select a map style.
+	         * If set to `false`, then clicking on style will not set the set the style automatically.
+	         * Default `true`
+	         */
+	        _this.autoSelectionMode = true;
+	        return _this;
 	    }
-	    return object;
-	  };
-	}
-
-	var _createBaseFor = createBaseFor;
-
-	/**
-	 * The base implementation of `baseForOwn` which iterates over `object`
-	 * properties returned by `keysFunc` and invokes `iteratee` for each property.
-	 * Iteratee functions may exit iteration early by explicitly returning `false`.
-	 *
-	 * @private
-	 * @param {Object} object The object to iterate over.
-	 * @param {Function} iteratee The function invoked per iteration.
-	 * @param {Function} keysFunc The function to get the keys of `object`.
-	 * @returns {Object} Returns `object`.
-	 */
-	var baseFor = _createBaseFor();
-
-	var _baseFor = baseFor;
-
-	/**
-	 * This method is like `_.isArrayLike` except that it also checks if `value`
-	 * is an object.
-	 *
-	 * @static
-	 * @memberOf _
-	 * @since 4.0.0
-	 * @category Lang
-	 * @param {*} value The value to check.
-	 * @returns {boolean} Returns `true` if `value` is an array-like object,
-	 *  else `false`.
-	 * @example
-	 *
-	 * _.isArrayLikeObject([1, 2, 3]);
-	 * // => true
-	 *
-	 * _.isArrayLikeObject(document.body.children);
-	 * // => true
-	 *
-	 * _.isArrayLikeObject('abc');
-	 * // => false
-	 *
-	 * _.isArrayLikeObject(_.noop);
-	 * // => false
-	 */
-	function isArrayLikeObject(value) {
-	  return isObjectLike_1(value) && isArrayLike_1(value);
-	}
-
-	var isArrayLikeObject_1 = isArrayLikeObject;
-
-	/** `Object#toString` result references. */
-	var objectTag$3 = '[object Object]';
-
-	/** Used for built-in method references. */
-	var funcProto$2 = Function.prototype,
-	    objectProto$d = Object.prototype;
-
-	/** Used to resolve the decompiled source of functions. */
-	var funcToString$2 = funcProto$2.toString;
-
-	/** Used to check objects for own properties. */
-	var hasOwnProperty$a = objectProto$d.hasOwnProperty;
-
-	/** Used to infer the `Object` constructor. */
-	var objectCtorString = funcToString$2.call(Object);
-
-	/**
-	 * Checks if `value` is a plain object, that is, an object created by the
-	 * `Object` constructor or one with a `[[Prototype]]` of `null`.
-	 *
-	 * @static
-	 * @memberOf _
-	 * @since 0.8.0
-	 * @category Lang
-	 * @param {*} value The value to check.
-	 * @returns {boolean} Returns `true` if `value` is a plain object, else `false`.
-	 * @example
-	 *
-	 * function Foo() {
-	 *   this.a = 1;
-	 * }
-	 *
-	 * _.isPlainObject(new Foo);
-	 * // => false
-	 *
-	 * _.isPlainObject([1, 2, 3]);
-	 * // => false
-	 *
-	 * _.isPlainObject({ 'x': 0, 'y': 0 });
-	 * // => true
-	 *
-	 * _.isPlainObject(Object.create(null));
-	 * // => true
-	 */
-	function isPlainObject(value) {
-	  if (!isObjectLike_1(value) || _baseGetTag(value) != objectTag$3) {
-	    return false;
-	  }
-	  var proto = _getPrototype(value);
-	  if (proto === null) {
-	    return true;
-	  }
-	  var Ctor = hasOwnProperty$a.call(proto, 'constructor') && proto.constructor;
-	  return typeof Ctor == 'function' && Ctor instanceof Ctor &&
-	    funcToString$2.call(Ctor) == objectCtorString;
-	}
-
-	var isPlainObject_1 = isPlainObject;
-
-	/**
-	 * Gets the value at `key`, unless `key` is "__proto__" or "constructor".
-	 *
-	 * @private
-	 * @param {Object} object The object to query.
-	 * @param {string} key The key of the property to get.
-	 * @returns {*} Returns the property value.
-	 */
-	function safeGet(object, key) {
-	  if (key === 'constructor' && typeof object[key] === 'function') {
-	    return;
-	  }
-
-	  if (key == '__proto__') {
-	    return;
-	  }
-
-	  return object[key];
-	}
-
-	var _safeGet = safeGet;
+	    return StyleControlOptions;
+	}(Options));
 
 	/**
-	 * Converts `value` to a plain object flattening inherited enumerable string
-	 * keyed properties of `value` to own properties of the plain object.
-	 *
-	 * @static
-	 * @memberOf _
-	 * @since 3.0.0
-	 * @category Lang
-	 * @param {*} value The value to convert.
-	 * @returns {Object} Returns the converted plain object.
-	 * @example
-	 *
-	 * function Foo() {
-	 *   this.b = 2;
-	 * }
-	 *
-	 * Foo.prototype.c = 3;
-	 *
-	 * _.assign({ 'a': 1 }, new Foo);
-	 * // => { 'a': 1, 'b': 2 }
-	 *
-	 * _.assign({ 'a': 1 }, _.toPlainObject(new Foo));
-	 * // => { 'a': 1, 'b': 2, 'c': 3 }
+	 * A control for changing the style of the map.
 	 */
-	function toPlainObject(value) {
-	  return _copyObject(value, keysIn_1(value));
-	}
-
-	var toPlainObject_1 = toPlainObject;
-
-	/**
-	 * A specialized version of `baseMerge` for arrays and objects which performs
-	 * deep merges and tracks traversed objects enabling objects with circular
-	 * references to be merged.
-	 *
-	 * @private
-	 * @param {Object} object The destination object.
-	 * @param {Object} source The source object.
-	 * @param {string} key The key of the value to merge.
-	 * @param {number} srcIndex The index of `source`.
-	 * @param {Function} mergeFunc The function to merge values.
-	 * @param {Function} [customizer] The function to customize assigned values.
-	 * @param {Object} [stack] Tracks traversed source values and their merged
-	 *  counterparts.
-	 */
-	function baseMergeDeep(object, source, key, srcIndex, mergeFunc, customizer, stack) {
-	  var objValue = _safeGet(object, key),
-	      srcValue = _safeGet(source, key),
-	      stacked = stack.get(srcValue);
-
-	  if (stacked) {
-	    _assignMergeValue(object, key, stacked);
-	    return;
-	  }
-	  var newValue = customizer
-	    ? customizer(objValue, srcValue, (key + ''), object, source, stack)
-	    : undefined;
-
-	  var isCommon = newValue === undefined;
-
-	  if (isCommon) {
-	    var isArr = isArray_1(srcValue),
-	        isBuff = !isArr && isBuffer_1(srcValue),
-	        isTyped = !isArr && !isBuff && isTypedArray_1(srcValue);
-
-	    newValue = srcValue;
-	    if (isArr || isBuff || isTyped) {
-	      if (isArray_1(objValue)) {
-	        newValue = objValue;
-	      }
-	      else if (isArrayLikeObject_1(objValue)) {
-	        newValue = _copyArray(objValue);
-	      }
-	      else if (isBuff) {
-	        isCommon = false;
-	        newValue = _cloneBuffer(srcValue, true);
-	      }
-	      else if (isTyped) {
-	        isCommon = false;
-	        newValue = _cloneTypedArray(srcValue, true);
-	      }
-	      else {
-	        newValue = [];
-	      }
-	    }
-	    else if (isPlainObject_1(srcValue) || isArguments_1(srcValue)) {
-	      newValue = objValue;
-	      if (isArguments_1(objValue)) {
-	        newValue = toPlainObject_1(objValue);
-	      }
-	      else if (!isObject_1(objValue) || isFunction_1(objValue)) {
-	        newValue = _initCloneObject(srcValue);
-	      }
-	    }
-	    else {
-	      isCommon = false;
-	    }
-	  }
-	  if (isCommon) {
-	    // Recursively merge objects and arrays (susceptible to call stack limits).
-	    stack.set(srcValue, newValue);
-	    mergeFunc(newValue, srcValue, srcIndex, customizer, stack);
-	    stack['delete'](srcValue);
-	  }
-	  _assignMergeValue(object, key, newValue);
-	}
-
-	var _baseMergeDeep = baseMergeDeep;
-
-	/**
-	 * The base implementation of `_.merge` without support for multiple sources.
-	 *
-	 * @private
-	 * @param {Object} object The destination object.
-	 * @param {Object} source The source object.
-	 * @param {number} srcIndex The index of `source`.
-	 * @param {Function} [customizer] The function to customize merged values.
-	 * @param {Object} [stack] Tracks traversed source values and their merged
-	 *  counterparts.
-	 */
-	function baseMerge(object, source, srcIndex, customizer, stack) {
-	  if (object === source) {
-	    return;
-	  }
-	  _baseFor(source, function(srcValue, key) {
-	    stack || (stack = new _Stack);
-	    if (isObject_1(srcValue)) {
-	      _baseMergeDeep(object, source, key, srcIndex, baseMerge, customizer, stack);
-	    }
-	    else {
-	      var newValue = customizer
-	        ? customizer(_safeGet(object, key), srcValue, (key + ''), object, source, stack)
-	        : undefined;
-
-	      if (newValue === undefined) {
-	        newValue = srcValue;
-	      }
-	      _assignMergeValue(object, key, newValue);
-	    }
-	  }, keysIn_1);
-	}
-
-	var _baseMerge = baseMerge;
-
-	/**
-	 * This method returns the first argument it receives.
-	 *
-	 * @static
-	 * @since 0.1.0
-	 * @memberOf _
-	 * @category Util
-	 * @param {*} value Any value.
-	 * @returns {*} Returns `value`.
-	 * @example
-	 *
-	 * var object = { 'a': 1 };
-	 *
-	 * console.log(_.identity(object) === object);
-	 * // => true
-	 */
-	function identity(value) {
-	  return value;
-	}
-
-	var identity_1 = identity;
-
-	/**
-	 * A faster alternative to `Function#apply`, this function invokes `func`
-	 * with the `this` binding of `thisArg` and the arguments of `args`.
-	 *
-	 * @private
-	 * @param {Function} func The function to invoke.
-	 * @param {*} thisArg The `this` binding of `func`.
-	 * @param {Array} args The arguments to invoke `func` with.
-	 * @returns {*} Returns the result of `func`.
-	 */
-	function apply(func, thisArg, args) {
-	  switch (args.length) {
-	    case 0: return func.call(thisArg);
-	    case 1: return func.call(thisArg, args[0]);
-	    case 2: return func.call(thisArg, args[0], args[1]);
-	    case 3: return func.call(thisArg, args[0], args[1], args[2]);
-	  }
-	  return func.apply(thisArg, args);
-	}
-
-	var _apply = apply;
-
-	/* Built-in method references for those with the same name as other `lodash` methods. */
-	var nativeMax = Math.max;
-
-	/**
-	 * A specialized version of `baseRest` which transforms the rest array.
-	 *
-	 * @private
-	 * @param {Function} func The function to apply a rest parameter to.
-	 * @param {number} [start=func.length-1] The start position of the rest parameter.
-	 * @param {Function} transform The rest array transform.
-	 * @returns {Function} Returns the new function.
-	 */
-	function overRest(func, start, transform) {
-	  start = nativeMax(start === undefined ? (func.length - 1) : start, 0);
-	  return function() {
-	    var args = arguments,
-	        index = -1,
-	        length = nativeMax(args.length - start, 0),
-	        array = Array(length);
-
-	    while (++index < length) {
-	      array[index] = args[start + index];
-	    }
-	    index = -1;
-	    var otherArgs = Array(start + 1);
-	    while (++index < start) {
-	      otherArgs[index] = args[index];
-	    }
-	    otherArgs[start] = transform(array);
-	    return _apply(func, this, otherArgs);
-	  };
-	}
-
-	var _overRest = overRest;
-
-	/**
-	 * Creates a function that returns `value`.
-	 *
-	 * @static
-	 * @memberOf _
-	 * @since 2.4.0
-	 * @category Util
-	 * @param {*} value The value to return from the new function.
-	 * @returns {Function} Returns the new constant function.
-	 * @example
-	 *
-	 * var objects = _.times(2, _.constant({ 'a': 1 }));
-	 *
-	 * console.log(objects);
-	 * // => [{ 'a': 1 }, { 'a': 1 }]
-	 *
-	 * console.log(objects[0] === objects[1]);
-	 * // => true
-	 */
-	function constant(value) {
-	  return function() {
-	    return value;
-	  };
-	}
-
-	var constant_1 = constant;
-
-	/**
-	 * The base implementation of `setToString` without support for hot loop shorting.
-	 *
-	 * @private
-	 * @param {Function} func The function to modify.
-	 * @param {Function} string The `toString` result.
-	 * @returns {Function} Returns `func`.
-	 */
-	var baseSetToString = !_defineProperty ? identity_1 : function(func, string) {
-	  return _defineProperty(func, 'toString', {
-	    'configurable': true,
-	    'enumerable': false,
-	    'value': constant_1(string),
-	    'writable': true
-	  });
-	};
-
-	var _baseSetToString = baseSetToString;
-
-	/** Used to detect hot functions by number of calls within a span of milliseconds. */
-	var HOT_COUNT = 800,
-	    HOT_SPAN = 16;
-
-	/* Built-in method references for those with the same name as other `lodash` methods. */
-	var nativeNow = Date.now;
-
-	/**
-	 * Creates a function that'll short out and invoke `identity` instead
-	 * of `func` when it's called `HOT_COUNT` or more times in `HOT_SPAN`
-	 * milliseconds.
-	 *
-	 * @private
-	 * @param {Function} func The function to restrict.
-	 * @returns {Function} Returns the new shortable function.
-	 */
-	function shortOut(func) {
-	  var count = 0,
-	      lastCalled = 0;
-
-	  return function() {
-	    var stamp = nativeNow(),
-	        remaining = HOT_SPAN - (stamp - lastCalled);
-
-	    lastCalled = stamp;
-	    if (remaining > 0) {
-	      if (++count >= HOT_COUNT) {
-	        return arguments[0];
-	      }
-	    } else {
-	      count = 0;
-	    }
-	    return func.apply(undefined, arguments);
-	  };
-	}
-
-	var _shortOut = shortOut;
-
-	/**
-	 * Sets the `toString` method of `func` to return `string`.
-	 *
-	 * @private
-	 * @param {Function} func The function to modify.
-	 * @param {Function} string The `toString` result.
-	 * @returns {Function} Returns `func`.
-	 */
-	var setToString = _shortOut(_baseSetToString);
-
-	var _setToString = setToString;
-
-	/**
-	 * The base implementation of `_.rest` which doesn't validate or coerce arguments.
-	 *
-	 * @private
-	 * @param {Function} func The function to apply a rest parameter to.
-	 * @param {number} [start=func.length-1] The start position of the rest parameter.
-	 * @returns {Function} Returns the new function.
-	 */
-	function baseRest(func, start) {
-	  return _setToString(_overRest(func, start, identity_1), func + '');
-	}
-
-	var _baseRest = baseRest;
-
-	/**
-	 * Checks if the given arguments are from an iteratee call.
-	 *
-	 * @private
-	 * @param {*} value The potential iteratee value argument.
-	 * @param {*} index The potential iteratee index or key argument.
-	 * @param {*} object The potential iteratee object argument.
-	 * @returns {boolean} Returns `true` if the arguments are from an iteratee call,
-	 *  else `false`.
-	 */
-	function isIterateeCall(value, index, object) {
-	  if (!isObject_1(object)) {
-	    return false;
-	  }
-	  var type = typeof index;
-	  if (type == 'number'
-	        ? (isArrayLike_1(object) && _isIndex(index, object.length))
-	        : (type == 'string' && index in object)
-	      ) {
-	    return eq_1(object[index], value);
-	  }
-	  return false;
-	}
-
-	var _isIterateeCall = isIterateeCall;
-
-	/**
-	 * Creates a function like `_.assign`.
-	 *
-	 * @private
-	 * @param {Function} assigner The function to assign values.
-	 * @returns {Function} Returns the new assigner function.
-	 */
-	function createAssigner(assigner) {
-	  return _baseRest(function(object, sources) {
-	    var index = -1,
-	        length = sources.length,
-	        customizer = length > 1 ? sources[length - 1] : undefined,
-	        guard = length > 2 ? sources[2] : undefined;
-
-	    customizer = (assigner.length > 3 && typeof customizer == 'function')
-	      ? (length--, customizer)
-	      : undefined;
-
-	    if (guard && _isIterateeCall(sources[0], sources[1], guard)) {
-	      customizer = length < 3 ? undefined : customizer;
-	      length = 1;
-	    }
-	    object = Object(object);
-	    while (++index < length) {
-	      var source = sources[index];
-	      if (source) {
-	        assigner(object, source, index, customizer);
-	      }
-	    }
-	    return object;
-	  });
-	}
-
-	var _createAssigner = createAssigner;
-
-	/**
-	 * This method is like `_.assign` except that it recursively merges own and
-	 * inherited enumerable string keyed properties of source objects into the
-	 * destination object. Source properties that resolve to `undefined` are
-	 * skipped if a destination value exists. Array and plain object properties
-	 * are merged recursively. Other objects and value types are overridden by
-	 * assignment. Source objects are applied from left to right. Subsequent
-	 * sources overwrite property assignments of previous sources.
-	 *
-	 * **Note:** This method mutates `object`.
-	 *
-	 * @static
-	 * @memberOf _
-	 * @since 0.5.0
-	 * @category Object
-	 * @param {Object} object The destination object.
-	 * @param {...Object} [sources] The source objects.
-	 * @returns {Object} Returns `object`.
-	 * @example
-	 *
-	 * var object = {
-	 *   'a': [{ 'b': 2 }, { 'd': 4 }]
-	 * };
-	 *
-	 * var other = {
-	 *   'a': [{ 'c': 3 }, { 'e': 5 }]
-	 * };
-	 *
-	 * _.merge(object, other);
-	 * // => { 'a': [{ 'b': 2, 'c': 3 }, { 'd': 4, 'e': 5 }] }
-	 */
-	var merge = _createAssigner(function(object, source, srcIndex) {
-	  _baseMerge(object, source, srcIndex);
-	});
-
-	var merge_1 = merge;
-
-	/**
-	 * The options for a StyleControl object.
-	 */
-	var StyleControlOptions = /** @class */ (function (_super) {
-	    __extends(StyleControlOptions, _super);
-	    function StyleControlOptions() {
-	        var _this = _super !== null && _super.apply(this, arguments) || this;
-	        /**
-	         * The layout to display the styles in.
-	         * <p>`"icons"`: A row of clickable icons for each style.</p>
-	         * <p>`"list"`: A scrollable list with the icons and names for each style.</p>
-	         * Default `"icons"`
-	         * @default "icons"
-	         */
-	        _this.layout = "icons";
-	        /**
-	         * The map styles to show in the control.
-	         * Style names are case sensitive.
-	         * If an included style isn't supported by the map it will be ignored.
-	         * Available styles can be found in the
-	         * [supported styles]{@link https://docs.microsoft.com/en-us/azure/azure-maps/supported-map-styles} article.
-	         * If "all" is specified, all map styles will be shown.
-	         * Default `["road", "grayscale_light", "grayscale_dark", "night", "road_shaded_relief"]`
-	         * @default ["road", "grayscale_light", "grayscale_dark", "night", "road_shaded_relief"]
-	         */
-	        _this.mapStyles = [
-	            "road",
-	            "grayscale_light",
-	            "grayscale_dark",
-	            "night",
-	            "road_shaded_relief",
-	        ];
-	        /**
-	         * The style of the control.
-	         * Default `ControlStyle.light`.
-	         * @default ControlStyle.light
-	         */
-	        _this.style = exports.ControlStyle.light;
-	        /**
-	         * Whether to let style control automatically set the style, once user select a map style.
-	         * If set to `false`, then clicking on style will not set the set the style automatically.
-	         * Default `true`
-	         */
-	        _this.autoSelectionMode = true;
-	        /**
-	         * theme
-	         * when unset - all styles are selectable
-	         */
-	        _this.theme = undefined;
-	        return _this;
-	    }
-	    return StyleControlOptions;
-	}(Options));
-
-	/**
-	 * A control for changing the style of the map.
-	 */
-	var StyleControl = /** @class */ (function (_super) {
-	    __extends(StyleControl, _super);
-	    /**
-	     * Constructs a StyleControl.
-	     * @param options The options for the control.
-	     */
-	    function StyleControl(options) {
-	        var _this = _super.call(this) || this;
-	        _this.styleOpsGrid = null;
-	        _this.hasMouse = false;
-	        _this.hasFocus = false;
-	        _this.styleButtons = new Dictionary();
-	        _this.styleIcons = new Dictionary();
-	        /**
-	         * Callback handler for the style changing.
-	         */
-	        _this.onStyleChange = function () {
-	            if (_this.options.autoSelectionMode) {
-	                var newStyle = _this.map.getStyle().style;
-	                _this.setSelectedStyle(newStyle);
-	            }
-	        };
-	        _this.onStylesetChange = function (definitions) {
-	            if (!_this.styleOpsGrid) {
-	                return;
-	            }
-	            Array.from(_this.styleOpsGrid.children).forEach(function (element) { return element.remove(); });
-	            _this.populateOpsGridFromDefinitions(definitions);
-	        };
-	        _this.mapToFriendlyStyleName = function (name, styleset) {
-	            var style = styleset.styles.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));
-	        return _this;
+	var StyleControl = /** @class */ (function (_super) {
+	    __extends(StyleControl, _super);
+	    /**
+	     * Constructs a StyleControl.
+	     * @param options The options for the control.
+	     */
+	    function StyleControl(options) {
+	        var _this = _super.call(this) || this;
+	        _this.hasMouse = false;
+	        _this.hasFocus = false;
+	        _this.styleButtons = new Dictionary();
+	        _this.styleIcons = new Dictionary();
+	        /**
+	         * Callback handler for the style changing.
+	         */
+	        _this.onStyleChange = function () {
+	            if (_this.options.autoSelectionMode) {
+	                var newStyle = _this.map.getStyle().style;
+	                _this.setSelectedStyle(newStyle);
+	            }
+	        };
+	        _this.options = new StyleControlOptions().merge(cloneDeep_1(options));
+	        return _this;
 	    }
 	    /**
 	     * Initialization method for the control which is called when added to the map.
@@ -47502,9 +46844,8 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	        var _this = this;
 	        this.map = map;
 	        var container = this.buildContainer(map, this.options.style, "Map Style Control");
-	        var styleOpsGrid = this.buildStyleOpsGrid();
-	        this.styleOpsGrid = styleOpsGrid;
-	        var currStyleButton = this.buildCurrStyleBtn();
+	        var styleOpsGrid = this.buildStyleOpsGrid(container);
+	        var currStyleButton = this.buildCurrStyleBtn(container, styleOpsGrid);
 	        var tooltip = buildAccessibleTooltip("Select Style");
 	        styleOpsGrid.classList.add(options ? options.position || 'top-right' : 'top-right');
 	        container.addEventListener("mouseover", function () {
@@ -47533,32 +46874,6 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	                }
 	            }
 	        });
-	        // explictly hijack esc key behavior: we should not interrupt normal tab-navigation flow
-	        // but focus out via esc from to the parent container should instead bring focus to the reveal button
-	        styleOpsGrid.addEventListener('keydown', function (event) {
-	            if (event.keyCode === 27) {
-	                event.stopPropagation();
-	                currStyleButton.focus();
-	                if (container.classList.contains(StyleControl.Css.inUse)) {
-	                    container.classList.remove(StyleControl.Css.inUse);
-	                    styleOpsGrid.classList.add("hidden-accessible-element");
-	                }
-	            }
-	        });
-	        currStyleButton.addEventListener("click", function (event) {
-	            if (container.classList.contains(StyleControl.Css.inUse)) {
-	                container.classList.remove(StyleControl.Css.inUse);
-	                styleOpsGrid.classList.add("hidden-accessible-element");
-	            }
-	            else {
-	                container.classList.add(StyleControl.Css.inUse);
-	                styleOpsGrid.classList.remove("hidden-accessible-element");
-	                // clicking on a reveal button should move the focus to the first styleOpsGrid button
-	                if (styleOpsGrid.firstElementChild) {
-	                    styleOpsGrid.firstElementChild.focus();
-	                }
-	            }
-	        });
 	        if (options && StyleControl.InvertOrderPositions.includes(options.position)) {
 	            container.appendChild(styleOpsGrid);
 	            container.appendChild(currStyleButton);
@@ -47579,10 +46894,8 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	     */
 	    StyleControl.prototype.onRemove = function () {
 	        _super.prototype.onRemove.call(this);
-	        this.styleOpsGrid = null;
 	        this.styleButtons.clear();
 	        this.map.events.remove("styledata", this.onStyleChange);
-	        this.map.events.remove("stylesetchanged", this.onStylesetChange);
 	    };
 	    /**
 	     * Set the style that need to be displayed as currently selected.
@@ -47590,22 +46903,19 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	     * @param styleName - Style name that need to be disabled as currently selected
 	     */
 	    StyleControl.prototype.setSelectedStyle = function (styleName) {
-	        var _this = this;
 	        if (this.styleIcons.has(styleName)) {
-	            var image_1 = this.currStyleImage;
+	            var image = this.currStyleImage;
 	            var newSrc = this.styleIcons.get(styleName);
-	            if (image_1.src !== newSrc) {
-	                image_1.src = newSrc;
+	            if (image.src !== newSrc) {
+	                image.src = newSrc;
+	            }
+	            var newAlt = this.mapToFriendlyStyleName(styleName);
+	            if (image.alt !== newAlt) {
+	                image.alt = newAlt;
+	            }
+	            if (image.parentElement.lastChild instanceof Text) {
+	                image.parentElement.lastChild.textContent = newAlt;
 	            }
-	            this.map.styles.definitions().then(function (styleset) {
-	                var newAlt = _this.mapToFriendlyStyleName(styleName, styleset);
-	                if (image_1.alt !== newAlt) {
-	                    image_1.alt = newAlt;
-	                }
-	                if (image_1.parentElement.lastChild instanceof Text) {
-	                    image_1.parentElement.lastChild.textContent = newAlt;
-	                }
-	            });
 	        }
 	    };
 	    /**
@@ -47628,30 +46938,14 @@ 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, icon) {
 	        var _this = this;
 	        var styleOptionButton = document.createElement("button");
-	        var friendlyName = this.mapToFriendlyStyleName(name, styleset);
+	        var friendlyName = this.mapToFriendlyStyleName(name);
 	        styleOptionButton.setAttribute("alt", friendlyName);
 	        styleOptionButton.setAttribute("type", "button");
 	        var styleIconImage = new Image();
-	        fetchIconPromise
-	            .then(function (response) { return response.blob(); })
-	            .then(function (blob) {
-	            var iconUrl = URL.createObjectURL(blob);
-	            styleIconImage.src = iconUrl;
-	            if (name === _this.map.getStyle().style) {
-	                _this.currStyleImage.src = iconUrl;
-	                _this.currStyleImage.alt = friendlyName;
-	                if (_this.currStyleImage.parentElement.lastChild.nodeType == Node.TEXT_NODE) {
-	                    _this.currStyleImage.parentElement.lastChild.textContent = friendlyName;
-	                }
-	                else {
-	                    _this.currStyleImage.parentElement.appendChild(document.createTextNode(friendlyName));
-	                }
-	            }
-	            _this.styleIcons.set(name, iconUrl);
-	        });
+	        styleIconImage.src = icon;
 	        if (this.options.layout === "icons") {
 	            styleIconImage.alt = friendlyName;
 	        }
@@ -47684,8 +46978,8 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	        styleOptionButton.appendChild(iconDiv);
 	        return styleOptionButton;
 	    };
-	    StyleControl.prototype.buildCurrStyleBtn = function () {
-	        var selectCurrButton = document.createElement("button");
+	    StyleControl.prototype.buildCurrStyleBtn = function (container, opsGrid) {
+	        var selectCurrButton = document.createElement("div");
 	        if (this.options.layout == 'icons') {
 	            selectCurrButton.classList.add(StyleControl.Css.button);
 	        }
@@ -47695,7 +46989,6 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	        selectCurrButton.classList.add(StyleControl.Css.currentStyle);
 	        selectCurrButton.setAttribute("aria-label", "Select Style");
 	        selectCurrButton.setAttribute("alt", "Select Style");
-	        selectCurrButton.setAttribute("tabindex", "-1");
 	        this.currStyleImage = new Image();
 	        selectCurrButton.appendChild(this.currStyleImage);
 	        var selectCurrButtonIcon = document.createElement("div");
@@ -47703,7 +46996,7 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	        selectCurrButton.appendChild(selectCurrButtonIcon);
 	        return selectCurrButton;
 	    };
-	    StyleControl.prototype.buildStyleOpsGrid = function () {
+	    StyleControl.prototype.buildStyleOpsGrid = function (container) {
 	        var _this = this;
 	        var styleOpsGrid = document.createElement("div");
 	        styleOpsGrid.classList.add(StyleControl.Css.styleOptions);
@@ -47717,54 +47010,86 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	        styleOpsGrid.classList.add("hidden-accessible-element");
 	        // Once the map's style definition is initialized create a map between style names and icons.
 	        // 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.map.events.add("styledata", this.onStyleChange);
-	                return [2 /*return*/];
+	        this.map.styles.initialize().then(function () {
+	            var e_1, _a, _b;
+	            var styleDef = _this.map.styles.getDef();
+	            var currStyle = _this.map.getStyle().style;
+	            try {
+	                for (var _c = __values(styleDef.styles), _d = _c.next(); !_d.done; _d = _c.next()) {
+	                    var style = _d.value;
+	                    var iconUrl = style.thumbnail;
+	                    // It will make sure anyone using custom endpoint for style definition,
+	                    // can use there own custom thumbnail url.
+	                    if (iconUrl.indexOf(constants.stylePathHolder) > -1 ||
+	                        iconUrl.indexOf(constants.styleResourcePlaceholder) > -1) {
+	                        iconUrl = new Url({
+	                            domain: env.staticAssetsDomain,
+	                            path: style.thumbnail
+	                                .replace(constants.stylePathHolder, constants.stylePath)
+	                                .replace(constants.styleResourcePlaceholder, constants.styleResourcePath),
+	                            queryParams: (_b = {},
+	                                _b[constants.apiVersionQueryParameter] = constants.styleApiVersion,
+	                                _b)
+	                        }).toString();
+	                    }
+	                    // Always add a style even if it won't be shown by the style picker.
+	                    // This way the map's style can be set to something other than the picker.
+	                    // The style picker will still show the correct icon.
+	                    _this.styleIcons.set(style.name, iconUrl);
+	                    if (style.name === currStyle) {
+	                        _this.currStyleImage.src = iconUrl;
+	                        _this.currStyleImage.alt = _this.mapToFriendlyStyleName(style.name);
+	                        _this.currStyleImage.parentElement.appendChild(document.createTextNode(_this.mapToFriendlyStyleName(style.name)));
+	                    }
+	                }
+	            }
+	            catch (e_1_1) { e_1 = { error: e_1_1 }; }
+	            finally {
+	                try {
+	                    if (_d && !_d.done && (_a = _c.return)) _a.call(_c);
+	                }
+	                finally { if (e_1) throw e_1.error; }
+	            }
+	            if (_this.options.mapStyles === "all") {
+	                _this.styleIcons.forEach(function (iconUrl, styleName) {
+	                    var styleOptionButton = _this.buildSelectStyleBtn(styleName, iconUrl);
+	                    styleOpsGrid.appendChild(styleOptionButton);
+	                    _this.styleButtons[styleName] = styleOptionButton;
+	                    if (_this.options.layout === "icons") {
+	                        var tooltip = buildAccessibleTooltip(_this.mapToFriendlyStyleName(styleName));
+	                        styleOpsGrid.appendChild(tooltip);
+	                        positionTooltip(tooltip, styleOptionButton);
+	                    }
+	                });
+	            }
+	            else {
+	                _this.options.mapStyles.filter(function (styleName) { return _this.styleIcons.has(styleName); }).forEach(function (styleName) {
+	                    var iconUrl = _this.styleIcons.get(styleName);
+	                    var styleOptionButton = _this.buildSelectStyleBtn(styleName, iconUrl);
+	                    styleOpsGrid.appendChild(styleOptionButton);
+	                    _this.styleButtons[styleName] = styleOptionButton;
+	                    if (_this.options.layout === "icons") {
+	                        var tooltip = buildAccessibleTooltip(_this.mapToFriendlyStyleName(styleName));
+	                        styleOpsGrid.appendChild(tooltip);
+	                        positionTooltip(tooltip, styleOptionButton);
+	                    }
+	                });
+	            }
+	            Object.entries(_this.styleButtons).forEach(function (_a) {
+	                var _b = __read(_a, 2), styleName = _b[0], button = _b[1];
+	                return button.setAttribute('aria-current', styleName === currStyle ? 'true' : 'false');
 	            });
-	        }); });
-	        this.map.events.add("stylesetchanged", this.onStylesetChange);
+	            _this.map.events.add("styledata", _this.onStyleChange);
+	        });
 	        return styleOpsGrid;
 	    };
-	    StyleControl.prototype.populateOpsGridFromDefinitions = function (definitions) {
-	        var _this = this;
-	        if (!this.styleOpsGrid) {
-	            return;
-	        }
-	        var styles = definitions.styles;
-	        if (Array.isArray(this.options.mapStyles)) {
-	            styles = styles.filter(function (style) { return _this.options.mapStyles.includes(style.name.split("_indoor")[0]); });
-	        }
-	        if (this.options.theme) {
-	            styles = styles.filter(function (style) { return style.theme === _this.options.theme; });
-	        }
-	        styles.forEach(function (style) {
-	            // Create fetch thumbnail request
-	            var requestParams = {
-	                url: style.thumbnail
-	            };
-	            style.thumbnail && _this.map.styles._transformStyleRequest(style.thumbnail, requestParams);
-	            // Apply the users specified transform after ours
-	            var mapServiceOptions = _this.map.getServiceOptions();
-	            if (mapServiceOptions.transformRequest) {
-	                merge_1(requestParams, mapServiceOptions.transformRequest(requestParams.url, "Thumbnail"));
-	            }
-	            var fetchThumbnailPromise = fetch(requestParams.url, { headers: requestParams.headers });
-	            // Add button for each style
-	            var styleOptionButton = _this.buildSelectStyleBtn(style.name, definitions, fetchThumbnailPromise);
-	            _this.styleOpsGrid.appendChild(styleOptionButton);
-	            _this.styleButtons[style.name] = styleOptionButton;
-	            if (_this.options.layout === "icons") {
-	                var tooltip = buildAccessibleTooltip(_this.mapToFriendlyStyleName(style.name, definitions));
-	                _this.styleOpsGrid.appendChild(tooltip);
-	                positionTooltip(tooltip, styleOptionButton);
-	            }
-	        });
-	        Object.entries(this.styleButtons).forEach(function (_a) {
-	            var _b = __read(_a, 2), styleName = _b[0], button = _b[1];
-	            return button.setAttribute('aria-current', styleName === _this.map.getStyle().style ? 'true' : 'false');
-	        });
+	    StyleControl.prototype.mapToFriendlyStyleName = function (name) {
+	        // TODO: Bug 9984684 - Revert indoor specific logic her.
+	        return StyleControl.StyleNamesMap[name] ?
+	            StyleControl.StyleNamesMap[name] :
+	            StyleControl.StyleNamesMap[name + "_indoor"] ?
+	                StyleControl.StyleNamesMap[name + "_indoor"] :
+	                name;
 	    };
 	    StyleControl.InvertOrderPositions = [exports.ControlPosition.TopRight, exports.ControlPosition.BottomRight];
 	    StyleControl.Css = {
@@ -47776,6 +47101,19 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	        styleOptions: "style-options",
 	        dropdown: "azure-maps-control-dropdown"
 	    };
+	    StyleControl.StyleNamesMap = {
+	        road: "Road",
+	        satellite: "Satellite",
+	        satellite_road_labels: "Hybrid",
+	        grayscale_dark: "Grayscale (Dark)",
+	        grayscale_light: "Grayscale (Light)",
+	        night: "Night",
+	        road_shaded_relief: "Terra",
+	        blank: "Blank",
+	        blank_accessible: "Blank (Accessible)",
+	        high_contrast_dark: "High contrast (Dark)",
+	        high_contrast_light: "High contrast (Light)"
+	    };
 	    return StyleControl;
 	}(ControlBase));
 
@@ -48391,10 +47729,10 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	var COMPARE_PARTIAL_FLAG$2 = 1;
 
 	/** Used for built-in method references. */
-	var objectProto$e = Object.prototype;
+	var objectProto$d = Object.prototype;
 
 	/** Used to check objects for own properties. */
-	var hasOwnProperty$b = objectProto$e.hasOwnProperty;
+	var hasOwnProperty$a = objectProto$d.hasOwnProperty;
 
 	/**
 	 * A specialized version of `baseIsEqualDeep` for objects with support for
@@ -48422,7 +47760,7 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	  var index = objLength;
 	  while (index--) {
 	    var key = objProps[index];
-	    if (!(isPartial ? key in other : hasOwnProperty$b.call(other, key))) {
+	    if (!(isPartial ? key in other : hasOwnProperty$a.call(other, key))) {
 	      return false;
 	    }
 	  }
@@ -48481,13 +47819,13 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	/** `Object#toString` result references. */
 	var argsTag$3 = '[object Arguments]',
 	    arrayTag$2 = '[object Array]',
-	    objectTag$4 = '[object Object]';
+	    objectTag$3 = '[object Object]';
 
 	/** Used for built-in method references. */
-	var objectProto$f = Object.prototype;
+	var objectProto$e = Object.prototype;
 
 	/** Used to check objects for own properties. */
-	var hasOwnProperty$c = objectProto$f.hasOwnProperty;
+	var hasOwnProperty$b = objectProto$e.hasOwnProperty;
 
 	/**
 	 * A specialized version of `baseIsEqual` for arrays and objects which performs
@@ -48509,11 +47847,11 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	      objTag = objIsArr ? arrayTag$2 : _getTag(object),
 	      othTag = othIsArr ? arrayTag$2 : _getTag(other);
 
-	  objTag = objTag == argsTag$3 ? objectTag$4 : objTag;
-	  othTag = othTag == argsTag$3 ? objectTag$4 : othTag;
+	  objTag = objTag == argsTag$3 ? objectTag$3 : objTag;
+	  othTag = othTag == argsTag$3 ? objectTag$3 : othTag;
 
-	  var objIsObj = objTag == objectTag$4,
-	      othIsObj = othTag == objectTag$4,
+	  var objIsObj = objTag == objectTag$3,
+	      othIsObj = othTag == objectTag$3,
 	      isSameTag = objTag == othTag;
 
 	  if (isSameTag && isBuffer_1(object)) {
@@ -48530,8 +47868,8 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	      : _equalByTag(object, other, objTag, bitmask, customizer, equalFunc, stack);
 	  }
 	  if (!(bitmask & COMPARE_PARTIAL_FLAG$3)) {
-	    var objIsWrapped = objIsObj && hasOwnProperty$c.call(object, '__wrapped__'),
-	        othIsWrapped = othIsObj && hasOwnProperty$c.call(other, '__wrapped__');
+	    var objIsWrapped = objIsObj && hasOwnProperty$b.call(object, '__wrapped__'),
+	        othIsWrapped = othIsObj && hasOwnProperty$b.call(other, '__wrapped__');
 
 	    if (objIsWrapped || othIsWrapped) {
 	      var objUnwrapped = objIsWrapped ? object.value() : object,
@@ -48888,6 +48226,87 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	    return Point;
 	}());
 
+	var arrayPoints = createCommonjsModule(function (module, exports) {
+	exports.__esModule = true;
+	function getAddedSquaresAP(dx, dy) {
+	    return dx * dx + dy * dy;
+	}
+	function getSqDistAP(p1, p2) {
+	    return getAddedSquaresAP(p1[0] - p2[0], p1[1] - p2[1]);
+	}
+	function getSqSegDistAP(p, p1, p2) {
+	    var x = p1[0], y = p1[1], dx = p2[0] - x, dy = p2[1] - y;
+	    if (dx !== 0 || dy !== 0) {
+	        var t = ((p[0] - x) * dx + (p[1] - y) * dy) / getAddedSquaresAP(dx, dy);
+	        if (t > 1) {
+	            x = p2[0];
+	            y = p2[1];
+	        }
+	        else if (t > 0) {
+	            x += dx * t;
+	            y += dy * t;
+	        }
+	    }
+	    return getAddedSquaresAP(p[0] - x, p[1] - y);
+	}
+	function simplifyRadialDistAP(points, sqTolerance) {
+	    var prevPoint = points[0], point;
+	    var newPoints = [prevPoint];
+	    for (var i = 1, len = points.length; i < len; i++) {
+	        point = points[i];
+	        if (getSqDistAP(point, prevPoint) > sqTolerance) {
+	            newPoints.push(point);
+	            prevPoint = point;
+	        }
+	    }
+	    if (prevPoint !== point) {
+	        newPoints.push(point);
+	    }
+	    return newPoints;
+	}
+	function simplifyDPStepAP(points, first, last, sqTolerance, simplified) {
+	    var maxSqDist = sqTolerance, index;
+	    for (var i = first + 1; i < last; i++) {
+	        var sqDist = getSqSegDistAP(points[i], points[first], points[last]);
+	        if (sqDist > maxSqDist) {
+	            index = i;
+	            maxSqDist = sqDist;
+	        }
+	    }
+	    if (maxSqDist > sqTolerance) {
+	        if (index - first > 1) {
+	            simplifyDPStepAP(points, first, index, sqTolerance, simplified);
+	        }
+	        simplified.push(points[index]);
+	        if (last - index > 1) {
+	            simplifyDPStepAP(points, index, last, sqTolerance, simplified);
+	        }
+	    }
+	}
+	function simplifyDouglasPeuckerAP(points, sqTolerance) {
+	    var last = points.length - 1;
+	    var simplified = [points[0]];
+	    simplifyDPStepAP(points, 0, last, sqTolerance, simplified);
+	    simplified.push(points[last]);
+	    return simplified;
+	}
+	function SimplifyAP(points, tolerance, highestQuality) {
+	    if (tolerance === void 0) { tolerance = 1; }
+	    if (highestQuality === void 0) { highestQuality = false; }
+	    if (points.length <= 2) {
+	        return points;
+	    }
+	    var sqTolerance = tolerance * tolerance;
+	    points = highestQuality ? points : simplifyRadialDistAP(points, sqTolerance);
+	    points = simplifyDouglasPeuckerAP(points, sqTolerance);
+	    return points;
+	}
+	exports.SimplifyAP = SimplifyAP;
+	});
+
+	unwrapExports(arrayPoints);
+	var arrayPoints_1 = arrayPoints.SimplifyAP;
+
 	//////////////////////
 	/// Constants
 	//////////////////////
@@ -50964,6 +50383,16 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	    }
 	    return result;
 	}
+	/**
+	 * Perform a Douglas-Peucker simplification on an array of positions or pixels.
+	 * @param points The position or pixel points to simplify.
+	 * @param tolerance A tolerance to use in the simplification.
+	 * @returns A new array of the simplified set of points.
+	 */
+	function simplify(points, tolerance) {
+	    //Perform a Douglas-Peucker simplification of the pixels.
+	    return arrayPoints_1(points, tolerance, true);
+	}
 
 	/**
 	 * A GeoJSON Position object - an array that specifies the longitude and latitude of a location. The
@@ -51163,374 +50592,620 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	}());
 
 	/**
-	 * A helper class that wraps a Geometry or Feature and makes it easy to update and maintain.
+	 * An Affine Transform class generated from a set of reference points.
 	 */
-	var Shape = /** @class */ (function (_super) {
-	    __extends(Shape, _super);
-	    function Shape(data, id, properties) {
-	        var _this = _super.call(this) || this;
-	        var geometry;
-	        if (data.type === "Feature") {
-	            var feature = data;
-	            geometry = cloneDeep_1(feature.geometry);
-	            properties = feature.properties ? cloneDeep_1(feature.properties) : {};
-	            id = feature.id == null || feature.id === "" ? uuidRandom() : feature.id;
-	        }
-	        else {
-	            geometry = cloneDeep_1(data);
-	            id = id == null || id === "" ? uuidRandom() : id;
-	            properties = properties ? cloneDeep_1(properties) : {};
-	        }
-	        // Assign the feature's id to another property to workaround the Mapbox bug
-	        // that prevents non-numerical ids from being returned by some functions.
-	        // TODO Remove once this issue if fixed. https://github.com/mapbox/mapbox-gl-js/issues/2716
-	        properties[Shape._shapeIdPropName] = id;
-	        // Always create a new feature to guarantee the data matches our definition of a Feature.
-	        _this.data = new Feature(geometry, properties, id);
-	        _this._handleCircle();
-	        return _this;
+	var AffineTransform = /** @class */ (function () {
+	    /**
+	     * An Affine Transform class generated from a set of reference points.
+	     * @param source A set of reference points from the source reference system to transform from.
+	     * @param target A set of reference points from the target reference system to transform to.
+	     */
+	    function AffineTransform(source, target) {
+	        this.M = AffineTransform._calculateAffineTransform(source, target);
+	        this.inverseM = AffineTransform._calculateAffineTransform(target, source);
 	    }
 	    /**
-	     * Adds or updates an existing property value in the shape.
-	     * @param key
-	     * @param value
+	     * Converts an array of points from the source reference system to the target reference system.
+	     * @param sourcePoints An array of points from the source reference system to transform.
+	     * @param decimals Number of decimal places to round the results off to.
+	     * @returns An array of points that have been transformed to the target reference system.
 	     */
-	    Shape.prototype.addProperty = function (key, value) {
-	        // Only add the property if it is a new value.
-	        if (!isEqual_1(this.data.properties[key], value)) {
-	            this.data.properties[key] = cloneDeep_1(value);
-	            if (key === "subType" || key === "radius") {
-	                this._handleCircle();
-	            }
-	            if (this.dataSource) {
-	                this.dataSource._updateSource();
-	            }
-	            this._invokeEvent("shapechanged", this);
+	    AffineTransform.prototype.toTarget = function (sourcePoints, decimals) {
+	        if (typeof sourcePoints !== undefined) {
+	            return this.transformArray(sourcePoints, this.M, decimals);
 	        }
+	        throw new Error("Invalid sourcePoints specified.");
 	    };
 	    /**
-	     * Gets the bounding box of the shape
+	     * Converts an array of points from the target reference system to the source reference system.
+	     * @param targetPoints An array of points from the target reference system to transform.
+	     * @param decimals Number of decimal places to round the results off to.
+	     * @returns An array of points that have been transformed to the source reference system.
 	     */
-	    Shape.prototype.getBounds = function () {
-	        var e_1, _a, e_2, _b;
-	        var positions = this.getCoordinates();
-	        var bbox;
-	        var geoType = this.getType();
-	        if (geoType === "Point") {
-	            if (this.circlePolygon) { // If a circle from the extended GeoJSON spec.
-	                var pos = this.circlePolygon.geometry.coordinates;
-	                bbox = BoundingBox.fromPositions(pos[0]);
-	            }
-	            else {
-	                var pos = positions;
-	                bbox = new BoundingBox(pos, pos);
-	            }
-	        }
-	        else if (geoType === "MultiPoint" || geoType === "LineString") {
-	            var pos = positions;
-	            bbox = BoundingBox.fromPositions(pos);
-	        }
-	        else if (geoType === "Polygon") {
-	            var pos = positions;
-	            // only need to check the exterior ring of Polygon
-	            bbox = BoundingBox.fromPositions(pos[0]);
+	    AffineTransform.prototype.toSource = function (targetPoints, decimals) {
+	        if (typeof targetPoints !== undefined) {
+	            return this.transformArray(targetPoints, this.inverseM, decimals);
 	        }
-	        else if (geoType === "MultiLineString") {
-	            var pos = positions;
+	        throw new Error("Invalid targetPoints specified.");
+	    };
+	    /**
+	     * Applies a transform matrix over a set of points and optionally rounds off the values to a specified number of decimals.
+	     * @param points The array of points to transform.
+	     * @param transformMatrix The transform matrix to apply.
+	     * @param decimals The number of decimals to round each calculated point value off to.
+	     * @returns An array of points that have been transformed.
+	     */
+	    AffineTransform.prototype.transformArray = function (points, transformMatrix, decimals) {
+	        var e_1, _a;
+	        if (points && Array.isArray(points) && Array.isArray(points[0])) {
+	            var pos = [];
 	            try {
-	                for (var pos_1 = __values(pos), pos_1_1 = pos_1.next(); !pos_1_1.done; pos_1_1 = pos_1.next()) {
-	                    var p = pos_1_1.value;
-	                    bbox = BoundingBox.merge(bbox, BoundingBox.fromPositions(p));
+	                for (var points_1 = __values(points), points_1_1 = points_1.next(); !points_1_1.done; points_1_1 = points_1.next()) {
+	                    var subPoints = points_1_1.value;
+	                    pos.push(this.transform(subPoints, transformMatrix, decimals));
 	                }
 	            }
 	            catch (e_1_1) { e_1 = { error: e_1_1 }; }
 	            finally {
 	                try {
-	                    if (pos_1_1 && !pos_1_1.done && (_a = pos_1.return)) _a.call(pos_1);
+	                    if (points_1_1 && !points_1_1.done && (_a = points_1.return)) _a.call(points_1);
 	                }
 	                finally { if (e_1) throw e_1.error; }
 	            }
+	            return pos;
 	        }
-	        else if (geoType === "MultiPolygon") {
-	            var pos = positions;
-	            try {
-	                for (var pos_2 = __values(pos), pos_2_1 = pos_2.next(); !pos_2_1.done; pos_2_1 = pos_2.next()) {
-	                    var p1 = pos_2_1.value;
-	                    // only need to check the exterior ring of Polygon
-	                    bbox = BoundingBox.merge(bbox, BoundingBox.fromPositions(p1[0]));
-	                }
-	            }
-	            catch (e_2_1) { e_2 = { error: e_2_1 }; }
-	            finally {
-	                try {
-	                    if (pos_2_1 && !pos_2_1.done && (_b = pos_2.return)) _b.call(pos_2);
-	                }
-	                finally { if (e_2) throw e_2.error; }
-	            }
-	        }
-	        return bbox;
-	    };
-	    /**
-	     * Gets the coordinates of the shape.
-	     */
-	    Shape.prototype.getCoordinates = function () {
-	        return cloneDeep_1(this.data.geometry.coordinates);
-	    };
-	    /**
-	     * If the shape is a circle, this gets its coordinates. Otherwise returns null.
-	     */
-	    Shape.prototype.getCircleCoordinates = function () {
-	        if (this.circlePolygon) {
-	            return cloneDeep_1(this.circlePolygon.geometry.coordinates[0]);
-	        }
-	        else {
-	            return null;
-	        }
-	    };
-	    /**
-	     * Gets the id of the shape.
-	     */
-	    Shape.prototype.getId = function () {
-	        return this.data.id;
-	    };
-	    /**
-	     * Gets the properties of the shape.
-	     */
-	    Shape.prototype.getProperties = function () {
-	        return cloneDeep_1(this.data.properties);
-	    };
-	    /**
-	     * Returns a string indicating the type of geometry this shape contains.
-	     */
-	    Shape.prototype.getType = function () {
-	        return this.data.geometry.type;
-	    };
-	    /**
-	     * Indicates if the contained shape is a Circle, defined by the extended GeoJSON specification supported by Azure Maps.
-	     * [Extended Spec]{@link https://docs.microsoft.com/en-us/azure/azure-maps/extend-geojson}
-	     */
-	    Shape.prototype.isCircle = function () {
-	        return Shape._isCircle(this.data);
+	        return null;
 	    };
 	    /**
-	     * Indicates if the contained shape is a Rectangle, defined by the extended GeoJSON specification supported by Azure Maps.
-	     * [Extended Spec]{@link https://docs.microsoft.com/en-us/azure/azure-maps/extend-geojson}
+	     * Applies a transform matrix on a point and optionally rounds off the values to a specified number of decimals.
+	     * @param point The point to transform.
+	     * @param transformMatrix The transform matrix to apply.
+	     * @param decimals The number of decimals to round each calculated point value off to.
+	     * @returns An array of points that have been transformed.
 	     */
-	    Shape.prototype.isRectangle = function () {
-	        return Shape._isRectangle(this.data);
+	    AffineTransform.prototype.transform = function (point, transformMatrix, decimals) {
+	        var x = point[0] * transformMatrix[0][3] + point[1] * transformMatrix[1][3] + transformMatrix[2][3];
+	        var y = point[0] * transformMatrix[0][4] + point[1] * transformMatrix[1][4] + transformMatrix[2][4];
+	        return typeof decimals === "number" && decimals >= 0 ?
+	            [_precision(x, decimals), _precision(y, decimals)] :
+	            [_precision(x, 6), _precision(y, 6)];
 	    };
 	    /**
-	     * Updates the coordinates of the shape
-	     * @param coords Point: Position, LineString: Position[], Polygon: Position[][],
-	     * MultiPoint: Position[], MultiLineString: Position[][], MultiPolygon: Position[][]
+	     * Takes in a set of source and target points can calculates an approximate Affine Transform matrix that best fits the data.
+	     * Modified version of this code: https://github.com/commenthol/affinefit
+	     * @param sourcePoints A set of source points to transform from.
+	     * @param targetPoints A set of target points to transform to.
+	     * @returns An Affine Tranform matrix.
 	     */
-	    Shape.prototype.setCoordinates = function (coords) {
-	        // If a Position[] is supplied for a polygon wrap it in an array.
-	        var newCoords;
-	        if (this.getType() === "Polygon" &&
-	            Position._getDimensions(coords) === 1) {
-	            newCoords = [coords];
-	        }
-	        else {
-	            newCoords = coords;
+	    AffineTransform._calculateAffineTransform = function (sourcePoints, targetPoints) {
+	        if (sourcePoints.length !== targetPoints.length || sourcePoints.length < 1) {
+	            throw new Error("Error: source and target arrays must have the same length.");
 	        }
-	        // Only update the coordinates if they've actually changed.
-	        if (!isEqual_1(this.data.geometry.coordinates, newCoords)) {
-	            this.data.geometry.coordinates = cloneDeep_1(newCoords);
-	            this._handleCircle();
-	            if (this.dataSource) {
-	                this.dataSource._updateSource();
-	            }
-	            this._invokeEvent("shapechanged", this);
+	        // Use the smallest dimension of the input.
+	        var dim = Math.min(sourcePoints[0].length, targetPoints[0].length);
+	        var dimPlusOne = dim + 1;
+	        if (sourcePoints.length < dim) {
+	            throw new Error("Erorr: At least " + dim + " reference points required.");
 	        }
-	    };
-	    /**
-	     * Sets the properties on the shape. Overwrites all existing properties.
-	     * @param properties
-	     */
-	    Shape.prototype.setProperties = function (properties) {
-	        // Assign the feature's id to another property to workaround the Mapbox bug
-	        // that prevents non-numerical ids from being returned by some functions.
-	        // TODO Remove once this issue if fixed. https://github.com/mapbox/mapbox-gl-js/issues/2716
-	        properties[Shape._shapeIdPropName] = this.data.id;
-	        // Only update the properties if they've actually changed.
-	        if (!isEqual_1(this.data.properties, properties)) {
-	            this.data.properties = cloneDeep_1(properties);
-	            this._handleCircle();
-	            if (this.dataSource) {
-	                this.dataSource._updateSource();
+	        // Create an empty (dim + 1) x (dim) matrix and fill it.
+	        var c = [];
+	        var transformMatrix = [];
+	        for (var i = 0; i < dimPlusOne; i++) {
+	            transformMatrix[i] = [];
+	            for (var j = 0; j < dimPlusOne; j++) {
+	                if (j < dim) {
+	                    c[j] = 0;
+	                }
+	                transformMatrix[i][j] = 0;
+	                for (var k = 0; k < sourcePoints.length; k++) {
+	                    if (j < dim) {
+	                        if (i < dim) {
+	                            c[j] += sourcePoints[k][i] * targetPoints[k][j];
+	                        }
+	                        else {
+	                            c[j] += targetPoints[k][j];
+	                        }
+	                    }
+	                    if (i >= dim && j >= dim) {
+	                        transformMatrix[i][j] += 1;
+	                    }
+	                    else if (i >= dim) {
+	                        transformMatrix[i][j] += sourcePoints[k][j];
+	                    }
+	                    else if (j >= dim) {
+	                        transformMatrix[i][j] += sourcePoints[k][i];
+	                    }
+	                    else {
+	                        transformMatrix[i][j] += sourcePoints[k][i] * sourcePoints[k][j];
+	                    }
+	                }
 	            }
-	            this._invokeEvent("shapechanged", this);
-	        }
-	    };
-	    /**
-	     * Returns a GeoJSON feature that represents the shape.
-	     */
-	    Shape.prototype.toJson = function () {
-	        return JSON.parse(JSON.stringify(this.data));
-	    };
-	    /**
-	     * Just like the toJson() function but will return a polygon feature
-	     * for any circles as defined by the extended GeoJSON spec.
-	     * [Extended Spec]{@link https://docs.microsoft.com/en-us/azure/azure-maps/extend-geojson}
-	     * @internal
-	     */
-	    Shape.prototype._toJson = function () {
-	        return this.circlePolygon || this.data;
-	    };
-	    /**
-	     * @internal
-	     */
-	    Shape.prototype._setDataSource = function (dataSource) {
-	        if (dataSource === undefined || dataSource == null) {
-	            delete this.dataSource;
+	            transformMatrix[i] = transformMatrix[i].concat(c);
 	        }
-	        else {
-	            this.dataSource = dataSource;
+	        if (!this._gaussJordanElimination(transformMatrix)) {
+	            throw new Error("Error: Singular matrix. Points are likely coplanar.");
 	        }
+	        return transformMatrix;
 	    };
 	    /**
-	     * Check if the shape's wrapped feature is a circle form the extended GeoJSON spec.
-	     * If so it will calculate a polygon feature that approximates the specified circle.
-	     * @private
+	     * Puts a given matrix (2D array) into the Reduced Row Echelon Form.
+	     * Returns True if successful, False if the transformMatrix is singular.
+	     * Code from: https://github.com/commenthol/affinefit
 	     */
-	    Shape.prototype._handleCircle = function () {
-	        if (this.isCircle()) {
-	            var coords = Shape._getCirclePositions(this.data);
-	            this.circlePolygon = new Feature(new Polygon([coords]), this.data.properties, this.data.id);
-	            // Set the subType to "Circle" to make sure the case is correct.
-	            this.data.properties.subType = "Circle";
+	    AffineTransform._gaussJordanElimination = function (transformMatrix) {
+	        var eps = 1e-10; // 1.0 / Math.pow(10, 10)
+	        var dimPlusOne = transformMatrix.length;
+	        var w = 2 * dimPlusOne - 1;
+	        var tempNum;
+	        var tempArray;
+	        for (var j = 0; j < dimPlusOne; j++) {
+	            var maxrow = j;
+	            for (var i = j + 1; i < dimPlusOne; i++) {
+	                // Find max pivot.
+	                if (Math.abs(transformMatrix[i][j]) > Math.abs(transformMatrix[maxrow][j])) {
+	                    maxrow = i;
+	                }
+	            }
+	            tempArray = transformMatrix[maxrow];
+	            transformMatrix[maxrow] = transformMatrix[j];
+	            transformMatrix[j] = tempArray;
+	            if (Math.abs(transformMatrix[j][j]) <= eps) {
+	                // Is Singular?
+	                return false;
+	            }
+	            for (var _j = j + 1; _j < dimPlusOne; _j++) {
+	                // Eliminate column y.
+	                tempNum = transformMatrix[_j][j] / transformMatrix[j][j];
+	                for (var _i = j; _i < w; _i++) {
+	                    transformMatrix[_j][_i] -= transformMatrix[j][_i] * tempNum;
+	                }
+	            }
 	        }
-	        else {
-	            delete this.circlePolygon;
+	        for (var j = dimPlusOne - 1; j > -1; j--) {
+	            // Backsubstitute.
+	            tempNum = transformMatrix[j][j];
+	            for (var i = 0; i < j; i++) {
+	                for (var _x = w - 1; _x > j - 1; _x--) {
+	                    transformMatrix[i][_x] -= transformMatrix[j][_x] * transformMatrix[i][j] / tempNum;
+	                }
+	            }
+	            transformMatrix[j][j] /= tempNum;
+	            for (var _x2 = dimPlusOne; _x2 < w; _x2++) {
+	                // Normalize row y.
+	                transformMatrix[j][_x2] /= tempNum;
+	            }
 	        }
+	        return true;
 	    };
-	    /**
-	     * Indicates if the specified feature is a circle, defined by the extended GeoJSON specification supported by Azure Maps.
-	     * [Extended Spec]{@link https://docs.microsoft.com/en-us/azure/azure-maps/extend-geojson}
-	     * @internal
-	     */
-	    Shape._isCircle = function (data) {
-	        return data && data.geometry &&
-	            data.geometry.type === "Point" &&
-	            data.geometry.coordinates && data.properties &&
-	            typeof data.properties.subType === "string" &&
-	            data.properties.subType.toLowerCase() === "circle" &&
-	            typeof data.properties.radius === "number";
-	    };
-	    /**
-	     * Indicates if the specified feature is a rectangle, defined by the extended GeoJSON specification supported by Azure Maps.
-	     * [Extended Spec]{@link https://docs.microsoft.com/en-us/azure/azure-maps/extend-geojson}
-	     * @internal
-	     */
-	    Shape._isRectangle = function (data) {
-	        if (data.geometry.type === "Polygon" &&
-	            data.geometry.coordinates &&
-	            typeof data.properties.subType === "string" &&
-	            data.properties.subType.toLowerCase() === "rectangle") {
-	            // If type is Polygon we can assume the coordinates are a Position[][].
-	            var coords = data.geometry.coordinates;
-	            if (coords.length === 1) {
-	                var ring = coords[0];
-	                if (ring.length === 5) {
-	                    return ring[0][0] === ring[4][0] &&
-	                        ring[0][1] === ring[4][1];
-	                }
-	                else if (ring.length === 4) {
-	                    return true;
-	                }
-	            }
+	    return AffineTransform;
+	}());
+
+
+
+	var index$1 = /*#__PURE__*/Object.freeze({
+		__proto__: null,
+		AffineTransform: AffineTransform,
+		WEBMERCATOR_MAXLAT: WEBMERCATOR_MAXLAT,
+		_precision: _precision,
+		get AreaUnits () { return AreaUnits; },
+		get DistanceUnits () { return DistanceUnits; },
+		get TimeUnits () { return TimeUnits; },
+		get SpeedUnits () { return SpeedUnits; },
+		get AccelerationUnits () { return AccelerationUnits; },
+		boundingBoxToPolygon: boundingBoxToPolygon,
+		convertDistance: convertDistance,
+		getCardinalSpline: getCardinalSpline,
+		getDestination: getDestination,
+		getDistanceTo: getDistanceTo,
+		getEarthRadius: getEarthRadius,
+		getPathDenormalizedAtAntimerian: getPathDenormalizedAtAntimerian,
+		getPathSplitByAntimeridian: getPathSplitByAntimeridian,
+		getGeodesicPath: getGeodesicPath,
+		getGeodesicPaths: getGeodesicPaths,
+		getHeading: getHeading,
+		getLengthOfPath: getLengthOfPath,
+		getPositionAlongPath: getPositionAlongPath,
+		getRegularPolygonPath: getRegularPolygonPath,
+		getRegularPolygonPaths: getRegularPolygonPaths,
+		interpolate: interpolate,
+		normalizeLatitude: normalizeLatitude,
+		normalizeLongitude: normalizeLongitude,
+		rotatePositions: rotatePositions,
+		getPixelHeading: getPixelHeading,
+		mercatorPixelsToPositions: mercatorPixelsToPositions,
+		mercatorPositionsToPixels: mercatorPositionsToPixels,
+		convertAcceleration: convertAcceleration,
+		convertArea: convertArea,
+		convertSpeed: convertSpeed,
+		convertTimespan: convertTimespan,
+		getAcceleration: getAcceleration,
+		getAccelerationFromSpeeds: getAccelerationFromSpeeds,
+		getAccelerationFromFeatures: getAccelerationFromFeatures,
+		getArea: getArea,
+		getSpeed: getSpeed,
+		getSpeedFromFeatures: getSpeedFromFeatures,
+		getTimespan: getTimespan,
+		getTravelDistance: getTravelDistance,
+		parseTimestamp: parseTimestamp,
+		getConvexHull: getConvexHull,
+		getPositions: getPositions,
+		getPosition: getPosition,
+		getPositionsAlongPath: getPositionsAlongPath,
+		getPointWithHeadingAlongPath: getPointWithHeadingAlongPath,
+		getPointsWithHeadingsAlongPath: getPointsWithHeadingsAlongPath,
+		getClosestPointOnGeometry: getClosestPointOnGeometry,
+		simplify: simplify
+	});
+
+	/**
+	 * A helper class that wraps a Geometry or Feature and makes it easy to update and maintain.
+	 */
+	var Shape = /** @class */ (function (_super) {
+	    __extends(Shape, _super);
+	    function Shape(data, id, properties) {
+	        var _this = _super.call(this) || this;
+	        var geometry;
+	        if (data.type === "Feature") {
+	            var feature = data;
+	            geometry = cloneDeep_1(feature.geometry);
+	            properties = feature.properties ? cloneDeep_1(feature.properties) : {};
+	            id = feature.id == null || feature.id === "" ? uuidRandom() : feature.id;
 	        }
-	        return false;
-	    };
+	        else {
+	            geometry = cloneDeep_1(data);
+	            id = id == null || id === "" ? uuidRandom() : id;
+	            properties = properties ? cloneDeep_1(properties) : {};
+	        }
+	        // Assign the feature's id to another property to workaround the Mapbox bug
+	        // that prevents non-numerical ids from being returned by some functions.
+	        // TODO Remove once this issue if fixed. https://github.com/mapbox/mapbox-gl-js/issues/2716
+	        properties[Shape._shapeIdPropName] = id;
+	        // Always create a new feature to guarantee the data matches our definition of a Feature.
+	        _this.data = new Feature(geometry, properties, id);
+	        _this._handleCircle();
+	        return _this;
+	    }
 	    /**
-	     * Calculates to positions that should be used to approximate the specified circle feature.
-	     * @internal
+	     * Adds or updates an existing property value in the shape.
+	     * @param key
+	     * @param value
 	     */
-	    Shape._getCirclePositions = function (data) {
-	        return getRegularPolygonPath(data.geometry.coordinates, data.properties.radius, 72, "meters");
+	    Shape.prototype.addProperty = function (key, value) {
+	        // Only add the property if it is a new value.
+	        if (!isEqual_1(this.data.properties[key], value)) {
+	            this.data.properties[key] = cloneDeep_1(value);
+	            if (key === "subType" || key === "radius") {
+	                this._handleCircle();
+	            }
+	            if (this.dataSource) {
+	                this.dataSource._updateSource();
+	            }
+	            this._invokeEvent("shapechanged", this);
+	        }
 	    };
 	    /**
-	     * Represents the feature property name that the shape's id will be assigned to.
-	     * This is a workaround for the Mapbox bug preventing non-numerical ids from being returned by some functions.
-	     * TODO Remove once this issue if fixed.
-	     * {@link https://github.com/mapbox/mapbox-gl-js/issues/2716}
-	     * @internal
+	     * Gets the bounding box of the shape
 	     */
-	    // tslint:disable-next-line: variable-name
-	    Shape._shapeIdPropName = "_azureMapsShapeId";
-	    return Shape;
-	}(EventEmitter));
-
-	/**
-	 * A GeoJSON BoundingBox object - an array that defines a shape whose edges follow lines of constant longitude,
-	 * latitude, and elevation. All axes of the most southwesterly point are followed by all axes of the more northeasterly
-	 * point. The axes order of the BoundingBox follows the axes order of geometries. The full description is detailed in
-	 * [RFC 7946]{@link https://tools.ietf.org/html/rfc7946#section-5}.
-	 */
-	var BoundingBox = /** @class */ (function (_super) {
-	    __extends(BoundingBox, _super);
-	    function BoundingBox(southwestPositionOrPositions, northeastPosition) {
-	        var _this = this;
-	        if (southwestPositionOrPositions && northeastPosition) {
-	            var southwestPosition = southwestPositionOrPositions;
-	            if (southwestPosition[2] && northeastPosition[2]) {
-	                _this = _super.call(this, southwestPosition[0], southwestPosition[1], southwestPosition[2] || 0, northeastPosition[0], northeastPosition[1], northeastPosition[2] || 0) || this;
+	    Shape.prototype.getBounds = function () {
+	        var e_1, _a, e_2, _b;
+	        var positions = this.getCoordinates();
+	        var bbox;
+	        var geoType = this.getType();
+	        if (geoType === "Point") {
+	            if (this.circlePolygon) { // If a circle from the extended GeoJSON spec.
+	                var pos = this.circlePolygon.geometry.coordinates;
+	                bbox = BoundingBox.fromPositions(pos[0]);
 	            }
 	            else {
-	                _this = _super.call(this, southwestPosition[0], southwestPosition[1], northeastPosition[0], northeastPosition[1]) || this;
+	                var pos = positions;
+	                bbox = new BoundingBox(pos, pos);
 	            }
 	        }
-	        else if (southwestPositionOrPositions) {
-	            var positions = southwestPositionOrPositions;
-	            if (positions) {
-	                if (positions.length === 4) {
-	                    // [west, south, east, north]
-	                    _this = _super.call(this, positions[0], positions[1], positions[2], positions[3]) || this;
+	        else if (geoType === "MultiPoint" || geoType === "LineString") {
+	            var pos = positions;
+	            bbox = BoundingBox.fromPositions(pos);
+	        }
+	        else if (geoType === "Polygon") {
+	            var pos = positions;
+	            // only need to check the exterior ring of Polygon
+	            bbox = BoundingBox.fromPositions(pos[0]);
+	        }
+	        else if (geoType === "MultiLineString") {
+	            var pos = positions;
+	            try {
+	                for (var pos_1 = __values(pos), pos_1_1 = pos_1.next(); !pos_1_1.done; pos_1_1 = pos_1.next()) {
+	                    var p = pos_1_1.value;
+	                    bbox = BoundingBox.merge(bbox, BoundingBox.fromPositions(p));
 	                }
-	                else if (positions.length >= 6) {
-	                    // [west, south, elevation1, east, north, elevation2]
-	                    _this = _super.call(this, positions[0], positions[1], positions[2], positions[3], positions[4], positions[5]) || this;
+	            }
+	            catch (e_1_1) { e_1 = { error: e_1_1 }; }
+	            finally {
+	                try {
+	                    if (pos_1_1 && !pos_1_1.done && (_a = pos_1.return)) _a.call(pos_1);
 	                }
+	                finally { if (e_1) throw e_1.error; }
 	            }
 	        }
-	        return _this;
-	    }
-	    /**
-	     * Clones a bounding box.
-	     * @param boundingBox The bounding box to clone.
-	     */
-	    BoundingBox.fromBoundingBox = function (boundingBox) {
-	        var west = BoundingBox.getWest(boundingBox);
-	        var south = BoundingBox.getSouth(boundingBox);
-	        var east = BoundingBox.getEast(boundingBox);
-	        var north = BoundingBox.getNorth(boundingBox);
-	        return new BoundingBox([west, south, east, north]);
+	        else if (geoType === "MultiPolygon") {
+	            var pos = positions;
+	            try {
+	                for (var pos_2 = __values(pos), pos_2_1 = pos_2.next(); !pos_2_1.done; pos_2_1 = pos_2.next()) {
+	                    var p1 = pos_2_1.value;
+	                    // only need to check the exterior ring of Polygon
+	                    bbox = BoundingBox.merge(bbox, BoundingBox.fromPositions(p1[0]));
+	                }
+	            }
+	            catch (e_2_1) { e_2 = { error: e_2_1 }; }
+	            finally {
+	                try {
+	                    if (pos_2_1 && !pos_2_1.done && (_b = pos_2.return)) _b.call(pos_2);
+	                }
+	                finally { if (e_2) throw e_2.error; }
+	            }
+	        }
+	        return bbox;
 	    };
 	    /**
-	     * Constructs a BoundingBox from the specified dimensions.
-	     * @param center The center position of the bounding box.
-	     * @param width The width of the bounding box.
-	     * @param height The height of the bounding box.
+	     * Gets the coordinates of the shape.
 	     */
-	    BoundingBox.fromDimensions = function (center, width, height) {
-	        var lon = center[0];
-	        var lat = center[1];
-	        var north = Math.min(Math.max(lat + height / 2, -85.5), 85.5);
-	        var south = Math.min(Math.max(lat - height / 2, -85.5), 85.5);
-	        var east = normalizeLongitude(lon + width / 2);
-	        var west = normalizeLongitude(lon - width / 2);
-	        return new BoundingBox([west, south, east, north]);
+	    Shape.prototype.getCoordinates = function () {
+	        return cloneDeep_1(this.data.geometry.coordinates);
 	    };
 	    /**
-	     * Constructs a BoundingBox from the specified edges.
-	     * @param west The west edge of the bounding box.
-	     * @param south The south edge of the bounding box.
-	     * @param east The east edge of the bounding box.
-	     * @param north The north edge of the bounding box.
+	     * If the shape is a circle, this gets its coordinates. Otherwise returns null.
 	     */
-	    BoundingBox.fromEdges = function (west, south, east, north) {
-	        return new BoundingBox([west, south, east, north]);
+	    Shape.prototype.getCircleCoordinates = function () {
+	        if (this.circlePolygon) {
+	            return cloneDeep_1(this.circlePolygon.geometry.coordinates[0]);
+	        }
+	        else {
+	            return null;
+	        }
+	    };
+	    /**
+	     * Gets the id of the shape.
+	     */
+	    Shape.prototype.getId = function () {
+	        return this.data.id;
+	    };
+	    /**
+	     * Gets the properties of the shape.
+	     */
+	    Shape.prototype.getProperties = function () {
+	        return cloneDeep_1(this.data.properties);
+	    };
+	    /**
+	     * Returns a string indicating the type of geometry this shape contains.
+	     */
+	    Shape.prototype.getType = function () {
+	        return this.data.geometry.type;
+	    };
+	    /**
+	     * Indicates if the contained shape is a Circle, defined by the extended GeoJSON specification supported by Azure Maps.
+	     * [Extended Spec]{@link https://docs.microsoft.com/en-us/azure/azure-maps/extend-geojson}
+	     */
+	    Shape.prototype.isCircle = function () {
+	        return Shape._isCircle(this.data);
+	    };
+	    /**
+	     * Indicates if the contained shape is a Rectangle, defined by the extended GeoJSON specification supported by Azure Maps.
+	     * [Extended Spec]{@link https://docs.microsoft.com/en-us/azure/azure-maps/extend-geojson}
+	     */
+	    Shape.prototype.isRectangle = function () {
+	        return Shape._isRectangle(this.data);
+	    };
+	    /**
+	     * Updates the coordinates of the shape
+	     * @param coords Point: Position, LineString: Position[], Polygon: Position[][],
+	     * MultiPoint: Position[], MultiLineString: Position[][], MultiPolygon: Position[][]
+	     */
+	    Shape.prototype.setCoordinates = function (coords) {
+	        // If a Position[] is supplied for a polygon wrap it in an array.
+	        var newCoords;
+	        if (this.getType() === "Polygon" &&
+	            Position._getDimensions(coords) === 1) {
+	            newCoords = [coords];
+	        }
+	        else {
+	            newCoords = coords;
+	        }
+	        // Only update the coordinates if they've actually changed.
+	        if (!isEqual_1(this.data.geometry.coordinates, newCoords)) {
+	            this.data.geometry.coordinates = cloneDeep_1(newCoords);
+	            this._handleCircle();
+	            if (this.dataSource) {
+	                this.dataSource._updateSource();
+	            }
+	            this._invokeEvent("shapechanged", this);
+	        }
+	    };
+	    /**
+	     * Sets the properties on the shape. Overwrites all existing properties.
+	     * @param properties
+	     */
+	    Shape.prototype.setProperties = function (properties) {
+	        // Assign the feature's id to another property to workaround the Mapbox bug
+	        // that prevents non-numerical ids from being returned by some functions.
+	        // TODO Remove once this issue if fixed. https://github.com/mapbox/mapbox-gl-js/issues/2716
+	        properties[Shape._shapeIdPropName] = this.data.id;
+	        // Only update the properties if they've actually changed.
+	        if (!isEqual_1(this.data.properties, properties)) {
+	            this.data.properties = cloneDeep_1(properties);
+	            this._handleCircle();
+	            if (this.dataSource) {
+	                this.dataSource._updateSource();
+	            }
+	            this._invokeEvent("shapechanged", this);
+	        }
+	    };
+	    /**
+	     * Returns a GeoJSON feature that represents the shape.
+	     */
+	    Shape.prototype.toJson = function () {
+	        return JSON.parse(JSON.stringify(this.data));
+	    };
+	    /**
+	     * Just like the toJson() function but will return a polygon feature
+	     * for any circles as defined by the extended GeoJSON spec.
+	     * [Extended Spec]{@link https://docs.microsoft.com/en-us/azure/azure-maps/extend-geojson}
+	     * @internal
+	     */
+	    Shape.prototype._toJson = function () {
+	        return this.circlePolygon || this.data;
+	    };
+	    /**
+	     * @internal
+	     */
+	    Shape.prototype._setDataSource = function (dataSource) {
+	        if (dataSource === undefined || dataSource == null) {
+	            delete this.dataSource;
+	        }
+	        else {
+	            this.dataSource = dataSource;
+	        }
+	    };
+	    /**
+	     * Check if the shape's wrapped feature is a circle form the extended GeoJSON spec.
+	     * If so it will calculate a polygon feature that approximates the specified circle.
+	     * @private
+	     */
+	    Shape.prototype._handleCircle = function () {
+	        if (this.isCircle()) {
+	            var coords = Shape._getCirclePositions(this.data);
+	            this.circlePolygon = new Feature(new Polygon([coords]), this.data.properties, this.data.id);
+	            // Set the subType to "Circle" to make sure the case is correct.
+	            this.data.properties.subType = "Circle";
+	        }
+	        else {
+	            delete this.circlePolygon;
+	        }
+	    };
+	    /**
+	     * Indicates if the specified feature is a circle, defined by the extended GeoJSON specification supported by Azure Maps.
+	     * [Extended Spec]{@link https://docs.microsoft.com/en-us/azure/azure-maps/extend-geojson}
+	     * @internal
+	     */
+	    Shape._isCircle = function (data) {
+	        return data && data.geometry &&
+	            data.geometry.type === "Point" &&
+	            data.geometry.coordinates && data.properties &&
+	            typeof data.properties.subType === "string" &&
+	            data.properties.subType.toLowerCase() === "circle" &&
+	            typeof data.properties.radius === "number";
+	    };
+	    /**
+	     * Indicates if the specified feature is a rectangle, defined by the extended GeoJSON specification supported by Azure Maps.
+	     * [Extended Spec]{@link https://docs.microsoft.com/en-us/azure/azure-maps/extend-geojson}
+	     * @internal
+	     */
+	    Shape._isRectangle = function (data) {
+	        if (data.geometry.type === "Polygon" &&
+	            data.geometry.coordinates &&
+	            typeof data.properties.subType === "string" &&
+	            data.properties.subType.toLowerCase() === "rectangle") {
+	            // If type is Polygon we can assume the coordinates are a Position[][].
+	            var coords = data.geometry.coordinates;
+	            if (coords.length === 1) {
+	                var ring = coords[0];
+	                if (ring.length === 5) {
+	                    return ring[0][0] === ring[4][0] &&
+	                        ring[0][1] === ring[4][1];
+	                }
+	                else if (ring.length === 4) {
+	                    return true;
+	                }
+	            }
+	        }
+	        return false;
+	    };
+	    /**
+	     * Calculates to positions that should be used to approximate the specified circle feature.
+	     * @internal
+	     */
+	    Shape._getCirclePositions = function (data) {
+	        return getRegularPolygonPath(data.geometry.coordinates, data.properties.radius, 72, "meters");
+	    };
+	    /**
+	     * Represents the feature property name that the shape's id will be assigned to.
+	     * This is a workaround for the Mapbox bug preventing non-numerical ids from being returned by some functions.
+	     * TODO Remove once this issue if fixed.
+	     * {@link https://github.com/mapbox/mapbox-gl-js/issues/2716}
+	     * @internal
+	     */
+	    // tslint:disable-next-line: variable-name
+	    Shape._shapeIdPropName = "_azureMapsShapeId";
+	    return Shape;
+	}(EventEmitter));
+
+	/**
+	 * A GeoJSON BoundingBox object - an array that defines a shape whose edges follow lines of constant longitude,
+	 * latitude, and elevation. All axes of the most southwesterly point are followed by all axes of the more northeasterly
+	 * point. The axes order of the BoundingBox follows the axes order of geometries. The full description is detailed in
+	 * [RFC 7946]{@link https://tools.ietf.org/html/rfc7946#section-5}.
+	 */
+	var BoundingBox = /** @class */ (function (_super) {
+	    __extends(BoundingBox, _super);
+	    function BoundingBox(southwestPositionOrPositions, northeastPosition) {
+	        var _this = this;
+	        if (southwestPositionOrPositions && northeastPosition) {
+	            var southwestPosition = southwestPositionOrPositions;
+	            if (southwestPosition[2] && northeastPosition[2]) {
+	                _this = _super.call(this, southwestPosition[0], southwestPosition[1], southwestPosition[2] || 0, northeastPosition[0], northeastPosition[1], northeastPosition[2] || 0) || this;
+	            }
+	            else {
+	                _this = _super.call(this, southwestPosition[0], southwestPosition[1], northeastPosition[0], northeastPosition[1]) || this;
+	            }
+	        }
+	        else if (southwestPositionOrPositions) {
+	            var positions = southwestPositionOrPositions;
+	            if (positions) {
+	                if (positions.length === 4) {
+	                    // [west, south, east, north]
+	                    _this = _super.call(this, positions[0], positions[1], positions[2], positions[3]) || this;
+	                }
+	                else if (positions.length >= 6) {
+	                    // [west, south, elevation1, east, north, elevation2]
+	                    _this = _super.call(this, positions[0], positions[1], positions[2], positions[3], positions[4], positions[5]) || this;
+	                }
+	            }
+	        }
+	        return _this;
+	    }
+	    /**
+	     * Clones a bounding box.
+	     * @param boundingBox The bounding box to clone.
+	     */
+	    BoundingBox.fromBoundingBox = function (boundingBox) {
+	        var west = BoundingBox.getWest(boundingBox);
+	        var south = BoundingBox.getSouth(boundingBox);
+	        var east = BoundingBox.getEast(boundingBox);
+	        var north = BoundingBox.getNorth(boundingBox);
+	        return new BoundingBox([west, south, east, north]);
+	    };
+	    /**
+	     * Constructs a BoundingBox from the specified dimensions.
+	     * @param center The center position of the bounding box.
+	     * @param width The width of the bounding box.
+	     * @param height The height of the bounding box.
+	     */
+	    BoundingBox.fromDimensions = function (center, width, height) {
+	        var lon = center[0];
+	        var lat = center[1];
+	        var north = Math.min(Math.max(lat + height / 2, -85.5), 85.5);
+	        var south = Math.min(Math.max(lat - height / 2, -85.5), 85.5);
+	        var east = normalizeLongitude(lon + width / 2);
+	        var west = normalizeLongitude(lon - width / 2);
+	        return new BoundingBox([west, south, east, north]);
+	    };
+	    /**
+	     * Constructs a BoundingBox from the specified edges.
+	     * @param west The west edge of the bounding box.
+	     * @param south The south edge of the bounding box.
+	     * @param east The east edge of the bounding box.
+	     * @param north The north edge of the bounding box.
+	     */
+	    BoundingBox.fromEdges = function (west, south, east, north) {
+	        return new BoundingBox([west, south, east, north]);
 	    };
 	    /**
 	     * Determines if a position is within a bounding box.
@@ -52188,7 +51863,7 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 
 
 
-	var index$1 = /*#__PURE__*/Object.freeze({
+	var index$2 = /*#__PURE__*/Object.freeze({
 		__proto__: null,
 		Feature: Feature,
 		FeatureCollection: FeatureCollection,
@@ -52203,444 +51878,103 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 		GeometryCollection: GeometryCollection
 	});
 
-	var arrayPoints = createCommonjsModule(function (module, exports) {
-	exports.__esModule = true;
-	function getAddedSquaresAP(dx, dy) {
-	    return dx * dx + dy * dy;
-	}
-	function getSqDistAP(p1, p2) {
-	    return getAddedSquaresAP(p1[0] - p2[0], p1[1] - p2[1]);
-	}
-	function getSqSegDistAP(p, p1, p2) {
-	    var x = p1[0], y = p1[1], dx = p2[0] - x, dy = p2[1] - y;
-	    if (dx !== 0 || dy !== 0) {
-	        var t = ((p[0] - x) * dx + (p[1] - y) * dy) / getAddedSquaresAP(dx, dy);
-	        if (t > 1) {
-	            x = p2[0];
-	            y = p2[1];
-	        }
-	        else if (t > 0) {
-	            x += dx * t;
-	            y += dy * t;
-	        }
-	    }
-	    return getAddedSquaresAP(p[0] - x, p[1] - y);
-	}
-	function simplifyRadialDistAP(points, sqTolerance) {
-	    var prevPoint = points[0], point;
-	    var newPoints = [prevPoint];
-	    for (var i = 1, len = points.length; i < len; i++) {
-	        point = points[i];
-	        if (getSqDistAP(point, prevPoint) > sqTolerance) {
-	            newPoints.push(point);
-	            prevPoint = point;
-	        }
-	    }
-	    if (prevPoint !== point) {
-	        newPoints.push(point);
-	    }
-	    return newPoints;
-	}
-	function simplifyDPStepAP(points, first, last, sqTolerance, simplified) {
-	    var maxSqDist = sqTolerance, index;
-	    for (var i = first + 1; i < last; i++) {
-	        var sqDist = getSqSegDistAP(points[i], points[first], points[last]);
-	        if (sqDist > maxSqDist) {
-	            index = i;
-	            maxSqDist = sqDist;
-	        }
-	    }
-	    if (maxSqDist > sqTolerance) {
-	        if (index - first > 1) {
-	            simplifyDPStepAP(points, first, index, sqTolerance, simplified);
-	        }
-	        simplified.push(points[index]);
-	        if (last - index > 1) {
-	            simplifyDPStepAP(points, index, last, sqTolerance, simplified);
-	        }
-	    }
-	}
-	function simplifyDouglasPeuckerAP(points, sqTolerance) {
-	    var last = points.length - 1;
-	    var simplified = [points[0]];
-	    simplifyDPStepAP(points, 0, last, sqTolerance, simplified);
-	    simplified.push(points[last]);
-	    return simplified;
-	}
-	function SimplifyAP(points, tolerance, highestQuality) {
-	    if (tolerance === void 0) { tolerance = 1; }
-	    if (highestQuality === void 0) { highestQuality = false; }
-	    if (points.length <= 2) {
-	        return points;
-	    }
-	    var sqTolerance = tolerance * tolerance;
-	    points = highestQuality ? points : simplifyRadialDistAP(points, sqTolerance);
-	    points = simplifyDouglasPeuckerAP(points, sqTolerance);
-	    return points;
-	}
-	exports.SimplifyAP = SimplifyAP;
-	});
-
-	unwrapExports(arrayPoints);
-	var arrayPoints_1 = arrayPoints.SimplifyAP;
-
 	/**
-	 * Perform a Douglas-Peucker simplification on an array of positions or pixels.
-	 * @param points The position or pixel points to simplify.
-	 * @param tolerance A tolerance to use in the simplification.
-	 * @returns A new array of the simplified set of points.
+	 * The options for a ZoomControl object.
 	 */
-	function simplify(points, tolerance) {
-	    //Perform a Douglas-Peucker simplification of the pixels.
-	    return arrayPoints_1(points, tolerance, true);
-	}
+	var ZoomControlOptions = /** @class */ (function (_super) {
+	    __extends(ZoomControlOptions, _super);
+	    function ZoomControlOptions() {
+	        var _this = _super !== null && _super.apply(this, arguments) || this;
+	        /**
+	         * The extent to which the map will zoom with each click of the control.
+	         * Default `1`.
+	         * @default 1
+	         */
+	        _this.zoomDelta = 1;
+	        /**
+	         * The style of the control.
+	         * Default `ControlStyle.light`.
+	         * @default ControlStyle.light
+	         */
+	        _this.style = exports.ControlStyle.light;
+	        return _this;
+	    }
+	    return ZoomControlOptions;
+	}(Options));
 
 	/**
-	 * An Affine Transform class generated from a set of reference points.
+	 * A control for changing the zoom of the map.
 	 */
-	var AffineTransform = /** @class */ (function () {
+	var ZoomControl = /** @class */ (function (_super) {
+	    __extends(ZoomControl, _super);
 	    /**
-	     * An Affine Transform class generated from a set of reference points.
-	     * @param source A set of reference points from the source reference system to transform from.
-	     * @param target A set of reference points from the target reference system to transform to.
+	     * Constructs a ZoomControl.
+	     * @param options The options for the control.
 	     */
-	    function AffineTransform(source, target) {
-	        this.M = AffineTransform._calculateAffineTransform(source, target);
-	        this.inverseM = AffineTransform._calculateAffineTransform(target, source);
+	    function ZoomControl(options) {
+	        var _this = _super.call(this) || this;
+	        _this.container = null;
+	        _this.zoomInButton = null;
+	        _this.zoomOutButton = null;
+	        _this.zoomChanged = function (event) { return _this.updateZoomButtonsState(); };
+	        _this.minZoomChanged = function (zoom) { return _this.updateZoomButtonsState(); };
+	        _this.maxZoomChanged = function (zoom) { return _this.updateZoomButtonsState(); };
+	        _this.options = new ZoomControlOptions().merge(options);
+	        return _this;
 	    }
 	    /**
-	     * Converts an array of points from the source reference system to the target reference system.
-	     * @param sourcePoints An array of points from the source reference system to transform.
-	     * @param decimals Number of decimal places to round the results off to.
-	     * @returns An array of points that have been transformed to the target reference system.
+	     * Initialization method for the control which is called when added to the map.
+	     * @param map The map that the control will be added to.
+	     * @return An HTMLElement to be placed on the map for the control.
 	     */
-	    AffineTransform.prototype.toTarget = function (sourcePoints, decimals) {
-	        if (typeof sourcePoints !== undefined) {
-	            return this.transformArray(sourcePoints, this.M, decimals);
-	        }
-	        throw new Error("Invalid sourcePoints specified.");
+	    ZoomControl.prototype.onAdd = function (map) {
+	        this.container = this.buildContainer(map, this.options.style, "Zoom Control");
+	        this.container.style.flexDirection = "column";
+	        this.zoomInButton = this.constructZoomInButton(map);
+	        this.zoomOutButton = this.constructZoomOutButton(map);
+	        var tooltipZoomIn = buildAccessibleTooltip("Zoom In");
+	        var tooltipZoomOut = buildAccessibleTooltip("Zoom Out");
+	        this.container.appendChild(this.zoomInButton);
+	        this.container.appendChild(tooltipZoomIn);
+	        this.container.appendChild(this.zoomOutButton);
+	        this.container.appendChild(tooltipZoomOut);
+	        positionTooltip(tooltipZoomIn, this.zoomInButton);
+	        positionTooltip(tooltipZoomOut, this.zoomOutButton);
+	        map.events.add('zoom', this.zoomChanged);
+	        map.events.add('minzoomchanged', this.minZoomChanged);
+	        map.events.add('maxzoomchanged', this.maxZoomChanged);
+	        this.map = map;
+	        return this.container;
 	    };
-	    /**
-	     * Converts an array of points from the target reference system to the source reference system.
-	     * @param targetPoints An array of points from the target reference system to transform.
-	     * @param decimals Number of decimal places to round the results off to.
-	     * @returns An array of points that have been transformed to the source reference system.
-	     */
-	    AffineTransform.prototype.toSource = function (targetPoints, decimals) {
-	        if (typeof targetPoints !== undefined) {
-	            return this.transformArray(targetPoints, this.inverseM, decimals);
+	    ZoomControl.prototype.onRemove = function () {
+	        if (this.map) {
+	            this.map.events.remove('zoom', this.zoomChanged);
+	            this.map.events.remove('minzoomchanged', this.minZoomChanged);
+	            this.map.events.remove('maxzoomchanged', this.maxZoomChanged);
+	            this.map = null;
 	        }
-	        throw new Error("Invalid targetPoints specified.");
-	    };
-	    /**
-	     * Applies a transform matrix over a set of points and optionally rounds off the values to a specified number of decimals.
-	     * @param points The array of points to transform.
-	     * @param transformMatrix The transform matrix to apply.
-	     * @param decimals The number of decimals to round each calculated point value off to.
-	     * @returns An array of points that have been transformed.
-	     */
-	    AffineTransform.prototype.transformArray = function (points, transformMatrix, decimals) {
-	        var e_1, _a;
-	        if (points && Array.isArray(points) && Array.isArray(points[0])) {
-	            var pos = [];
-	            try {
-	                for (var points_1 = __values(points), points_1_1 = points_1.next(); !points_1_1.done; points_1_1 = points_1.next()) {
-	                    var subPoints = points_1_1.value;
-	                    pos.push(this.transform(subPoints, transformMatrix, decimals));
-	                }
-	            }
-	            catch (e_1_1) { e_1 = { error: e_1_1 }; }
-	            finally {
-	                try {
-	                    if (points_1_1 && !points_1_1.done && (_a = points_1.return)) _a.call(points_1);
-	                }
-	                finally { if (e_1) throw e_1.error; }
-	            }
-	            return pos;
+	        if (this.container) {
+	            this.container.remove();
+	            this.container = null;
+	            this.zoomInButton = null;
+	            this.zoomOutButton = null;
 	        }
-	        return null;
-	    };
-	    /**
-	     * Applies a transform matrix on a point and optionally rounds off the values to a specified number of decimals.
-	     * @param point The point to transform.
-	     * @param transformMatrix The transform matrix to apply.
-	     * @param decimals The number of decimals to round each calculated point value off to.
-	     * @returns An array of points that have been transformed.
-	     */
-	    AffineTransform.prototype.transform = function (point, transformMatrix, decimals) {
-	        var x = point[0] * transformMatrix[0][3] + point[1] * transformMatrix[1][3] + transformMatrix[2][3];
-	        var y = point[0] * transformMatrix[0][4] + point[1] * transformMatrix[1][4] + transformMatrix[2][4];
-	        return typeof decimals === "number" && decimals >= 0 ?
-	            [_precision(x, decimals), _precision(y, decimals)] :
-	            [_precision(x, 6), _precision(y, 6)];
 	    };
-	    /**
-	     * Takes in a set of source and target points can calculates an approximate Affine Transform matrix that best fits the data.
-	     * Modified version of this code: https://github.com/commenthol/affinefit
-	     * @param sourcePoints A set of source points to transform from.
-	     * @param targetPoints A set of target points to transform to.
-	     * @returns An Affine Tranform matrix.
-	     */
-	    AffineTransform._calculateAffineTransform = function (sourcePoints, targetPoints) {
-	        if (sourcePoints.length !== targetPoints.length || sourcePoints.length < 1) {
-	            throw new Error("Error: source and target arrays must have the same length.");
+	    ZoomControl.prototype.updateZoomButtonsState = function () {
+	        var zoomInDisabled = this.map.getCamera().zoom >= this.map._getMap().getMaxZoom();
+	        // small values need special handling, since depending on the height of the map view 
+	        // the actual zoom we can zoom out to can be above or below 0 when the entire map fits the height into the view
+	        // use web mercator bounds to check if entire latitude range is visible
+	        var reachedLatitudeBoundaries = BoundingBox.getSouth(this.map.getCamera().bounds) <= -WEBMERCATOR_MAXLAT
+	            && BoundingBox.getNorth(this.map.getCamera().bounds) >= WEBMERCATOR_MAXLAT;
+	        var zoomOutDisabled = this.map.getCamera().zoom <= this.map._getMap().getMinZoom() || reachedLatitudeBoundaries;
+	        if (this.zoomInButton && this.zoomInButton.disabled != zoomInDisabled) {
+	            this.zoomInButton.disabled = zoomInDisabled;
+	            this.zoomInButton.setAttribute("aria-label", zoomInDisabled ? "Zoom In disabled" : "Zoom In");
 	        }
-	        // Use the smallest dimension of the input.
-	        var dim = Math.min(sourcePoints[0].length, targetPoints[0].length);
-	        var dimPlusOne = dim + 1;
-	        if (sourcePoints.length < dim) {
-	            throw new Error("Erorr: At least " + dim + " reference points required.");
-	        }
-	        // Create an empty (dim + 1) x (dim) matrix and fill it.
-	        var c = [];
-	        var transformMatrix = [];
-	        for (var i = 0; i < dimPlusOne; i++) {
-	            transformMatrix[i] = [];
-	            for (var j = 0; j < dimPlusOne; j++) {
-	                if (j < dim) {
-	                    c[j] = 0;
-	                }
-	                transformMatrix[i][j] = 0;
-	                for (var k = 0; k < sourcePoints.length; k++) {
-	                    if (j < dim) {
-	                        if (i < dim) {
-	                            c[j] += sourcePoints[k][i] * targetPoints[k][j];
-	                        }
-	                        else {
-	                            c[j] += targetPoints[k][j];
-	                        }
-	                    }
-	                    if (i >= dim && j >= dim) {
-	                        transformMatrix[i][j] += 1;
-	                    }
-	                    else if (i >= dim) {
-	                        transformMatrix[i][j] += sourcePoints[k][j];
-	                    }
-	                    else if (j >= dim) {
-	                        transformMatrix[i][j] += sourcePoints[k][i];
-	                    }
-	                    else {
-	                        transformMatrix[i][j] += sourcePoints[k][i] * sourcePoints[k][j];
-	                    }
-	                }
-	            }
-	            transformMatrix[i] = transformMatrix[i].concat(c);
-	        }
-	        if (!this._gaussJordanElimination(transformMatrix)) {
-	            throw new Error("Error: Singular matrix. Points are likely coplanar.");
-	        }
-	        return transformMatrix;
-	    };
-	    /**
-	     * Puts a given matrix (2D array) into the Reduced Row Echelon Form.
-	     * Returns True if successful, False if the transformMatrix is singular.
-	     * Code from: https://github.com/commenthol/affinefit
-	     * Modification:
-	     * 1. Updated epsilon from 1e-10 to 1e-12 to reduce the possibility of valid matrix detected as singular
-	     *    (can happen when points to convert are too close to each other on high LODs)
-	     */
-	    AffineTransform._gaussJordanElimination = function (transformMatrix) {
-	        var eps = 1e-12; // 1.0 / Math.pow(10, 12)
-	        var dimPlusOne = transformMatrix.length;
-	        var w = 2 * dimPlusOne - 1;
-	        var tempNum;
-	        var tempArray;
-	        for (var j = 0; j < dimPlusOne; j++) {
-	            var maxrow = j;
-	            for (var i = j + 1; i < dimPlusOne; i++) {
-	                // Find max pivot.
-	                if (Math.abs(transformMatrix[i][j]) > Math.abs(transformMatrix[maxrow][j])) {
-	                    maxrow = i;
-	                }
-	            }
-	            tempArray = transformMatrix[maxrow];
-	            transformMatrix[maxrow] = transformMatrix[j];
-	            transformMatrix[j] = tempArray;
-	            if (Math.abs(transformMatrix[j][j]) <= eps) {
-	                // Is Singular?
-	                return false;
-	            }
-	            for (var _j = j + 1; _j < dimPlusOne; _j++) {
-	                // Eliminate column y.
-	                tempNum = transformMatrix[_j][j] / transformMatrix[j][j];
-	                for (var _i = j; _i < w; _i++) {
-	                    transformMatrix[_j][_i] -= transformMatrix[j][_i] * tempNum;
-	                }
-	            }
-	        }
-	        for (var j = dimPlusOne - 1; j > -1; j--) {
-	            // Backsubstitute.
-	            tempNum = transformMatrix[j][j];
-	            for (var i = 0; i < j; i++) {
-	                for (var _x = w - 1; _x > j - 1; _x--) {
-	                    transformMatrix[i][_x] -= transformMatrix[j][_x] * transformMatrix[i][j] / tempNum;
-	                }
-	            }
-	            transformMatrix[j][j] /= tempNum;
-	            for (var _x2 = dimPlusOne; _x2 < w; _x2++) {
-	                // Normalize row y.
-	                transformMatrix[j][_x2] /= tempNum;
-	            }
-	        }
-	        return true;
-	    };
-	    return AffineTransform;
-	}());
-
-
-
-	var index$2 = /*#__PURE__*/Object.freeze({
-		__proto__: null,
-		AffineTransform: AffineTransform,
-		WEBMERCATOR_MAXLAT: WEBMERCATOR_MAXLAT,
-		_precision: _precision,
-		get AreaUnits () { return AreaUnits; },
-		get DistanceUnits () { return DistanceUnits; },
-		get TimeUnits () { return TimeUnits; },
-		get SpeedUnits () { return SpeedUnits; },
-		get AccelerationUnits () { return AccelerationUnits; },
-		boundingBoxToPolygon: boundingBoxToPolygon,
-		convertDistance: convertDistance,
-		getCardinalSpline: getCardinalSpline,
-		getDestination: getDestination,
-		getDistanceTo: getDistanceTo,
-		getEarthRadius: getEarthRadius,
-		getPathDenormalizedAtAntimerian: getPathDenormalizedAtAntimerian,
-		getPathSplitByAntimeridian: getPathSplitByAntimeridian,
-		getGeodesicPath: getGeodesicPath,
-		getGeodesicPaths: getGeodesicPaths,
-		getHeading: getHeading,
-		getLengthOfPath: getLengthOfPath,
-		getPositionAlongPath: getPositionAlongPath,
-		getRegularPolygonPath: getRegularPolygonPath,
-		getRegularPolygonPaths: getRegularPolygonPaths,
-		interpolate: interpolate,
-		normalizeLatitude: normalizeLatitude,
-		normalizeLongitude: normalizeLongitude,
-		rotatePositions: rotatePositions,
-		getPixelHeading: getPixelHeading,
-		mercatorPixelsToPositions: mercatorPixelsToPositions,
-		mercatorPositionsToPixels: mercatorPositionsToPixels,
-		convertAcceleration: convertAcceleration,
-		convertArea: convertArea,
-		convertSpeed: convertSpeed,
-		convertTimespan: convertTimespan,
-		getAcceleration: getAcceleration,
-		getAccelerationFromSpeeds: getAccelerationFromSpeeds,
-		getAccelerationFromFeatures: getAccelerationFromFeatures,
-		getArea: getArea,
-		getSpeed: getSpeed,
-		getSpeedFromFeatures: getSpeedFromFeatures,
-		getTimespan: getTimespan,
-		getTravelDistance: getTravelDistance,
-		parseTimestamp: parseTimestamp,
-		getConvexHull: getConvexHull,
-		getPositions: getPositions,
-		getPosition: getPosition,
-		getPositionsAlongPath: getPositionsAlongPath,
-		getPointWithHeadingAlongPath: getPointWithHeadingAlongPath,
-		getPointsWithHeadingsAlongPath: getPointsWithHeadingsAlongPath,
-		getClosestPointOnGeometry: getClosestPointOnGeometry,
-		simplify: simplify
-	});
-
-	/**
-	 * The options for a ZoomControl object.
-	 */
-	var ZoomControlOptions = /** @class */ (function (_super) {
-	    __extends(ZoomControlOptions, _super);
-	    function ZoomControlOptions() {
-	        var _this = _super !== null && _super.apply(this, arguments) || this;
-	        /**
-	         * The extent to which the map will zoom with each click of the control.
-	         * Default `1`.
-	         * @default 1
-	         */
-	        _this.zoomDelta = 1;
-	        /**
-	         * The style of the control.
-	         * Default `ControlStyle.light`.
-	         * @default ControlStyle.light
-	         */
-	        _this.style = exports.ControlStyle.light;
-	        return _this;
-	    }
-	    return ZoomControlOptions;
-	}(Options));
-
-	/**
-	 * A control for changing the zoom of the map.
-	 */
-	var ZoomControl = /** @class */ (function (_super) {
-	    __extends(ZoomControl, _super);
-	    /**
-	     * Constructs a ZoomControl.
-	     * @param options The options for the control.
-	     */
-	    function ZoomControl(options) {
-	        var _this = _super.call(this) || this;
-	        _this.container = null;
-	        _this.zoomInButton = null;
-	        _this.zoomOutButton = null;
-	        _this.zoomChanged = function (event) { return _this.updateZoomButtonsState(); };
-	        _this.minZoomChanged = function (zoom) { return _this.updateZoomButtonsState(); };
-	        _this.maxZoomChanged = function (zoom) { return _this.updateZoomButtonsState(); };
-	        _this.options = new ZoomControlOptions().merge(options);
-	        return _this;
-	    }
-	    /**
-	     * Initialization method for the control which is called when added to the map.
-	     * @param map The map that the control will be added to.
-	     * @return An HTMLElement to be placed on the map for the control.
-	     */
-	    ZoomControl.prototype.onAdd = function (map) {
-	        this.container = this.buildContainer(map, this.options.style, "Zoom Control");
-	        this.container.style.flexDirection = "column";
-	        this.zoomInButton = this.constructZoomInButton(map);
-	        this.zoomOutButton = this.constructZoomOutButton(map);
-	        var tooltipZoomIn = buildAccessibleTooltip("Zoom In");
-	        var tooltipZoomOut = buildAccessibleTooltip("Zoom Out");
-	        this.container.appendChild(this.zoomInButton);
-	        this.container.appendChild(tooltipZoomIn);
-	        this.container.appendChild(this.zoomOutButton);
-	        this.container.appendChild(tooltipZoomOut);
-	        positionTooltip(tooltipZoomIn, this.zoomInButton);
-	        positionTooltip(tooltipZoomOut, this.zoomOutButton);
-	        map.events.add('zoom', this.zoomChanged);
-	        map.events.add('minzoomchanged', this.minZoomChanged);
-	        map.events.add('maxzoomchanged', this.maxZoomChanged);
-	        this.map = map;
-	        return this.container;
-	    };
-	    ZoomControl.prototype.onRemove = function () {
-	        if (this.map) {
-	            this.map.events.remove('zoom', this.zoomChanged);
-	            this.map.events.remove('minzoomchanged', this.minZoomChanged);
-	            this.map.events.remove('maxzoomchanged', this.maxZoomChanged);
-	            this.map = null;
-	        }
-	        if (this.container) {
-	            this.container.remove();
-	            this.container = null;
-	            this.zoomInButton = null;
-	            this.zoomOutButton = null;
-	        }
-	    };
-	    ZoomControl.prototype.updateZoomButtonsState = function () {
-	        var zoomInDisabled = this.map.getCamera().zoom >= this.map._getMap().getMaxZoom();
-	        // small values need special handling, since depending on the height of the map view 
-	        // the actual zoom we can zoom out to can be above or below 0 when the entire map fits the height into the view
-	        // use web mercator bounds to check if entire latitude range is visible
-	        var reachedLatitudeBoundaries = BoundingBox.getSouth(this.map.getCamera().bounds) <= -WEBMERCATOR_MAXLAT
-	            && BoundingBox.getNorth(this.map.getCamera().bounds) >= WEBMERCATOR_MAXLAT;
-	        var zoomOutDisabled = this.map.getCamera().zoom <= this.map._getMap().getMinZoom() || reachedLatitudeBoundaries;
-	        if (this.zoomInButton && this.zoomInButton.disabled != zoomInDisabled) {
-	            this.zoomInButton.disabled = zoomInDisabled;
-	            this.zoomInButton.setAttribute("aria-label", zoomInDisabled ? "Zoom In disabled" : "Zoom In");
-	        }
-	        if (this.zoomOutButton && this.zoomOutButton.disabled != zoomOutDisabled) {
-	            this.zoomOutButton.disabled = zoomOutDisabled;
-	            this.zoomInButton.setAttribute("aria-label", zoomInDisabled ? "Zoom Out disabled" : "Zoom Out");
+	        if (this.zoomOutButton && this.zoomOutButton.disabled != zoomOutDisabled) {
+	            this.zoomOutButton.disabled = zoomOutDisabled;
+	            this.zoomInButton.setAttribute("aria-label", zoomInDisabled ? "Zoom Out disabled" : "Zoom Out");
 	        }
 	    };
 	    ZoomControl.prototype.constructZoomInButton = function (map) {
@@ -54855,12 +54189,6 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	         * @default false
 	         */
 	        _this.optional = false;
-	        /**
-	         * Size of the additional area around the icon bounding box used for detecting symbol collisions.
-	         * Default `2`.
-	         * @default 2
-	         */
-	        _this.padding = 2;
 	        /**
 	         * Specifies the orientation of the icon when the map is pitched.
 	         * <p>`"auto"`: Automatically matches the value of `rotationAlignment`.</p>
@@ -54959,16 +54287,6 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	         * @default false
 	         */
 	        _this.ignorePlacement = false;
-	        /**
-	         * Text justification options.
-	         * <p>`"auto"`: The text is aligned towards the anchor position.
-	         * <p>`"left"`: The text is aligned to the left.
-	         * <p>`"center"`: The text is centered.
-	         * <p>`"right"`: The text is aligned to the right.
-	         * Default `"center"`.
-	         * @default "center"
-	         */
-	        _this.justify = "center";
 	        /**
 	         * Specifies an offset distance of the icon from its anchor in ems.
 	         * Positive values indicate right and down, while negative values indicate left and up.
@@ -54984,13 +54302,6 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	         * @default false
 	         */
 	        _this.optional = false;
-	        /**
-	         * Size of the additional area around the text bounding box used for detecting
-	         * symbol collisions.
-	         * Default `2`.
-	         * @default 2
-	         */
-	        _this.padding = 2;
 	        /**
 	         * Specifies the orientation of the text when the map is pitched.
 	         * <p>`"auto"`: Automatically matches the value of `rotationAlignment`.</p>
@@ -55102,19 +54413,6 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	         * @default "point"
 	         */
 	        _this.placement = "point";
-	        /**
-	         * Determines whether overlapping symbols in the same layer are rendered in the order
-	         * that they appear in the data source, or by their y position relative to the viewport.
-	         * To control the order and prioritization of symbols otherwise, use `sortKey`.
-	         * <p>`"auto"`: Sorts symbols by `sortKey` if set. Otherwise behaves like `"viewport-y"`.
-	         * <p>`"viewport-y"`: Sorts symbols by their y position if `allowOverlap` is `true` or
-	         * if `ignorePlacement` is `false`.
-	         * <p>`"source"`: Sorts symbols by `sortKey` if set. Otherwise, symbols are rendered in the
-	         * same order as the source data.
-	         * Default `"auto"`
-	         * @default "auto"
-	         */
-	        _this.zOrder = "auto";
 	        /**
 	         * Distance in pixels between two symbol anchors along a line. Must be greater or equal to 1.
 	         * Default `250`.
@@ -55172,52 +54470,39 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	                this.map.layers.add(this);
 	                return;
 	            }
-	            var thisOpts = this.options;
-	            var newIconOpts = newOptions.iconOptions;
-	            var thisIconOpts = thisOpts.iconOptions;
-	            var newTextOpts = newOptions.textOptions;
-	            var thisTextOpts = thisOpts.textOptions;
 	            // Symbol options.
-	            this._updateBaseProperties(newOptions, thisOpts);
-	            this._updateLayoutProperty("symbol-spacing", newOptions.lineSpacing, thisOpts.lineSpacing);
-	            this._updateLayoutProperty("symbol-placement", newOptions.placement, thisOpts.placement);
-	            this._updateLayoutProperty("symbol-sort-key", newOptions.sortKey, thisOpts.sortKey);
-	            // REVIEW: @types/mapboxgl-js doesn't show "auto" for "symbol-z-order"
-	            this._updateLayoutProperty("symbol-z-order", newOptions.zOrder, thisOpts.zOrder);
+	            this._updateBaseProperties(newOptions, this.options);
+	            this._updateLayoutProperty("symbol-spacing", newOptions.lineSpacing, this.options.lineSpacing);
+	            this._updateLayoutProperty("symbol-placement", newOptions.placement, this.options.placement);
 	            // Icon options.
-	            this._updateLayoutProperty("icon-allow-overlap", newIconOpts.allowOverlap, thisIconOpts.allowOverlap);
-	            this._updateLayoutProperty("icon-anchor", newIconOpts.anchor, thisIconOpts.anchor);
-	            this._updateLayoutProperty("icon-ignore-placement", newIconOpts.ignorePlacement, thisIconOpts.ignorePlacement);
-	            this._updateLayoutProperty("icon-image", newIconOpts.image, thisIconOpts.image);
-	            this._updateLayoutProperty("icon-offset", newIconOpts.offset, thisIconOpts.offset);
-	            this._updatePaintProperty("icon-opacity", newIconOpts.opacity, thisIconOpts.opacity);
-	            this._updateLayoutProperty("icon-optional", newIconOpts.optional, thisIconOpts.optional);
-	            this._updateLayoutProperty("icon-padding", newIconOpts.padding, thisIconOpts.padding);
-	            this._updateLayoutProperty("icon-pitch-alignment", newIconOpts.pitchAlignment, thisIconOpts.pitchAlignment);
-	            this._updateLayoutProperty("icon-rotate", newIconOpts.rotation, thisIconOpts.rotation);
-	            this._updateLayoutProperty("icon-rotation-alignment", newIconOpts.rotationAlignment, thisIconOpts.rotationAlignment);
-	            this._updateLayoutProperty("icon-size", newIconOpts.size, thisIconOpts.size);
+	            this._updateLayoutProperty("icon-allow-overlap", newOptions.iconOptions.allowOverlap, this.options.iconOptions.allowOverlap);
+	            this._updateLayoutProperty("icon-anchor", newOptions.iconOptions.anchor, this.options.iconOptions.anchor);
+	            this._updateLayoutProperty("icon-ignore-placement", newOptions.iconOptions.ignorePlacement, this.options.iconOptions.ignorePlacement);
+	            this._updateLayoutProperty("icon-image", newOptions.iconOptions.image, this.options.iconOptions.image);
+	            this._updateLayoutProperty("icon-offset", newOptions.iconOptions.offset, this.options.iconOptions.offset);
+	            this._updatePaintProperty("icon-opacity", newOptions.iconOptions.opacity, this.options.iconOptions.opacity);
+	            this._updateLayoutProperty("icon-optional", newOptions.iconOptions.optional, this.options.iconOptions.optional);
+	            this._updateLayoutProperty("icon-pitch-alignment", newOptions.iconOptions.pitchAlignment, this.options.iconOptions.pitchAlignment);
+	            this._updateLayoutProperty("icon-rotate", newOptions.iconOptions.rotation, this.options.iconOptions.rotation);
+	            this._updateLayoutProperty("icon-rotation-alignment", newOptions.iconOptions.rotationAlignment, this.options.iconOptions.rotationAlignment);
+	            this._updateLayoutProperty("icon-size", newOptions.iconOptions.size, this.options.iconOptions.size);
 	            // Text options.
-	            this._updateLayoutProperty("text-allow-overlap", newTextOpts.allowOverlap, thisTextOpts.allowOverlap);
-	            this._updateLayoutProperty("text-anchor", newTextOpts.anchor, thisTextOpts.anchor);
-	            this._updatePaintProperty("text-color", newTextOpts.color, thisTextOpts.color);
-	            this._updateLayoutProperty("text-font", newTextOpts.font, thisTextOpts.font);
-	            this._updateLayoutProperty("text-ignore-placement", newTextOpts.ignorePlacement, thisTextOpts.ignorePlacement);
-	            this._updateLayoutProperty("text-justify", newTextOpts.justify, thisTextOpts.justify);
-	            this._updatePaintProperty("text-halo-blur", newTextOpts.haloBlur, thisTextOpts.haloBlur);
-	            this._updatePaintProperty("text-halo-color", newTextOpts.haloColor, thisTextOpts.haloColor);
-	            this._updatePaintProperty("text-halo-width", newTextOpts.haloWidth, thisTextOpts.haloWidth);
-	            this._updateLayoutProperty("text-offset", newTextOpts.offset, thisTextOpts.offset);
-	            this._updatePaintProperty("text-opacity", newTextOpts.opacity, thisTextOpts.opacity);
-	            this._updateLayoutProperty("text-optional", newTextOpts.optional, thisTextOpts.optional);
-	            this._updateLayoutProperty("text-padding", newTextOpts.padding, thisTextOpts.padding);
-	            this._updateLayoutProperty("text-pitch-alignment", newTextOpts.pitchAlignment, thisTextOpts.pitchAlignment);
-	            this._updateLayoutProperty("text-radial-offset", newTextOpts.radialOffset, thisTextOpts.radialOffset);
-	            this._updateLayoutProperty("text-rotate", newTextOpts.rotation, thisTextOpts.rotation);
-	            this._updateLayoutProperty("text-rotation-alignment", newTextOpts.rotationAlignment, thisTextOpts.rotationAlignment);
-	            this._updateLayoutProperty("text-size", newTextOpts.size, thisTextOpts.size);
-	            this._updateLayoutProperty("text-variable-anchor", newTextOpts.variableAnchor, thisTextOpts.variableAnchor);
-	            this._updateLayoutProperty("text-field", newTextOpts.textField, thisTextOpts.textField);
+	            this._updateLayoutProperty("text-allow-overlap", newOptions.textOptions.allowOverlap, this.options.textOptions.allowOverlap);
+	            this._updateLayoutProperty("text-anchor", newOptions.textOptions.anchor, this.options.textOptions.anchor);
+	            this._updatePaintProperty("text-color", newOptions.textOptions.color, this.options.textOptions.color);
+	            this._updateLayoutProperty("text-font", newOptions.textOptions.font, this.options.textOptions.font);
+	            this._updateLayoutProperty("text-ignore-placement", newOptions.textOptions.ignorePlacement, this.options.textOptions.ignorePlacement);
+	            this._updatePaintProperty("text-halo-blur", newOptions.textOptions.haloBlur, this.options.textOptions.haloBlur);
+	            this._updatePaintProperty("text-halo-color", newOptions.textOptions.haloColor, this.options.textOptions.haloColor);
+	            this._updatePaintProperty("text-halo-width", newOptions.textOptions.haloWidth, this.options.textOptions.haloWidth);
+	            this._updateLayoutProperty("text-offset", newOptions.textOptions.offset, this.options.textOptions.offset);
+	            this._updatePaintProperty("text-opacity", newOptions.textOptions.opacity, this.options.textOptions.opacity);
+	            this._updateLayoutProperty("text-optional", newOptions.textOptions.optional, this.options.textOptions.optional);
+	            this._updateLayoutProperty("text-pitch-alignment", newOptions.textOptions.pitchAlignment, this.options.textOptions.pitchAlignment);
+	            this._updateLayoutProperty("text-rotate", newOptions.textOptions.rotation, this.options.textOptions.rotation);
+	            this._updateLayoutProperty("text-rotation-alignment", newOptions.textOptions.rotationAlignment, this.options.textOptions.rotationAlignment);
+	            this._updateLayoutProperty("text-size", newOptions.textOptions.size, this.options.textOptions.size);
+	            this._updateLayoutProperty("text-field", newOptions.textOptions.textField, this.options.textOptions.textField);
 	        }
 	        this.options = newOptions;
 	    };
@@ -55227,11 +54512,11 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	    SymbolLayer.prototype._buildLayers = function () {
 	        var layer = __assign(__assign(__assign(__assign({ id: this.id, type: "symbol" }, (this.options.sourceLayer && { "source-layer": this.options.sourceLayer })), { source: this.options.source instanceof Source ?
 	                this.options.source.getId() :
-	                this.options.source, layout: __assign(__assign({ visibility: this.options.visible ? "visible" : "none", "symbol-placement": this.options.placement, "symbol-spacing": this.options.lineSpacing, "symbol-z-order": this.options.zOrder, 
+	                this.options.source, layout: __assign(__assign({ visibility: this.options.visible ? "visible" : "none", "symbol-placement": this.options.placement, "symbol-spacing": this.options.lineSpacing, 
 	                // Text options.
-	                "text-allow-overlap": this.options.textOptions.allowOverlap, "text-anchor": this.options.textOptions.anchor }, (this.options.textOptions.textField && { "text-field": this.options.textOptions.textField })), { "text-font": this.options.textOptions.font, "text-ignore-placement": this.options.textOptions.ignorePlacement, "text-justify": this.options.textOptions.justify, "text-offset": this.options.textOptions.offset, "text-optional": this.options.textOptions.optional, "text-padding": this.options.textOptions.padding, "text-pitch-alignment": this.options.textOptions.pitchAlignment, "text-rotate": this.options.textOptions.rotation, "text-rotation-alignment": this.options.textOptions.rotationAlignment, "text-size": this.options.textOptions.size, 
+	                "text-allow-overlap": this.options.textOptions.allowOverlap, "text-anchor": this.options.textOptions.anchor }, (this.options.textOptions.textField && { "text-field": this.options.textOptions.textField })), { "text-font": this.options.textOptions.font, "text-ignore-placement": this.options.textOptions.ignorePlacement, "text-offset": this.options.textOptions.offset, "text-optional": this.options.textOptions.optional, "text-pitch-alignment": this.options.textOptions.pitchAlignment, "text-rotate": this.options.textOptions.rotation, "text-rotation-alignment": this.options.textOptions.rotationAlignment, "text-size": this.options.textOptions.size, 
 	                // Icon options.
-	                "icon-allow-overlap": this.options.iconOptions.allowOverlap, "icon-anchor": this.options.iconOptions.anchor, "icon-ignore-placement": this.options.iconOptions.ignorePlacement, "icon-image": this.options.iconOptions.image, "icon-offset": this.options.iconOptions.offset, "icon-optional": this.options.iconOptions.optional, "icon-padding": this.options.iconOptions.padding, "icon-pitch-alignment": this.options.iconOptions.pitchAlignment, "icon-rotate": this.options.iconOptions.rotation, "icon-rotation-alignment": this.options.iconOptions.rotationAlignment, "icon-size": this.options.iconOptions.size }), paint: {
+	                "icon-allow-overlap": this.options.iconOptions.allowOverlap, "icon-anchor": this.options.iconOptions.anchor, "icon-ignore-placement": this.options.iconOptions.ignorePlacement, "icon-image": this.options.iconOptions.image, "icon-offset": this.options.iconOptions.offset, "icon-optional": this.options.iconOptions.optional, "icon-pitch-alignment": this.options.iconOptions.pitchAlignment, "icon-rotate": this.options.iconOptions.rotation, "icon-rotation-alignment": this.options.iconOptions.rotationAlignment, "icon-size": this.options.iconOptions.size }), paint: {
 	                // Text options.
 	                "text-color": this.options.textOptions.color,
 	                "text-halo-blur": this.options.textOptions.haloBlur,
@@ -55241,17 +54526,6 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	                // Icon options.
 	                "icon-opacity": this.options.iconOptions.opacity,
 	            } }), (this.options.filter && { filter: this.options.filter })), { minzoom: this.options.minZoom, maxzoom: this.options.maxZoom });
-	        // REVIEW: MapLibre throws style validation error if optional properties show up in style
-	        // with null/undefined as value.
-	        if (typeof this.options.sortKey !== "undefined") {
-	            layer.layout["symbol-sort-key"] = this.options.sortKey;
-	        }
-	        if (typeof this.options.textOptions.radialOffset !== "undefined") {
-	            layer.layout["text-radial-offset"] = this.options.textOptions.radialOffset;
-	        }
-	        if (typeof this.options.textOptions.variableAnchor !== "undefined") {
-	            layer.layout["text-variable-anchor"] = this.options.textOptions.variableAnchor;
-	        }
 	        return [layer];
 	    };
 	    /**
@@ -55557,6 +54831,65 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	    return Html;
 	}());
 
+	/** `Object#toString` result references. */
+	var objectTag$4 = '[object Object]';
+
+	/** Used for built-in method references. */
+	var funcProto$2 = Function.prototype,
+	    objectProto$f = Object.prototype;
+
+	/** Used to resolve the decompiled source of functions. */
+	var funcToString$2 = funcProto$2.toString;
+
+	/** Used to check objects for own properties. */
+	var hasOwnProperty$c = objectProto$f.hasOwnProperty;
+
+	/** Used to infer the `Object` constructor. */
+	var objectCtorString = funcToString$2.call(Object);
+
+	/**
+	 * Checks if `value` is a plain object, that is, an object created by the
+	 * `Object` constructor or one with a `[[Prototype]]` of `null`.
+	 *
+	 * @static
+	 * @memberOf _
+	 * @since 0.8.0
+	 * @category Lang
+	 * @param {*} value The value to check.
+	 * @returns {boolean} Returns `true` if `value` is a plain object, else `false`.
+	 * @example
+	 *
+	 * function Foo() {
+	 *   this.a = 1;
+	 * }
+	 *
+	 * _.isPlainObject(new Foo);
+	 * // => false
+	 *
+	 * _.isPlainObject([1, 2, 3]);
+	 * // => false
+	 *
+	 * _.isPlainObject({ 'x': 0, 'y': 0 });
+	 * // => true
+	 *
+	 * _.isPlainObject(Object.create(null));
+	 * // => true
+	 */
+	function isPlainObject(value) {
+	  if (!isObjectLike_1(value) || _baseGetTag(value) != objectTag$4) {
+	    return false;
+	  }
+	  var proto = _getPrototype(value);
+	  if (proto === null) {
+	    return true;
+	  }
+	  var Ctor = hasOwnProperty$c.call(proto, 'constructor') && proto.constructor;
+	  return typeof Ctor == 'function' && Ctor instanceof Ctor &&
+	    funcToString$2.call(Ctor) == objectCtorString;
+	}
+
+	var isPlainObject_1 = isPlainObject;
+
 	/**
 	 * Checks if `value` is likely a DOM element.
 	 *
@@ -56477,6 +55810,549 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	    return HtmlMarker;
 	}(EventEmitter));
 
+	/**
+	 * This function is like `assignValue` except that it doesn't assign
+	 * `undefined` values.
+	 *
+	 * @private
+	 * @param {Object} object The object to modify.
+	 * @param {string} key The key of the property to assign.
+	 * @param {*} value The value to assign.
+	 */
+	function assignMergeValue(object, key, value) {
+	  if ((value !== undefined && !eq_1(object[key], value)) ||
+	      (value === undefined && !(key in object))) {
+	    _baseAssignValue(object, key, value);
+	  }
+	}
+
+	var _assignMergeValue = assignMergeValue;
+
+	/**
+	 * Creates a base function for methods like `_.forIn` and `_.forOwn`.
+	 *
+	 * @private
+	 * @param {boolean} [fromRight] Specify iterating from right to left.
+	 * @returns {Function} Returns the new base function.
+	 */
+	function createBaseFor(fromRight) {
+	  return function(object, iteratee, keysFunc) {
+	    var index = -1,
+	        iterable = Object(object),
+	        props = keysFunc(object),
+	        length = props.length;
+
+	    while (length--) {
+	      var key = props[fromRight ? length : ++index];
+	      if (iteratee(iterable[key], key, iterable) === false) {
+	        break;
+	      }
+	    }
+	    return object;
+	  };
+	}
+
+	var _createBaseFor = createBaseFor;
+
+	/**
+	 * The base implementation of `baseForOwn` which iterates over `object`
+	 * properties returned by `keysFunc` and invokes `iteratee` for each property.
+	 * Iteratee functions may exit iteration early by explicitly returning `false`.
+	 *
+	 * @private
+	 * @param {Object} object The object to iterate over.
+	 * @param {Function} iteratee The function invoked per iteration.
+	 * @param {Function} keysFunc The function to get the keys of `object`.
+	 * @returns {Object} Returns `object`.
+	 */
+	var baseFor = _createBaseFor();
+
+	var _baseFor = baseFor;
+
+	/**
+	 * This method is like `_.isArrayLike` except that it also checks if `value`
+	 * is an object.
+	 *
+	 * @static
+	 * @memberOf _
+	 * @since 4.0.0
+	 * @category Lang
+	 * @param {*} value The value to check.
+	 * @returns {boolean} Returns `true` if `value` is an array-like object,
+	 *  else `false`.
+	 * @example
+	 *
+	 * _.isArrayLikeObject([1, 2, 3]);
+	 * // => true
+	 *
+	 * _.isArrayLikeObject(document.body.children);
+	 * // => true
+	 *
+	 * _.isArrayLikeObject('abc');
+	 * // => false
+	 *
+	 * _.isArrayLikeObject(_.noop);
+	 * // => false
+	 */
+	function isArrayLikeObject(value) {
+	  return isObjectLike_1(value) && isArrayLike_1(value);
+	}
+
+	var isArrayLikeObject_1 = isArrayLikeObject;
+
+	/**
+	 * Gets the value at `key`, unless `key` is "__proto__" or "constructor".
+	 *
+	 * @private
+	 * @param {Object} object The object to query.
+	 * @param {string} key The key of the property to get.
+	 * @returns {*} Returns the property value.
+	 */
+	function safeGet(object, key) {
+	  if (key === 'constructor' && typeof object[key] === 'function') {
+	    return;
+	  }
+
+	  if (key == '__proto__') {
+	    return;
+	  }
+
+	  return object[key];
+	}
+
+	var _safeGet = safeGet;
+
+	/**
+	 * Converts `value` to a plain object flattening inherited enumerable string
+	 * keyed properties of `value` to own properties of the plain object.
+	 *
+	 * @static
+	 * @memberOf _
+	 * @since 3.0.0
+	 * @category Lang
+	 * @param {*} value The value to convert.
+	 * @returns {Object} Returns the converted plain object.
+	 * @example
+	 *
+	 * function Foo() {
+	 *   this.b = 2;
+	 * }
+	 *
+	 * Foo.prototype.c = 3;
+	 *
+	 * _.assign({ 'a': 1 }, new Foo);
+	 * // => { 'a': 1, 'b': 2 }
+	 *
+	 * _.assign({ 'a': 1 }, _.toPlainObject(new Foo));
+	 * // => { 'a': 1, 'b': 2, 'c': 3 }
+	 */
+	function toPlainObject(value) {
+	  return _copyObject(value, keysIn_1(value));
+	}
+
+	var toPlainObject_1 = toPlainObject;
+
+	/**
+	 * A specialized version of `baseMerge` for arrays and objects which performs
+	 * deep merges and tracks traversed objects enabling objects with circular
+	 * references to be merged.
+	 *
+	 * @private
+	 * @param {Object} object The destination object.
+	 * @param {Object} source The source object.
+	 * @param {string} key The key of the value to merge.
+	 * @param {number} srcIndex The index of `source`.
+	 * @param {Function} mergeFunc The function to merge values.
+	 * @param {Function} [customizer] The function to customize assigned values.
+	 * @param {Object} [stack] Tracks traversed source values and their merged
+	 *  counterparts.
+	 */
+	function baseMergeDeep(object, source, key, srcIndex, mergeFunc, customizer, stack) {
+	  var objValue = _safeGet(object, key),
+	      srcValue = _safeGet(source, key),
+	      stacked = stack.get(srcValue);
+
+	  if (stacked) {
+	    _assignMergeValue(object, key, stacked);
+	    return;
+	  }
+	  var newValue = customizer
+	    ? customizer(objValue, srcValue, (key + ''), object, source, stack)
+	    : undefined;
+
+	  var isCommon = newValue === undefined;
+
+	  if (isCommon) {
+	    var isArr = isArray_1(srcValue),
+	        isBuff = !isArr && isBuffer_1(srcValue),
+	        isTyped = !isArr && !isBuff && isTypedArray_1(srcValue);
+
+	    newValue = srcValue;
+	    if (isArr || isBuff || isTyped) {
+	      if (isArray_1(objValue)) {
+	        newValue = objValue;
+	      }
+	      else if (isArrayLikeObject_1(objValue)) {
+	        newValue = _copyArray(objValue);
+	      }
+	      else if (isBuff) {
+	        isCommon = false;
+	        newValue = _cloneBuffer(srcValue, true);
+	      }
+	      else if (isTyped) {
+	        isCommon = false;
+	        newValue = _cloneTypedArray(srcValue, true);
+	      }
+	      else {
+	        newValue = [];
+	      }
+	    }
+	    else if (isPlainObject_1(srcValue) || isArguments_1(srcValue)) {
+	      newValue = objValue;
+	      if (isArguments_1(objValue)) {
+	        newValue = toPlainObject_1(objValue);
+	      }
+	      else if (!isObject_1(objValue) || isFunction_1(objValue)) {
+	        newValue = _initCloneObject(srcValue);
+	      }
+	    }
+	    else {
+	      isCommon = false;
+	    }
+	  }
+	  if (isCommon) {
+	    // Recursively merge objects and arrays (susceptible to call stack limits).
+	    stack.set(srcValue, newValue);
+	    mergeFunc(newValue, srcValue, srcIndex, customizer, stack);
+	    stack['delete'](srcValue);
+	  }
+	  _assignMergeValue(object, key, newValue);
+	}
+
+	var _baseMergeDeep = baseMergeDeep;
+
+	/**
+	 * The base implementation of `_.merge` without support for multiple sources.
+	 *
+	 * @private
+	 * @param {Object} object The destination object.
+	 * @param {Object} source The source object.
+	 * @param {number} srcIndex The index of `source`.
+	 * @param {Function} [customizer] The function to customize merged values.
+	 * @param {Object} [stack] Tracks traversed source values and their merged
+	 *  counterparts.
+	 */
+	function baseMerge(object, source, srcIndex, customizer, stack) {
+	  if (object === source) {
+	    return;
+	  }
+	  _baseFor(source, function(srcValue, key) {
+	    stack || (stack = new _Stack);
+	    if (isObject_1(srcValue)) {
+	      _baseMergeDeep(object, source, key, srcIndex, baseMerge, customizer, stack);
+	    }
+	    else {
+	      var newValue = customizer
+	        ? customizer(_safeGet(object, key), srcValue, (key + ''), object, source, stack)
+	        : undefined;
+
+	      if (newValue === undefined) {
+	        newValue = srcValue;
+	      }
+	      _assignMergeValue(object, key, newValue);
+	    }
+	  }, keysIn_1);
+	}
+
+	var _baseMerge = baseMerge;
+
+	/**
+	 * This method returns the first argument it receives.
+	 *
+	 * @static
+	 * @since 0.1.0
+	 * @memberOf _
+	 * @category Util
+	 * @param {*} value Any value.
+	 * @returns {*} Returns `value`.
+	 * @example
+	 *
+	 * var object = { 'a': 1 };
+	 *
+	 * console.log(_.identity(object) === object);
+	 * // => true
+	 */
+	function identity(value) {
+	  return value;
+	}
+
+	var identity_1 = identity;
+
+	/**
+	 * A faster alternative to `Function#apply`, this function invokes `func`
+	 * with the `this` binding of `thisArg` and the arguments of `args`.
+	 *
+	 * @private
+	 * @param {Function} func The function to invoke.
+	 * @param {*} thisArg The `this` binding of `func`.
+	 * @param {Array} args The arguments to invoke `func` with.
+	 * @returns {*} Returns the result of `func`.
+	 */
+	function apply(func, thisArg, args) {
+	  switch (args.length) {
+	    case 0: return func.call(thisArg);
+	    case 1: return func.call(thisArg, args[0]);
+	    case 2: return func.call(thisArg, args[0], args[1]);
+	    case 3: return func.call(thisArg, args[0], args[1], args[2]);
+	  }
+	  return func.apply(thisArg, args);
+	}
+
+	var _apply = apply;
+
+	/* Built-in method references for those with the same name as other `lodash` methods. */
+	var nativeMax = Math.max;
+
+	/**
+	 * A specialized version of `baseRest` which transforms the rest array.
+	 *
+	 * @private
+	 * @param {Function} func The function to apply a rest parameter to.
+	 * @param {number} [start=func.length-1] The start position of the rest parameter.
+	 * @param {Function} transform The rest array transform.
+	 * @returns {Function} Returns the new function.
+	 */
+	function overRest(func, start, transform) {
+	  start = nativeMax(start === undefined ? (func.length - 1) : start, 0);
+	  return function() {
+	    var args = arguments,
+	        index = -1,
+	        length = nativeMax(args.length - start, 0),
+	        array = Array(length);
+
+	    while (++index < length) {
+	      array[index] = args[start + index];
+	    }
+	    index = -1;
+	    var otherArgs = Array(start + 1);
+	    while (++index < start) {
+	      otherArgs[index] = args[index];
+	    }
+	    otherArgs[start] = transform(array);
+	    return _apply(func, this, otherArgs);
+	  };
+	}
+
+	var _overRest = overRest;
+
+	/**
+	 * Creates a function that returns `value`.
+	 *
+	 * @static
+	 * @memberOf _
+	 * @since 2.4.0
+	 * @category Util
+	 * @param {*} value The value to return from the new function.
+	 * @returns {Function} Returns the new constant function.
+	 * @example
+	 *
+	 * var objects = _.times(2, _.constant({ 'a': 1 }));
+	 *
+	 * console.log(objects);
+	 * // => [{ 'a': 1 }, { 'a': 1 }]
+	 *
+	 * console.log(objects[0] === objects[1]);
+	 * // => true
+	 */
+	function constant(value) {
+	  return function() {
+	    return value;
+	  };
+	}
+
+	var constant_1 = constant;
+
+	/**
+	 * The base implementation of `setToString` without support for hot loop shorting.
+	 *
+	 * @private
+	 * @param {Function} func The function to modify.
+	 * @param {Function} string The `toString` result.
+	 * @returns {Function} Returns `func`.
+	 */
+	var baseSetToString = !_defineProperty ? identity_1 : function(func, string) {
+	  return _defineProperty(func, 'toString', {
+	    'configurable': true,
+	    'enumerable': false,
+	    'value': constant_1(string),
+	    'writable': true
+	  });
+	};
+
+	var _baseSetToString = baseSetToString;
+
+	/** Used to detect hot functions by number of calls within a span of milliseconds. */
+	var HOT_COUNT = 800,
+	    HOT_SPAN = 16;
+
+	/* Built-in method references for those with the same name as other `lodash` methods. */
+	var nativeNow = Date.now;
+
+	/**
+	 * Creates a function that'll short out and invoke `identity` instead
+	 * of `func` when it's called `HOT_COUNT` or more times in `HOT_SPAN`
+	 * milliseconds.
+	 *
+	 * @private
+	 * @param {Function} func The function to restrict.
+	 * @returns {Function} Returns the new shortable function.
+	 */
+	function shortOut(func) {
+	  var count = 0,
+	      lastCalled = 0;
+
+	  return function() {
+	    var stamp = nativeNow(),
+	        remaining = HOT_SPAN - (stamp - lastCalled);
+
+	    lastCalled = stamp;
+	    if (remaining > 0) {
+	      if (++count >= HOT_COUNT) {
+	        return arguments[0];
+	      }
+	    } else {
+	      count = 0;
+	    }
+	    return func.apply(undefined, arguments);
+	  };
+	}
+
+	var _shortOut = shortOut;
+
+	/**
+	 * Sets the `toString` method of `func` to return `string`.
+	 *
+	 * @private
+	 * @param {Function} func The function to modify.
+	 * @param {Function} string The `toString` result.
+	 * @returns {Function} Returns `func`.
+	 */
+	var setToString = _shortOut(_baseSetToString);
+
+	var _setToString = setToString;
+
+	/**
+	 * The base implementation of `_.rest` which doesn't validate or coerce arguments.
+	 *
+	 * @private
+	 * @param {Function} func The function to apply a rest parameter to.
+	 * @param {number} [start=func.length-1] The start position of the rest parameter.
+	 * @returns {Function} Returns the new function.
+	 */
+	function baseRest(func, start) {
+	  return _setToString(_overRest(func, start, identity_1), func + '');
+	}
+
+	var _baseRest = baseRest;
+
+	/**
+	 * Checks if the given arguments are from an iteratee call.
+	 *
+	 * @private
+	 * @param {*} value The potential iteratee value argument.
+	 * @param {*} index The potential iteratee index or key argument.
+	 * @param {*} object The potential iteratee object argument.
+	 * @returns {boolean} Returns `true` if the arguments are from an iteratee call,
+	 *  else `false`.
+	 */
+	function isIterateeCall(value, index, object) {
+	  if (!isObject_1(object)) {
+	    return false;
+	  }
+	  var type = typeof index;
+	  if (type == 'number'
+	        ? (isArrayLike_1(object) && _isIndex(index, object.length))
+	        : (type == 'string' && index in object)
+	      ) {
+	    return eq_1(object[index], value);
+	  }
+	  return false;
+	}
+
+	var _isIterateeCall = isIterateeCall;
+
+	/**
+	 * Creates a function like `_.assign`.
+	 *
+	 * @private
+	 * @param {Function} assigner The function to assign values.
+	 * @returns {Function} Returns the new assigner function.
+	 */
+	function createAssigner(assigner) {
+	  return _baseRest(function(object, sources) {
+	    var index = -1,
+	        length = sources.length,
+	        customizer = length > 1 ? sources[length - 1] : undefined,
+	        guard = length > 2 ? sources[2] : undefined;
+
+	    customizer = (assigner.length > 3 && typeof customizer == 'function')
+	      ? (length--, customizer)
+	      : undefined;
+
+	    if (guard && _isIterateeCall(sources[0], sources[1], guard)) {
+	      customizer = length < 3 ? undefined : customizer;
+	      length = 1;
+	    }
+	    object = Object(object);
+	    while (++index < length) {
+	      var source = sources[index];
+	      if (source) {
+	        assigner(object, source, index, customizer);
+	      }
+	    }
+	    return object;
+	  });
+	}
+
+	var _createAssigner = createAssigner;
+
+	/**
+	 * This method is like `_.assign` except that it recursively merges own and
+	 * inherited enumerable string keyed properties of source objects into the
+	 * destination object. Source properties that resolve to `undefined` are
+	 * skipped if a destination value exists. Array and plain object properties
+	 * are merged recursively. Other objects and value types are overridden by
+	 * assignment. Source objects are applied from left to right. Subsequent
+	 * sources overwrite property assignments of previous sources.
+	 *
+	 * **Note:** This method mutates `object`.
+	 *
+	 * @static
+	 * @memberOf _
+	 * @since 0.5.0
+	 * @category Object
+	 * @param {Object} object The destination object.
+	 * @param {...Object} [sources] The source objects.
+	 * @returns {Object} Returns `object`.
+	 * @example
+	 *
+	 * var object = {
+	 *   'a': [{ 'b': 2 }, { 'd': 4 }]
+	 * };
+	 *
+	 * var other = {
+	 *   'a': [{ 'c': 3 }, { 'e': 5 }]
+	 * };
+	 *
+	 * _.merge(object, other);
+	 * // => { 'a': [{ 'b': 2, 'c': 3 }, { 'd': 4, 'e': 5 }] }
+	 */
+	var merge = _createAssigner(function(object, source, srcIndex) {
+	  _baseMerge(object, source, srcIndex);
+	});
+
+	var merge_1 = merge;
+
 	/**
 	 * A helper class that will parses and splits a culture code into its language and region parts.
 	 */
@@ -56790,28 +56666,18 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	     */
 	    Localizer.getStrings = function (locale) {
 	        var localeData = this.getLocaleData(locale);
-	        // For default locale no need to make a network request
-	        // Its value is already defined in LocalizedStrings
-	        // This will also make sure that request is not made for Bing maps
-	        if (localeIndex.locales.defaultLanguage.defaultRegion.code === localeData.code) {
-	            return new Promise(function (resolve) {
-	                resolve(new LocalizedStrings());
-	            });
-	        }
-	        else {
-	            // Start a GET request
-	            var request = new Url({
-	                domain: env.staticAssetsDomain,
-	                path: localeIndex.localizationsPath + "/" + localeData.strings
-	            }).get();
-	            // Return the response as a LocalizedStrings object.
-	            return request.then(function (response) {
-	                return response;
-	            }, function () {
-	                // If the request for the localized strings json fails return a default localization in English.
-	                return new LocalizedStrings();
-	            });
-	        }
+	        // Start a GET request
+	        var request = new Url({
+	            domain: env.staticAssetsDomain,
+	            path: localeIndex.localizationsPath + "/" + localeData.strings
+	        }).get();
+	        // Return the response as a LocalizedStrings object.
+	        return request.then(function (response) {
+	            return response;
+	        }, function () {
+	            // If the request for the localized strings json fails return a default localization in English.
+	            return new LocalizedStrings();
+	        });
 	    };
 	    /**
 	     * Gets the best fit locale data based on the specified culture code.
@@ -57037,7 +56903,6 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	var defaultStaticAssetsDomain = env.staticAssetsDomain;
 	var defaultStyleDefinitionsPath = env.stylePath;
 	var defaultStyleDefinitionsVersion = env.styleDefinitionsVersion;
-	var defaultStyleAPIVersion = constants.styleApiVersion;
 	var defaultAuthOptions = new AuthenticationOptions();
 	var hasSetView = false;
 	var hasSetDomain = false;
@@ -57083,13 +56948,6 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	function getStyleDefinitionsVersion() {
 	    return defaultStyleDefinitionsVersion;
 	}
-	/**
-	 * Gets the default styleAPI version that was provided
-	 * @internal
-	 */
-	function getStyleAPIVersion() {
-	    return defaultStyleAPIVersion;
-	}
 	/**
 	 * Gets the worker count that will get created.
 	 */
@@ -57202,9 +57060,6 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	    defaultStyleDefinitionsVersion = styleDefinitionsVersion;
 	    hasSetStyleDefinitionsVersion = true;
 	}
-	function setStyleAPIVersion(styleAPIVersion) {
-	    defaultStyleAPIVersion = styleAPIVersion;
-	}
 	/**
 	 * Sets number of web workers instantiated on a page.
 	 * By default, it is set to half the number of CPU cores (capped at 6).
@@ -57744,14 +57599,13 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	        this.map = map;
 	    }
 	    NearbyGeographySearchService.prototype.request = function (options) {
-	        var _a;
 	        var domain = this.map.getServiceOptions().domain;
 	        var urlOptions = {
 	            domain: domain,
 	            path: "search/address/reverse/json",
 	            queryParams: __assign({ "api-version": "1.0", "language": options.style.language, "limit": 1, "query": normalizeLatitude(options.position[1]) + "," + normalizeLongitude(options.position[0]) }, (options.style.view && { view: options.style.view }))
 	        };
-	        return new Url((_a = this.map.authentication) === null || _a === void 0 ? void 0 : _a.signRequest(urlOptions)).get();
+	        return new Url(this.map.authentication.signRequest(urlOptions)).get();
 	    };
 	    return NearbyGeographySearchService;
 	}());
@@ -57912,7 +57766,7 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	        // Minium distance in pixels a second road must be in order to be considered an intersection.
 	        this._minIntersectionPixelDistance = 50;
 	        // The vector tile source id for Azure Maps.
-	        this._baseVectorTileSourceId = "microsoft.base";
+	        this._baseVectorTileSourceId = "vectorTiles";
 	        /*
 	         * Show details based on zoom level.
 	         *
@@ -58331,19 +58185,17 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	        }
 	        this._lastLang = this._map.getStyle().language.toLowerCase();
 	        MapViewDescriptor._labelCache._preloadCache(this._lastLang);
-	        this._map.events.addOnce("idle", function () {
+	        this._map.events.addOnce("load", function () {
 	            if (!_this._disposed) {
 	                _this._updateCam(true);
 	                // Add event listeners directly to mapbox because we will be using custom event data.
 	                // We don't automatically forward all properties of a mapbox event, so the custom data would be lost.
-	                var baseMap = _this._map._getMap();
-	                baseMap.on("move", _this._onMove);
-	                baseMap.on("moveend", _this._onMoveEnd);
-	                baseMap.on("styledata", _this._onStyleData);
-	                baseMap.on("rotate", _this._onRotate);
-	                var canvas = _this._map.getCanvas();
-	                canvas.addEventListener("mousedown", _this._onPointerDown);
-	                canvas.addEventListener("touchstart", _this._onPointerDown);
+	                _this._map._getMap().on("move", _this._onMove);
+	                _this._map._getMap().on("moveend", _this._onMoveEnd);
+	                _this._map._getMap().on("styledata", _this._onStyleData);
+	                _this._map._getMap().on("rotate", _this._onRotate);
+	                _this._map.getCanvas().addEventListener("mousedown", _this._onPointerDown);
+	                _this._map.getCanvas().addEventListener("touchstart", _this._onPointerDown);
 	            }
 	        });
 	        this._map.getMapContainer().addEventListener("keydown", this._shortcutListener);
@@ -58353,14 +58205,12 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	        this._disposed = true;
 	        // Event listeners were added directly to mapbox.
 	        // Remove them directly from there too.
-	        var baseMap = this._map._getMap();
-	        baseMap.off("move", this._onMove);
-	        baseMap.off("moveend", this._onMoveEnd);
-	        baseMap.off("styledata", this._onStyleData);
-	        baseMap.off("rotate", this._onRotate);
-	        var canvas = this._map.getCanvas();
-	        canvas.removeEventListener("mousedown", this._onPointerDown);
-	        canvas.removeEventListener("touchstart", this._onPointerDown);
+	        this._map._getMap().off("move", this._onMove);
+	        this._map._getMap().off("moveend", this._onMoveEnd);
+	        this._map._getMap().off("styledata", this._onStyleData);
+	        this._map._getMap().off("rotate", this._onRotate);
+	        this._map.getCanvas().removeEventListener("mousedown", this._onPointerDown);
+	        this._map.getCanvas().removeEventListener("touchstart", this._onPointerDown);
 	        this._map.getMapContainer().removeEventListener("keydown", this._shortcutListener);
 	    };
 	    MapViewDescriptor.prototype._getEventPos = function (event) {
@@ -59030,16 +58880,14 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	            });
 	        };
 	        this.initializeMapLiveStateInfo = function () {
-	            {
-	                _this.mapViewDesc = new MapViewDescriptor(_this.map, _this.updateMapState);
-	                _this.atlasMapLiveStateInfo = document.createElement("div");
-	                _this.atlasMapLiveStateInfo.setAttribute("tabindex", "-1");
-	                _this.atlasMapLiveStateInfo.setAttribute("aria-hidden", "true");
-	                _this.atlasMapLiveStateInfo.id = "atlas-map-state";
-	                _this.atlasMapLiveStateInfo.classList.add("hidden-accessible-element");
-	                _this.map.getCanvasContainer().appendChild(_this.atlasMapLiveStateInfo);
-	                _this.atlasMapLiveStateInfo.setAttribute("aria-live", "assertive");
-	            }
+	            _this.mapViewDesc = new MapViewDescriptor(_this.map, _this.updateMapState);
+	            _this.atlasMapLiveStateInfo = document.createElement("div");
+	            _this.atlasMapLiveStateInfo.setAttribute("tabindex", "-1");
+	            _this.atlasMapLiveStateInfo.setAttribute("aria-hidden", "true");
+	            _this.atlasMapLiveStateInfo.id = "atlas-map-state";
+	            _this.atlasMapLiveStateInfo.classList.add("hidden-accessible-element");
+	            _this.map.getCanvasContainer().appendChild(_this.atlasMapLiveStateInfo);
+	            _this.atlasMapLiveStateInfo.setAttribute("aria-live", "assertive");
 	        };
 	        this.initializeMapStyleInfo = function () {
 	            _this.atlasMapStyleInfo = document.createElement("div");
@@ -59548,12 +59396,6 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	         * @default true
 	         */
 	        _this.touchInteraction = true;
-	        /**
-	         * Whether touch rotation is enabled for touch devices. This option is not applied if touchInteraction is disabled.
-	         * default `true`
-	         * @default true
-	         */
-	        _this.touchRotate = true;
 	        /**
 	         * Sets the zoom rate of the mouse wheel
 	         * default `1/450`
@@ -59732,19 +59574,12 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	                this.map._getMap().scrollZoom.disable();
 	            }
 	            // Touch
-	            var touchZoomRotate = this.map._getMap().touchZoomRotate;
 	            if (options.touchInteraction) {
-	                touchZoomRotate.enable();
-	                if (options.touchRotate) {
-	                    touchZoomRotate.enableRotation();
-	                }
-	                else {
-	                    touchZoomRotate.disableRotation();
-	                }
+	                this.map._getMap().touchZoomRotate.enable();
 	                this.pinchZoom.enable();
 	            }
 	            else {
-	                touchZoomRotate.disable();
+	                this.map._getMap().touchZoomRotate.disable();
 	                this.pinchZoom.enable();
 	            }
 	        }
@@ -62731,10 +62566,10 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	                bounds: bbox.join(',')
 	            });
 	            var attributionUrl = attributionEndpointOrigin + "/map/attribution";
-	            var toReplace = { url: attributionUrl, headers: {} };
+	            var toReplace = { url: attributionUrl };
 	            map._substituteDomainLanguageViewAndSignInRequest(attributionUrl, toReplace);
-	            var targetUrl = "" + toReplace.url + (toReplace.url.includes('?') ? '&' : '?') + params.toString();
-	            return map._sendRequest(targetUrl, 'Attribution', toReplace.headers).then(function (response) { return response.json(); });
+	            var targetUrl = toReplace.url + "&" + params.toString();
+	            return map._sendRequest(targetUrl, 'Attribution').then(function (response) { return response.json(); });
 	        });
 	        Promise.all(requests).then(function (response) {
 	            _this.applyAttributionResponse(response);
@@ -62825,32 +62660,20 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	        this.removeAttributionFromSource = function (source) {
 	            //FundamentalMapSources are handled on style.load
 	        };
-	        this.getMapStyleVisibleSources = function () {
+	        this.getMapStyleSources = function () {
 	            var map = _this.map._getMap();
-	            var style = map.getStyle();
-	            return Object.entries(style.sources)
-	                .filter(function (_a) {
-	                var _b = __read(_a, 1), key = _b[0];
-	                return style.layers
-	                    .filter(function (layer) { return layer && layer['source'] == key; })
-	                    .reduce(function (isVisible, layer) {
-	                    var isLayerHidden = (layer["layout"] && layer["layout"].visibility === "none") || layer["paint"] && (layer["paint"]["icon-opacity"] === 0 && layer["paint"]["text-opacity"] === 0);
-	                    return !isLayerHidden || isVisible;
-	                }, false);
-	            }).map(function (_a) {
+	            return Object.entries(map.getStyle().sources).map(function (_a) {
 	                var _b = __read(_a, 1), key = _b[0];
 	                return map.getSource(key);
 	            });
 	        };
 	        this.loadAttributionOnceSourcesLoaded = function () {
-	            var sources = _this.getMapStyleVisibleSources();
+	            var sources = _this.getMapStyleSources();
 	            Promise.all(sources.map(function (source) { return new Promise(function (resolve, reject) {
 	                if ('tiles' in source) {
 	                    resolve(source);
 	                }
 	                else {
-	                    // force source loading as same resolved source in different style will get cached and won't emit events 
-	                    source.load();
 	                    source.on('data', function sourceDataListener(event) {
 	                        if (event.sourceDataType == 'metadata') {
 	                            source.off('data', sourceDataListener);
@@ -62872,7 +62695,7 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	            });
 	        };
 	        this.reloadAttribution = function () {
-	            var sources = _this.getMapStyleVisibleSources();
+	            var sources = _this.getMapStyleSources();
 	            // keep track of all rules as well as registered to determine redundant rules that won't get applied.
 	            // a rule is considered redundant when it is has same rule attributes(excluding order) as well as endpoints
 	            // a rule with the minimum order will be picked 
@@ -65429,7 +65252,21 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	                request.headers[constants.authorizationHeaderName] = constants.authorizationTokenPrefix + token;
 	                break;
 	            case exports.AuthenticationType.subscriptionKey:
-	                request.headers["subscription-key"] = token;
+	                if ("url" in request) {
+	                    if (request.url.indexOf("?") !== -1) {
+	                        request.url += "&subscription-key=" + token;
+	                    }
+	                    else {
+	                        request.url += "?&subscription-key=" + token;
+	                    }
+	                }
+	                else if ("domain" in request) {
+	                    request.queryParams = request.queryParams || {};
+	                    request.queryParams["subscription-key"] = token;
+	                }
+	                else {
+	                    throw new Error("Could not determine if the provided object was UrlOptions or RequestParameters");
+	                }
 	                break;
 	            default:
 	                throw new Error("An invalid authentication type was specified");
@@ -65987,7 +65824,7 @@ 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)) {
+	        else if (["minzoomchanged", "maxzoomchanged"].includes(eventType)) {
 	            this.map._addEventListener(eventType, callback, once);
 	        }
 	        else {
@@ -66312,9 +66149,8 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	     * @param id The image's id.
 	     * If the specified id matches the id of a previously added image the new image will be ignored.
 	     * @param icon The image to add to the map's sprite. Can be a data URI, inline SVG, or image URL.
-	     * @param meta Additional options that describe the image
 	     */
-	    ImageSpriteManager.prototype.add = function (id, icon, meta) {
+	    ImageSpriteManager.prototype.add = function (id, icon) {
 	        var _this = this;
 	        return new Promise(function (resolve, reject) {
 	            // Take no action if the new image uses the id of a previously added image.
@@ -66323,8 +66159,8 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	                return;
 	            }
 	            if (icon instanceof HTMLImageElement || icon instanceof ImageData) {
-	                _this.map._getMap().addImage(id, icon, meta);
-	                _this.userImages.set(id, { image: icon, meta: meta });
+	                _this.map._getMap().addImage(id, icon);
+	                _this.userImages.set(id, icon);
 	                resolve();
 	            }
 	            else if (typeof icon === "string") {
@@ -66348,8 +66184,8 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	                        var imageEle_1 = new Image();
 	                        // Wait for the blob to load into the element.
 	                        imageEle_1.onload = function () {
-	                            _this.map._getMap().addImage(id, imageEle_1, meta);
-	                            _this.userImages.set(id, { image: imageEle_1, meta: meta });
+	                            _this.map._getMap().addImage(id, imageEle_1);
+	                            _this.userImages.set(id, imageEle_1);
 	                            resolve();
 	                        };
 	                        // Reject if the blob failed to load in the element.
@@ -66441,7 +66277,7 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	        // Therefore changing a sprite will cause a full style rebuild.
 	        this.userImages.forEach(function (image, id) {
 	            if (!_this.map._getMap().hasImage(id)) {
-	                _this.map._getMap().addImage(id, image.image, image.meta);
+	                _this.map._getMap().addImage(id, image);
 	            }
 	        });
 	    };
@@ -67438,9 +67274,9 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	                var feature = features_1_1.value;
 	                if ((dataSource || typeof feature["source"] === "string") &&
 	                    typeof feature.properties[Shape._shapeIdPropName] === "string") {
-	                    var source = dataSource || this.sources.get(feature["source"]);
-	                    if (source instanceof DataSource) {
-	                        var shape = source.getShapeById(feature.properties[Shape._shapeIdPropName]);
+	                    var source_3 = dataSource || this.sources.get(feature["source"]);
+	                    if (source_3 instanceof DataSource) {
+	                        var shape = source_3.getShapeById(feature.properties[Shape._shapeIdPropName]);
 	                        if (shape instanceof Shape) {
 	                            shapesOrFeatures.push(shape);
 	                            continue;
@@ -68045,11 +67881,10 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	        _this.showTileBoundaries = false;
 	        /**
 	         * The name of the style to use when rendering the map. Available styles can be found in the
-	         * [supported styles]{@link https://docs.microsoft.com/en-us/azure/azure-maps/supported-map-styles} article.
-	         * The default style is defined in the style set.
-	         * @default undefined
+	         * [supported styles]{@link https://docs.microsoft.com/en-us/azure/azure-maps/supported-map-styles} article. The
+	         * default style is "road".
 	         */
-	        _this.style = undefined;
+	        _this.style = "road";
 	        /**
 	         * Specifies which set of geopolitically disputed borders and labels are displayed on the map. The View parameter (also referred to as “user region parameter”) is a 2-letter ISO-3166 Country Code that will show the correct maps for that country/region. Country/Regions that are not on the View list or if unspecified will default to the “Unified” View.
 	         * Please see the supported [Views]{@link https://aka.ms/AzureMapsLocalizationViews}
@@ -68160,20 +67995,10 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	        _this.styleDefinitionsPath = getStyleDefinitionsPath();
 	        /**
 	         * The style definitions version to request when requesting styles
-	         * from styleDefinitionsPath.
+	         * from styleDefinitionsPath. Recommend using atlas.getStyleDefinitionsVersion
+	         * function instead.
 	         */
 	        _this.styleDefinitionsVersion = getStyleDefinitionsVersion();
-	        /**
-	         * The style API version used when requesting styles and stylesets
-	         */
-	        _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.
-	         */
-	        _this.styleSet = undefined;
 	        /**
 	         * Enable accessibility
 	         * default: true
@@ -68395,11 +68220,8 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	     * @internal
 	     */
 	    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 layerId = (_a = layer === null || layer === void 0 ? void 0 : layer.id) !== null && _a !== void 0 ? _a : layer;
+	        var _a, _b;
+	        var layerId = (_b = (_a = layer) === null || _a === void 0 ? void 0 : _a.id) !== null && _b !== void 0 ? _b : layer;
 	        if (!layerId.startsWith("microsoft.")) {
 	            return undefined;
 	        }
@@ -68412,131 +68234,6 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	    return LayerGroupComparator;
 	}());
 
-	var HijackablePromise = /** @class */ (function () {
-	    function HijackablePromise(origin) {
-	        var _this = this;
-	        this.isResolved = function () { return _this._hijackedToResolve !== undefined || _this._toResolve !== undefined; };
-	        this.isRejected = function () { return _this._hijackedToReject !== undefined || _this._toReject !== undefined; };
-	        this.resultIfResolved = function () { return _this._hijackedToResolve || _this._toResolve; };
-	        this.errorIfRejected = function () { return _this._hijackedToReject || _this._toReject; };
-	        this._thenResolver = function (resolve, reject) {
-	            if (_this._hijackedToResolve) {
-	                resolve(_this._hijackedToResolve);
-	            }
-	            else if (_this._hijackedToReject) {
-	                reject(_this._hijackedToReject);
-	            }
-	            else {
-	                // we retain the origin, and check if stays the same as resolved
-	                // to make sure we do nothing if the promise was switched
-	                var retainedInvocator_1 = _this.origin;
-	                _this.origin.then(function (result) {
-	                    // origin was switched
-	                    if (retainedInvocator_1 !== _this.origin) {
-	                        return;
-	                    }
-	                    if (!_this._hijackedToResolve) {
-	                        _this._toResolve = result;
-	                        resolve(result);
-	                    }
-	                }).catch(function (error) {
-	                    if (!_this._hijackedToReject) {
-	                        _this._toReject = error;
-	                        reject(error);
-	                    }
-	                });
-	            }
-	        };
-	        this._catchResolver = function (reject) {
-	            if (_this._hijackedToReject) {
-	                reject(_this._hijackedToReject);
-	            }
-	            else {
-	                // we retain the origin, and check if stays the same as resolved
-	                // to make sure we do nothing if the promise was switched
-	                var retainedInvocator_2 = _this.origin;
-	                _this.origin.catch(function (error) {
-	                    // origin was switched
-	                    if (retainedInvocator_2 !== _this.origin) {
-	                        return;
-	                    }
-	                    if (!_this._hijackedToReject) {
-	                        _this._toReject = error;
-	                        reject(error);
-	                    }
-	                });
-	            }
-	        };
-	        this.origin = origin;
-	        this[Symbol.toStringTag] = this.origin[Symbol.toStringTag];
-	    }
-	    HijackablePromise.resolve = function (value) {
-	        return new HijackablePromise(Promise.resolve(value));
-	    };
-	    HijackablePromise.reject = function (error) {
-	        return new HijackablePromise(Promise.reject(error));
-	    };
-	    HijackablePromise.prototype.then = function (onfulfilled, onrejected) {
-	        var _this = this;
-	        return new Promise(function (resolve, reject) {
-	            _this._resolve = resolve;
-	            _this._reject = reject;
-	            _this._thenResolver(resolve, reject);
-	        }).then(onfulfilled, onrejected);
-	    };
-	    // tslint:disable-next-line: no-reserved-keywords
-	    HijackablePromise.prototype.catch = function (onrejected) {
-	        var _this = this;
-	        return new Promise(function (_, reject) {
-	            _this._reject = reject;
-	            _this._catchResolver(reject);
-	        }).then(onrejected);
-	    };
-	    // tslint:disable-next-line: no-reserved-keywords
-	    HijackablePromise.prototype.finally = function (onfinally) {
-	        return this.origin.finally(onfinally);
-	    };
-	    HijackablePromise.prototype.hijackAndResolve = function (value) {
-	        this._hijackedToResolve = value;
-	        if (this._resolve) {
-	            this._resolve(value);
-	        }
-	    };
-	    HijackablePromise.prototype.hijackAndReject = function (error) {
-	        this._hijackedToReject = error;
-	        if (this._reject) {
-	            this._reject(error);
-	        }
-	    };
-	    HijackablePromise.prototype.switchWith = function (promise) {
-	        // switching the origin will discard the original in-progress promise result
-	        this.origin = promise;
-	        // then has been invoked on this promise
-	        if (this._resolve && this._reject) {
-	            this._thenResolver(this._resolve, this._reject);
-	            // catch has been invoked on this promise
-	        }
-	        else if (this._reject) {
-	            this._catchResolver(this._reject);
-	        }
-	    };
-	    return HijackablePromise;
-	}());
-
-	var styleNamesMap = {
-	    road: "Road",
-	    satellite: "Satellite",
-	    satellite_road_labels: "Hybrid",
-	    grayscale_dark: "Grayscale (Dark)",
-	    grayscale_light: "Grayscale (Light)",
-	    night: "Night",
-	    road_shaded_relief: "Terra",
-	    blank: "Blank",
-	    blank_accessible: "Blank (Accessible)",
-	    high_contrast_dark: "High contrast (Dark)",
-	    high_contrast_light: "High contrast (Light)"
-	};
-
 	/**
 	 * @private
 	 */
@@ -68549,183 +68246,55 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	     */
 	    function StyleManager(map, serviceOptions) {
 	        var _this = this;
-	        this.definitions = function () { return _this.initPromise ? _this.initPromise : _this.initStyleset(); };
-	        /**
-	         * Compatability indoor state used in styleDefinition filtering.
-	         */
-	        this.indoorState = undefined;
-	        /**
-	         * Preserve the styleset that was used before the indoor styleset was set
-	         */
-	        this.preservedPreindoorStyleset = undefined;
+	        this.apiVersion = "2.0";
 	        this._onStyleData = function () {
-	            _this._lookUpAsync(_this.map.getStyle()).then(function (style) {
-	                _this.map.events.invoke("stylechanged", {
-	                    style: style.name,
-	                    map: _this.map,
-	                    type: "stylechanged"
-	                });
+	            _this.map.events.invoke("stylechanged", {
+	                style: _this._lookUp(_this.map.getStyle()).name,
+	                map: _this.map,
+	                type: "stylechanged"
 	            });
 	        };
-	        /**
-	         * Looks up the style type info from the style definitions: this is async unsafe
-	         */
-	        this._lookUp = function (options) {
-	            var definitionsFetchError = _this.definitions().errorIfRejected();
-	            var definitions = _this.definitions().resultIfResolved();
-	            if (definitionsFetchError) {
-	                return null;
-	            }
-	            else if (definitions === undefined) {
-	                return null;
-	            }
-	            else {
-	                return definitions.styles.find(function (style) { return style.name === (options.style || definitions.defaultStyle); })
-	                    // 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];
-	            }
-	        };
-	        this._lookUpAsync = function (options) { return __awaiter(_this, void 0, void 0, function () {
-	            var definitions, result;
-	            return __generator(this, function (_a) {
-	                switch (_a.label) {
-	                    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); })
-	                            // 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];
-	                        return [2 /*return*/, result];
-	                }
-	            });
-	        }); };
 	        this.map = map;
 	        this.serviceOptions = serviceOptions;
 	    }
-	    StyleManager.prototype.updateIndoorState = function (theme, tilesetId) {
-	        var _this = this;
-	        var styleset = this.map.styles.getStyleSet();
-	        if (styleset) {
-	            this.preservedPreindoorStyleset = styleset;
-	            // 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 + "_indoor" + (theme === 'dark' ? '_dark' : '') + "_tileset_" + tilesetId;
-	            this.map.styles.setStyleSet("defaultIndoor_" + tilesetId, styleset === 'microsoft-maps:default' ? desiredIndoorStyle : undefined);
-	        }
-	        else {
-	            this.indoorState = {
-	                tilesetId: tilesetId,
-	                theme: theme
-	            };
-	            this.initStyleset();
-	            this.definitions().then(function (definitions) {
-	                var currentStyle = _this.map.getStyle().style;
-	                var targetStyleName = currentStyle + "_indoor" + (_this.indoorState.theme == 'dark' ? '_dark' : '');
-	                _this.map.setStyle({ style: targetStyleName });
-	            });
-	        }
-	    };
-	    StyleManager.prototype.unsetIndoorState = function () {
-	        var _this = this;
-	        var styleset = this.preservedPreindoorStyleset;
-	        if (styleset) {
-	            // we need to revert to the styleset that was ap
-	            this.map.styles.setStyleSet(styleset);
-	        }
-	        else {
-	            this.indoorState = undefined;
-	            this.initStyleset();
-	            this.definitions().then(function (definitions) {
-	                var currentStyle = _this.map.getStyle().style;
-	                if (currentStyle.includes('_indoor') && currentStyle.split('_indoor')[0]) {
-	                    _this.map.setStyle({ style: currentStyle.split('_indoor')[0] });
-	                }
-	                else {
-	                    _this.map.setStyle({ style: undefined });
-	                }
-	            });
-	        }
-	    };
 	    /**
-	     * If this method has been called before then the original promise is returned.
-	     * Promise is resolved once the style set is successfully fetched and stored.
+	     * If this method has been called before the original initialize promise is returned.
 	     */
-	    StyleManager.prototype.initStyleset = function () {
+	    StyleManager.prototype.initialize = function () {
 	        var _this = this;
-	        var newPromise;
-	        var mapStyleNameToFriendyWhenAvailable = function (styleName) {
-	            var baseName = _this.indoorState && styleName.includes('_indoor') ? styleName.split('_indoor')[0] : styleName;
-	            return baseName in styleNamesMap ? styleNamesMap[baseName] : baseName;
-	        };
-	        if (!this.serviceOptions.styleSet) {
-	            newPromise = new HijackablePromise(this._request(this.serviceOptions.staticAssetsDomain, constants.stylePath + "/" + constants.styleResourcePath, "StyleDefinitions").then(function (definitions) { return ({
-	                version: isNaN(definitions.version) ? 0 : parseFloat(definitions.version),
-	                defaultStyle: definitions.defaultStyle,
-	                styles: definitions.styles
-	                    .filter(function (style) { return _this.indoorState ? style.name.includes('indoor') && style.name.endsWith(_this.indoorState.theme == 'dark' ? 'dark' : 'indoor') : !style.name.includes('indoor'); })
-	                    .map(function (style) { return ({
-	                    copyright: style.copyright.join(' '),
-	                    name: style.name,
-	                    displayName: mapStyleNameToFriendyWhenAvailable(style.name),
-	                    theme: style.theme,
-	                    thumbnail: new Url({ domain: _this.serviceOptions.staticAssetsDomain, path: style.thumbnail, protocol: "https" }).toString(),
-	                    url: new Url({
-	                        domain: _this.serviceOptions.staticAssetsDomain,
-	                        path: constants.stylePath + "/" + constants.styleResourcePath + "/" + style.name,
-	                        queryParams: {
-	                        //[constants.apiVersionQueryParameter]: this.serviceOptions.styleDefinitionsVersion,
-	                        // thus far we don't need to differentiate based on parameter here, as stylePatch will be called on cached styles as well 
-	                        //language: styleOptions.language
-	                        },
-	                        protocol: "https"
-	                    }).toString(),
-	                }); })
-	            }); }));
-	        }
-	        else if (typeof this.serviceOptions.styleSet === 'string') {
-	            newPromise = new HijackablePromise(this._request(this.serviceOptions.domain, constants.styleResourcePath + "/mapconfigurations/metadata/" + this.serviceOptions.styleSet, "StyleDefinitions"));
-	        }
-	        else {
-	            newPromise = HijackablePromise.resolve(this.serviceOptions.styleSet);
-	        }
-	        if (this.initPromise) {
-	            this.initPromise.switchWith(newPromise);
-	            this.initPromise = newPromise;
-	        }
-	        else {
-	            this.initPromise = newPromise;
+	        if (!this.initPromise) {
+	            this.initPromise = this._request(this.serviceOptions.staticAssetsDomain, constants.stylePath + "/" + constants.styleResourcePath, "StyleDefinitions")
+	                .then(function (response) {
+	                _this.definitions = response;
+	            }).catch(function (reason) {
+	                throw new Error("Failed to retrieve the style definitions: " + reason);
+	            });
 	        }
-	        // propagate styleset change
-	        this.initPromise.then(function (styleset) { return _this.map._invokeEvent("stylesetchanged", styleset); });
+	        this.styleSet = "base";
 	        return this.initPromise;
 	    };
 	    /**
-	     * Gets URL or object of the style listed in style definition. Style definition's default style is used if
-	     * styleOptions.style is not provided or if styleOptions.style is not present in the style definition.
+	     * Gets the URL of a style listed in style definition. Style definition's default style is used if
+	     * styleName is not provided or if styleName is not present in the style definition.
 	     */
-	    StyleManager.prototype.getStyle = function (styleOptions) {
+	    StyleManager.prototype.getStyleUrl = function (styleOptions) {
+	        var _a;
 	        var styleDefinition = this._lookUp(styleOptions);
-	        if (!styleDefinition) {
-	            throw Error("Style definition is not available.");
-	        }
-	        if (styleDefinition.url) {
-	            return styleDefinition.url;
-	        }
-	        if (styleDefinition.style) {
-	            return styleDefinition.style;
-	        }
-	        throw Error("Style definition does not contain neither URL nor style object.");
+	        var url = new Url({
+	            domain: this.serviceOptions.staticAssetsDomain,
+	            path: constants.stylePath + "/" + constants.styleResourcePath + "/" + styleDefinition.name,
+	            queryParams: (_a = {},
+	                _a[constants.apiVersionQueryParameter] = this.apiVersion,
+	                _a["version"] = this.definitions.version,
+	                _a),
+	            protocol: "https"
+	        });
+	        return url.toString();
 	    };
-	    /**
-	     * @internal
-	     */
-	    StyleManager.prototype.setStyle = function (styleOptions) {
+	    StyleManager.prototype.setStyleUrl = function (styleOptions) {
+	        var styleUrl = this.getStyleUrl(styleOptions);
 	        try {
-	            this.map._getMap().setStyle(this.getStyle(styleOptions), {
+	            this.map._getMap().setStyle(styleUrl, {
 	                diff: true,
 	                stylePatch: this._stylePatch.bind(this),
 	                validate: this.serviceOptions.validateStyle
@@ -68740,48 +68309,46 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	     */
 	    StyleManager.prototype.getTheme = function (styleOptions) {
 	        var style = this._lookUp(styleOptions);
-	        if (!style) {
-	            throw Error("Theme is not available.");
+	        return style.theme.toLowerCase() || "light";
+	    };
+	    /**
+	     * Bug: 9984684 - Remove this method.
+	     * Switch to a different set of styles.
+	     * @param styleSet Name of style set to select.
+	     */
+	    StyleManager.prototype.setStyleSet = function (styleSet) {
+	        if (styleSet !== this.styleSet) {
+	            this.styleSet = styleSet;
+	            this.setStyleUrl(this.map.getStyle());
 	        }
-	        return style.theme.toLowerCase();
 	    };
-	    StyleManager.prototype.getThemeAsync = function (styleOptions) {
-	        return __awaiter(this, void 0, void 0, function () {
-	            return __generator(this, function (_a) {
-	                switch (_a.label) {
-	                    case 0: return [4 /*yield*/, this._lookUpAsync(styleOptions)];
-	                    case 1: return [2 /*return*/, (_a.sent()).theme];
-	                }
-	            });
-	        });
+	    /**
+	     * Bug: 9984684 - Remove this method.
+	     * Get the current style set.
+	     * @param name Name of module to add.
+	     */
+	    StyleManager.prototype.getStyleSet = function () {
+	        return this.styleSet;
 	    };
 	    /**
-	     * Replaces the style set used. Very costly as it reloads all controls and resources.
+	     *
+	     * @param name Bug 9984684 - Remove this method.
+	     * "Reset to base Style Set"
 	     */
-	    StyleManager.prototype.setStyleSet = function (styleSet, styleName) {
-	        var _this = this;
-	        this.serviceOptions.styleSet = styleSet;
-	        if (typeof styleSet === 'string') {
-	            this.initStyleset();
-	        }
-	        else {
-	            if (this.initPromise) {
-	                this.initPromise.hijackAndResolve(styleSet);
-	            }
-	            else {
-	                this.initPromise = HijackablePromise.resolve(styleSet);
-	            }
+	    StyleManager.prototype.clearStyleSet = function () {
+	        if ("base" !== this.styleSet) {
+	            this.styleSet = "base";
+	            this.setStyleUrl(this.map.getStyle());
 	        }
-	        this.definitions().then(function (definitions) {
-	            var targetStyleName = definitions.defaultStyle;
-	            if (definitions.styles.find(function (s) { return s.name === styleName; })) {
-	                targetStyleName = styleName;
-	            }
-	            _this.map.setStyle({ style: targetStyleName });
-	        });
 	    };
-	    StyleManager.prototype.getStyleSet = function () {
-	        return this.serviceOptions.styleSet;
+	    /**
+	     * Gets the full style definition object.
+	     */
+	    StyleManager.prototype.getDef = function () {
+	        // return this.definitions; // TODO: Restore this line. Bug: 9984684
+	        var result = Object.assign({}, this.definitions);
+	        result.styles = result.styles.filter(function (style) { return (!style.name.endsWith("_indoor") && !style.name.endsWith("_indoor_dark")); });
+	        return result;
 	    };
 	    /**
 	     * Function invoked by mapbox after a style is fetched but before it is committed to the map state.
@@ -68823,7 +68390,7 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	        };
 	        nextStyle.layers.forEach(function (nextLayer) {
 	            var _a, _b, _c;
-	            var layerGroup = LayerGroupComparator.getLayerGroup(nextLayer);
+	            var layerGroup = LayerGroupComparator.getLayerGroup(nextLayer.id);
 	            currentLayerGroupId = currentLayerGroupId ? currentLayerGroupId : layerGroup;
 	            // Set visiblity of fill-extrusion layers according to StyleOptions.showBuildingModels
 	            if (!styleOptions.showBuildingModels && nextLayer.type === "fill-extrusion") {
@@ -68918,6 +68485,40 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	        }
 	        throw new Error("Unable to construct fundamental map layer for ID: " + id + ".");
 	    };
+	    /**
+	     * Looks up the style type info from the style definition
+	     */
+	    StyleManager.prototype._lookUp = function (options) {
+	        var e_1, _a;
+	        // TODO: Remove indoor logic here. Bug: 9984684
+	        var styleName = (options.style || this.definitions.defaultStyle)
+	            .concat(this.styleSet === "indoor" ? "_indoor" : "")
+	            .concat(this.styleSet === "indoor_dark" ? "_indoor_dark" : "");
+	        var defaultStyleName = this.definitions.defaultStyle
+	            .concat(this.styleSet === "indoor" ? "_indoor" : "")
+	            .concat(this.styleSet === "indoor_dark" ? "_indoor_dark" : "");
+	        var fallbackStyle;
+	        try {
+	            for (var _b = __values((this.definitions || {}).styles), _c = _b.next(); !_c.done; _c = _b.next()) {
+	                var style = _c.value;
+	                if (style.name === styleName) {
+	                    return style; // Safe when the definition missing requested styleName.
+	                    // Makes silent decision to use first instance of a style if there are more than one with the same name.
+	                }
+	                else if (style.name === defaultStyleName) {
+	                    fallbackStyle = style; // Assumes that the definition contains the default style.
+	                }
+	            }
+	        }
+	        catch (e_1_1) { e_1 = { error: e_1_1 }; }
+	        finally {
+	            try {
+	                if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+	            }
+	            finally { if (e_1) throw e_1.error; }
+	        }
+	        return fallbackStyle;
+	    };
 	    /**
 	     * Replace URL placeholders and add StyleManager API version to requests made for style resources.
 	     * @param params RequestParameters to modify.
@@ -68925,9 +68526,8 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	     * @internal
 	     */
 	    StyleManager.prototype._transformStyleRequest = function (url, params) {
-	        var _a;
 	        if (url.includes(constants.domainPlaceHolder)) {
-	            params.url = params.url.replace(constants.domainPlaceHolder, this.serviceOptions.domain);
+	            params.url = params.url.replace(constants.domainPlaceHolder, this.serviceOptions.staticAssetsDomain);
 	        }
 	        if (url.includes(constants.stylePathHolder)) {
 	            params.url = params.url.replace(constants.stylePathHolder, constants.stylePath);
@@ -68935,43 +68535,44 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	        if (url.includes(constants.styleResourcePlaceholder)) {
 	            params.url = params.url.replace(constants.styleResourcePlaceholder, constants.styleResourcePath);
 	        }
-	        params.url = params.url + ("" + (url.includes('?') ? '&' : '?') + constants.apiVersionQueryParameter + "=" + this.serviceOptions.styleAPIVersion);
-	        (_a = this.map.authentication) === null || _a === void 0 ? void 0 : _a.signRequest(params);
+	        params.url = params.url + ("" + (url.includes('?') ? '&' : '?') + constants.apiVersionQueryParameter + "=" + this.apiVersion);
 	    };
 	    /**
 	     * Fetches a json resource at the specified domain and path.
 	     */
-	    StyleManager.prototype._request = function (domain, path, resourceType, customQueryParams) {
-	        var _a;
-	        if (customQueryParams === void 0) { customQueryParams = {}; }
+	    StyleManager.prototype._request = function (domain, path, resourceType) {
 	        return __awaiter(this, void 0, void 0, function () {
-	            var requestParams, fetchOptions;
-	            var _b;
-	            return __generator(this, function (_c) {
-	                switch (_c.label) {
+	            var requestParams, url, fetchOptions, request;
+	            var _a;
+	            return __generator(this, function (_b) {
+	                switch (_b.label) {
 	                    case 0:
-	                        requestParams = {
-	                            url: new Url({
-	                                protocol: "https",
-	                                domain: domain,
-	                                path: path,
-	                                queryParams: __assign((_b = {}, _b[constants.apiVersionQueryParameter] = this.serviceOptions.styleAPIVersion, _b), customQueryParams)
-	                            }).toString()
-	                        };
+	                        url = new Url({
+	                            protocol: "https",
+	                            domain: domain,
+	                            path: path,
+	                            queryParams: (_a = {},
+	                                _a[constants.apiVersionQueryParameter] = this.apiVersion,
+	                                _a["version"] = this.serviceOptions.styleDefinitionsVersion,
+	                                _a)
+	                        }).toString();
 	                        if (typeof this.serviceOptions.transformRequest === "function" && resourceType) {
 	                            // If a transformRequest(...) was specified use it.
-	                            requestParams = this.serviceOptions.transformRequest(requestParams.url, resourceType);
+	                            requestParams = this.serviceOptions.transformRequest(url, resourceType);
 	                        }
-	                        (_a = this.map.authentication) === null || _a === void 0 ? void 0 : _a.signRequest(requestParams);
 	                        fetchOptions = {
 	                            method: "GET",
 	                            mode: "cors",
 	                        };
-	                        requestParams.credentials &&
-	                            (fetchOptions.credentials = requestParams.credentials);
-	                        requestParams.headers &&
-	                            (fetchOptions.headers = requestParams.headers);
-	                        return [4 /*yield*/, fetch(requestParams.url, fetchOptions).then(function (response) {
+	                        if (requestParams) {
+	                            requestParams.credentials &&
+	                                (fetchOptions.credentials = requestParams.credentials);
+	                            requestParams.headers &&
+	                                (fetchOptions.headers = requestParams.headers);
+	                            url = requestParams.url || url;
+	                        }
+	                        request = new Request(url, fetchOptions);
+	                        return [4 /*yield*/, fetch(request).then(function (response) {
 	                                if (response.ok) {
 	                                    return response.json();
 	                                }
@@ -68979,7 +68580,7 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	                                    throw new Error("HTTP " + response.status + ": " + response.statusText + " ");
 	                                }
 	                            })];
-	                    case 1: return [2 /*return*/, _c.sent()];
+	                    case 1: return [2 /*return*/, _b.sent()];
 	                }
 	            });
 	        });
@@ -69004,6 +68605,7 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	     */
 	    function Map(container, options) {
 	        var _this = _super.call(this) || this;
+	        _this.styleSourceIds = new Set();
 	        // Map state trackers
 	        _this.removed = false;
 	        _this.loaded = false;
@@ -69065,7 +68667,7 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	                        }
 	                        _this._substituteDomainLanguageViewAndSignInRequest(url, requestParams);
 	                    }
-	                    else if (resourceType === "Style" || resourceType === "SpriteJSON" || resourceType === "SpriteImage" || resourceType === "Glyphs") {
+	                    else if (resourceType === "SpriteJSON" || resourceType === "SpriteImage" || resourceType === "Glyphs") {
 	                        _this.styles._transformStyleRequest(url, requestParams);
 	                    }
 	                    // Apply the users specified transform after ours
@@ -69130,9 +68732,8 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	            _this._setAutoResize(_this.styleOptions.autoResize);
 	            _this.map.showTileBoundaries = _this.styleOptions.showTileBoundaries;
 	            _this.localizedStringsPromise = Localizer.getStrings(_this.styleOptions.language);
-	            var stylesInit = _this.styles.initStyleset();
-	            Promise.all([authManInit, stylesInit]).then(function (_a) {
-	                var _b = __read(_a, 2), _ = _b[0], definitions = _b[1];
+	            var stylesInit = _this.styles.initialize();
+	            Promise.all([authManInit, stylesInit]).then(function () {
 	                // Check that the map hasn't been removed for any reason.
 	                // If so no need to finish styling the map.
 	                if (_this.removed) {
@@ -70045,7 +69646,7 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	    Map.prototype._rebuildStyle = function () {
 	        return __awaiter(this, void 0, void 0, function () {
 	            return __generator(this, function (_a) {
-	                this.styles.setStyle(this.styleOptions);
+	                this.styles.setStyleUrl(this.styleOptions);
 	                this.imageSprite._restoreImages();
 	                return [2 /*return*/];
 	            });
@@ -70108,7 +69709,6 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	     * @internal
 	     */
 	    Map.prototype._substituteDomainLanguageViewAndSignInRequest = function (url, requestParams) {
-	        var _a;
 	        if (url.includes(constants.legacyDomainPlaceHolder) || url.includes(constants.domainPlaceHolder)) {
 	            // Update legacy domain placeholder if found
 	            var isLegacy = new RegExp("[^{]" + constants.legacyDomainPlaceHolder + "[^}]");
@@ -70126,7 +69726,9 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	                requestParams.url = requestParams.url.replace(constants.domainPlaceHolder, this.serviceOptions.domain);
 	            }
 	        }
-	        (_a = this.authentication) === null || _a === void 0 ? void 0 : _a.signRequest(requestParams);
+	        if (requestParams.url.toLocaleLowerCase().includes(this.serviceOptions.domain.toLocaleLowerCase())) {
+	            this.authentication && this.authentication.signRequest(requestParams);
+	        }
 	        if (url.includes(constants.languagePlaceHolder)) {
 	            requestParams.url = requestParams.url.replace(constants.languagePlaceHolder, this.styleOptions.language);
 	        }
@@ -70154,18 +69756,11 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	     * @private
 	     */
 	    Map.prototype._setStyleComponents = function (styleOptions) {
-	        var _this = this;
 	        if (this.removed) {
 	            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.styleOptions = styleOptions;
-	            _this._rebuildStyle();
-	        });
+	        this.styleOptions = styleOptions;
+	        this._rebuildStyle();
 	        return;
 	    };
 	    /**
@@ -70184,6 +69779,9 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	            if (options.styleDefinitionsPath && !_hasSetStyleDefinitionsPath()) {
 	                setStyleDefinitionsPath(options.styleDefinitionsPath);
 	            }
+	            if (options.styleDefinitionsVersion && !_hasSetStyleDefinitionsVersion()) {
+	                setStyleDefinitionsVersion(options.styleDefinitionsVersion);
+	            }
 	            if (options.workerCount && !_hasWorkerCount()) {
 	                setWorkerCount(options.workerCount);
 	            }
@@ -70829,7 +70427,7 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	exports.addImageTemplate = addImageTemplate;
 	exports.clearPrewarmedResources = clearPrewarmedResources;
 	exports.control = index$3;
-	exports.data = index$1;
+	exports.data = index$2;
 	exports.getAllImageTemplateNames = getAllImageTemplateNames;
 	exports.getAuthenticationOptions = getAuthenticationOptions;
 	exports.getDomain = getDomain;
@@ -70838,7 +70436,6 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	exports.getMaxParallelImageRequests = getMaxParallelImageRequests;
 	exports.getSessionId = getSessionId;
 	exports.getStaticAssetsDomain = getStaticAssetsDomain;
-	exports.getStyleAPIVersion = getStyleAPIVersion;
 	exports.getStyleDefinitionsPath = getStyleDefinitionsPath;
 	exports.getStyleDefinitionsVersion = getStyleDefinitionsVersion;
 	exports.getSubscriptionKey = getSubscriptionKey;
@@ -70849,14 +70446,13 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	exports.internal = index;
 	exports.isSupported = isSupported;
 	exports.layer = index$5;
-	exports.math = index$2;
+	exports.math = index$1;
 	exports.prewarm = prewarm;
 	exports.setAuthenticationOptions = setAuthenticationOptions;
 	exports.setDomain = setDomain;
 	exports.setLanguage = setLanguage;
 	exports.setMaxParallelImageRequests = setMaxParallelImageRequests;
 	exports.setSessionId = setSessionId;
-	exports.setStyleAPIVersion = setStyleAPIVersion;
 	exports.setStyleDefinitionsPath = setStyleDefinitionsPath;
 	exports.setStyleDefinitionsVersion = setStyleDefinitionsVersion;
 	exports.setSubscriptionKey = setSubscriptionKey;