azure-maps-control 2.1.11 → 2.1.14

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.14";
 
 	/**
 	 * A helper class that provides methods for getting various forms of the map controls current version.
@@ -47443,11 +47443,6 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	         * Default `true`
 	         */
 	        _this.autoSelectionMode = true;
-	        /**
-	         * theme
-	         * when unset - all styles are selectable
-	         */
-	        _this.theme = undefined;
 	        return _this;
 	    }
 	    return StyleControlOptions;
@@ -47483,6 +47478,7 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	                return;
 	            }
 	            Array.from(_this.styleOpsGrid.children).forEach(function (element) { return element.remove(); });
+	            _this.styleButtons.clear();
 	            _this.populateOpsGridFromDefinitions(definitions);
 	        };
 	        _this.mapToFriendlyStyleName = function (name, styleset) {
@@ -47597,6 +47593,10 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	            if (image_1.src !== newSrc) {
 	                image_1.src = newSrc;
 	            }
+	            Object.entries(this.styleButtons).forEach(function (_a) {
+	                var _b = __read(_a, 2), buttonStyleName = _b[0], button = _b[1];
+	                return button.setAttribute('aria-current', buttonStyleName === styleName ? 'true' : 'false');
+	            });
 	            this.map.styles.definitions().then(function (styleset) {
 	                var newAlt = _this.mapToFriendlyStyleName(styleName, styleset);
 	                if (image_1.alt !== newAlt) {
@@ -47736,9 +47736,6 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	        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 = {
@@ -47761,9 +47758,10 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	                positionTooltip(tooltip, styleOptionButton);
 	            }
 	        });
+	        var targetStyleName = this.map.getStyle().style;
 	        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');
+	            return button.setAttribute('aria-current', styleName === targetStyleName ? 'true' : 'false');
 	        });
 	    };
 	    StyleControl.InvertOrderPositions = [exports.ControlPosition.TopRight, exports.ControlPosition.BottomRight];
@@ -47929,13 +47927,13 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	     * This is invoked on init in constructTrafficButton and on each Map.setTraffic()
 	     */
 	    TrafficControl.prototype.updateButtonState = function () {
-	        if (this.isActive) {
-	            this.container.classList.add("in-use");
-	        }
-	        else {
-	            this.container.classList.remove("in-use");
-	        }
 	        if (this.trafficButton) {
+	            if (this.isActive) {
+	                this.container.classList.add("in-use");
+	            }
+	            else {
+	                this.container.classList.remove("in-use");
+	            }
 	            this.trafficButton.setAttribute("aria-pressed", this.isActive ? "true" : "false");
 	        }
 	    };
@@ -68415,6 +68413,7 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	var HijackablePromise = /** @class */ (function () {
 	    function HijackablePromise(origin) {
 	        var _this = this;
+	        this.isHijacked = function () { return _this._hijackedToResolve !== undefined || _this._hijackedToReject !== undefined; };
 	        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; };
@@ -68428,39 +68427,28 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	            }
 	            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) {
+	                    if (_this.isHijacked()) {
 	                        return;
 	                    }
-	                    if (!_this._hijackedToResolve) {
+	                    // origin was switched during invocation, discard the result and follow the chain
+	                    if (retainedInvocator_1 !== _this.origin) {
+	                        _this._thenResolver(resolve, reject);
+	                    }
+	                    else {
 	                        _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) {
+	                    if (_this.isHijacked()) {
 	                        return;
 	                    }
-	                    if (!_this._hijackedToReject) {
+	                    // origin was switched during invocation, discard the result and follow the chain
+	                    if (retainedInvocator_1 !== _this.origin) {
+	                        _this._thenResolver(resolve, reject);
+	                    }
+	                    else {
 	                        _this._toReject = error;
 	                        reject(error);
 	                    }
@@ -68487,14 +68475,20 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	    // tslint:disable-next-line: no-reserved-keywords
 	    HijackablePromise.prototype.catch = function (onrejected) {
 	        var _this = this;
-	        return new Promise(function (_, reject) {
+	        return new Promise(function (resolve, reject) {
+	            _this._resolve = resolve;
 	            _this._reject = reject;
-	            _this._catchResolver(reject);
-	        }).then(onrejected);
+	            _this._thenResolver(resolve, reject);
+	        }).catch(onrejected);
 	    };
 	    // tslint:disable-next-line: no-reserved-keywords
 	    HijackablePromise.prototype.finally = function (onfinally) {
-	        return this.origin.finally(onfinally);
+	        var _this = this;
+	        return new Promise(function (resolve, reject) {
+	            _this._resolve = resolve;
+	            _this._reject = reject;
+	            _this._thenResolver(resolve, reject);
+	        }).finally(onfinally);
 	    };
 	    HijackablePromise.prototype.hijackAndResolve = function (value) {
 	        this._hijackedToResolve = value;
@@ -68509,16 +68503,10 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	        }
 	    };
 	    HijackablePromise.prototype.switchWith = function (promise) {
-	        // switching the origin will discard the original in-progress promise result
+	        // switching the origin will discard the original in-progress promise result, as well any resolved non-hijacked state
 	        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);
-	        }
+	        this._toResolve = undefined;
+	        this._toReject = undefined;
 	    };
 	    return HijackablePromise;
 	}());
@@ -68551,7 +68539,8 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	        var _this = this;
 	        this.definitions = function () { return _this.initPromise ? _this.initPromise : _this.initStyleset(); };
 	        /**
-	         * Compatability indoor state used in styleDefinition filtering.
+	         * Compatibility indoor state used in styleDefinition filtering.
+	         * Legacy indoor module (2.0.6) will not set tilesetId
 	         */
 	        this.indoorState = undefined;
 	        /**
@@ -68608,13 +68597,13 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	    }
 	    StyleManager.prototype.updateIndoorState = function (theme, tilesetId) {
 	        var _this = this;
-	        var styleset = this.map.styles.getStyleSet();
+	        var styleset = this.map.styles.getMapConfiguration();
 	        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);
+	            var desiredIndoorStyle = this.map.getStyle().style ? this.map.getStyle().style + "_indoor" + (theme === 'dark' ? '_dark' : '') + "_tileset_" + tilesetId : undefined;
+	            this.map.styles.setMapConfiguration("defaultIndoor_" + tilesetId, styleset === 'microsoft-maps:default' ? desiredIndoorStyle : undefined);
 	        }
 	        else {
 	            this.indoorState = {
@@ -68623,9 +68612,15 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	            };
 	            this.initStyleset();
 	            this.definitions().then(function (definitions) {
-	                var currentStyle = _this.map.getStyle().style;
-	                var targetStyleName = currentStyle + "_indoor" + (_this.indoorState.theme == 'dark' ? '_dark' : '');
-	                _this.map.setStyle({ style: targetStyleName });
+	                var currentStyle = (_this.map.getStyle().style || definitions.defaultStyle)
+	                    .replace('_indoor_dark', '')
+	                    .replace('_indoor', '');
+	                // we cannot compose the precise style name for auto theme, search for prefix style name match
+	                var targetStylePrefix = currentStyle + "_indoor";
+	                var candidateStyle = definitions.styles.find(function (style) { return style.name.startsWith(targetStylePrefix); });
+	                if (candidateStyle) {
+	                    _this.map.setStyle({ style: candidateStyle.name });
+	                }
 	            });
 	        }
 	    };
@@ -68634,7 +68629,7 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	        var styleset = this.preservedPreindoorStyleset;
 	        if (styleset) {
 	            // we need to revert to the styleset that was ap
-	            this.map.styles.setStyleSet(styleset);
+	            this.map.styles.setMapConfiguration(styleset);
 	        }
 	        else {
 	            this.indoorState = undefined;
@@ -68666,7 +68661,19 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	                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'); })
+	                    .filter(function (style) {
+	                    if (!_this.indoorState) {
+	                        return !style.name.includes('indoor');
+	                        // NOTE: azure-maps-indoor prior to 2.0.7 will not pass theme auto
+	                        // the IndoorModule will request getTheme() from StyleManager and will call StyleManager.setStyleSet(theme == 'dark ? 'indoor_dark' : 'indoor') as approperaite 
+	                    }
+	                    else if (_this.indoorState.theme === 'auto') {
+	                        return style.name.endsWith(style.theme === 'dark' ? '_indoor_dark' : '_indoor');
+	                    }
+	                    else {
+	                        return style.name.endsWith(_this.indoorState.theme === 'dark' ? '_indoor_dark' : '_indoor');
+	                    }
+	                })
 	                    .map(function (style) { return ({
 	                    copyright: style.copyright.join(' '),
 	                    name: style.name,
@@ -68741,7 +68748,7 @@ 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 undefined;
 	        }
 	        return style.theme.toLowerCase();
 	    };
@@ -68758,7 +68765,7 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	    /**
 	     * Replaces the style set used. Very costly as it reloads all controls and resources.
 	     */
-	    StyleManager.prototype.setStyleSet = function (styleSet, styleName) {
+	    StyleManager.prototype.setMapConfiguration = function (styleSet, styleName) {
 	        var _this = this;
 	        this.serviceOptions.styleSet = styleSet;
 	        if (typeof styleSet === 'string') {
@@ -68780,9 +68787,24 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	            _this.map.setStyle({ style: targetStyleName });
 	        });
 	    };
-	    StyleManager.prototype.getStyleSet = function () {
+	    StyleManager.prototype.getMapConfiguration = function () {
 	        return this.serviceOptions.styleSet;
 	    };
+	    // backward-compatibility: this method preserves the interface that azure-maps-indoor@2.0.6 assumes
+	    StyleManager.prototype.setStyleSet = function (styleSet) {
+	        this.updateIndoorState(styleSet === 'indoor_dark' ? 'dark' : 'light', null);
+	    };
+	    // backward-compatibility: this method preserves the interface that azure-maps-indoor@2.0.6 assumes
+	    StyleManager.prototype.getStyleSet = function () {
+	        var legacyStyleset = this.indoorState !== undefined
+	            ? (this.indoorState.theme === 'dark' ? 'indoor_dark' : 'indoor')
+	            : 'base';
+	        return legacyStyleset;
+	    };
+	    // backward-compatibility: this method preserves the interface that azure-maps-indoor@2.0.6 assumes
+	    StyleManager.prototype.clearStyleSet = function () {
+	        this.unsetIndoorState();
+	    };
 	    /**
 	     * Function invoked by mapbox after a style is fetched but before it is committed to the map state.
 	     *