azure-maps-control 2.1.16 → 2.1.17

package/dist/atlas-core-bare.js

@@ -72,6 +72,7 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
     	apiVersionQueryParameter: "api-version",
     	authorizationHeaderName: "Authorization",
     	authorizationTokenPrefix: "Bearer ",
+    	jwtSasPrefix: "jwt-sas ",
     	domainPlaceHolder: "{{azMapsDomain}}",
     	legacyDomainPlaceHolder: "{azMapsDomain}",
     	viewPlaceHolder: "{{azMapsView}}",
@@ -342,7 +343,7 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
         return Url;
     }());
 
-    var version = "2.1.16";
+    var version = "2.1.17";
 
     /**
      * A helper class that provides methods for getting various forms of the map controls current version.
@@ -700,7 +701,7 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
                 delete this._container;
             }
             if (this._map) {
-                this._map.events.remove("styledata", this._onStyleChange);
+                this._map.events.remove("stylechanged", this._onStyleChange);
                 delete this._map;
             }
             if (this._observer) {
@@ -724,7 +725,7 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
             if (style.toLowerCase() === exports.ControlStyle.auto) {
                 this._map.styles.definitions().then(function (definitions) {
                     if (_this._map) {
-                        _this._map.events.add("styledata", _this._onStyleChange);
+                        _this._map.events.add("stylechanged", _this._onStyleChange);
                     }
                 });
             }
@@ -837,6 +838,15 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
                     }
                 }
             });
+            // Keep the focus on this control when esc key is pressed on the grid
+            grid.addEventListener("keydown", function (event) {
+                if (event.key === "Escape" || event.key === "Esc") {
+                    event.stopPropagation();
+                    rotationButton.focus();
+                    container.classList.remove("in-use");
+                    grid.classList.add("hidden-accessible-element");
+                }
+            });
             // If the control's position will require inverting the element order
             // add them in the opposite order to preserve tabindex.
             if (options && CompassControl.InvertOrderPositions.includes(options.position)) {
@@ -984,6 +994,7 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
             var _this = _super.call(this) || this;
             _this.container = null;
             _this.map = null;
+            _this.pitchButton = null;
             _this.pitchIncrementButton = null;
             _this.pitchDecrementButton = null;
             _this.hasMouse = false;
@@ -992,6 +1003,10 @@ 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;
+                // Keep the focus on this control when max/min pitch is reached
+                if (_this.hasFocus && _this.pitchButton && (minPitchReached || maxPitchReached)) {
+                    _this.pitchButton.focus();
+                }
                 if (_this.options.inverted) {
                     if (_this.pitchIncrementButton && _this.pitchIncrementButton.disabled != minPitchReached) {
                         _this.pitchIncrementButton.disabled = minPitchReached;
@@ -1054,6 +1069,15 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
                     }
                 }
             });
+            // Keep the focus on this control when esc key is pressed on the grid
+            grid.addEventListener("keydown", function (event) {
+                if (event.key === "Escape" || event.key === "Esc") {
+                    event.stopPropagation();
+                    pitchButton.focus();
+                    container.classList.remove("in-use");
+                    grid.classList.add("hidden-accessible-element");
+                }
+            });
             // If the control's position will require inverting the element order
             // add them in the opposite order to preserve tabindex.
             if (options && PitchControl.INVERT_ORDER_POSITIONS.includes(options.position)) {
@@ -1070,6 +1094,7 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
             }
             this.map = map;
             this.container = container;
+            this.pitchButton = pitchButton;
             map.events.add('pitch', this.pitchChanged);
             this.updatePitchButtonsState();
             return container;
@@ -1078,6 +1103,7 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
             if (this.container) {
                 this.container.remove();
                 this.container = null;
+                this.pitchButton = null;
                 this.pitchIncrementButton = null;
                 this.pitchDecrementButton = null;
             }
@@ -4450,7 +4476,7 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
             _super.prototype.onRemove.call(this);
             this.styleOpsGrid = null;
             this.styleButtons.clear();
-            this.map.events.remove("styledata", this.onStyleChange);
+            this.map.events.remove("stylechanged", this.onStyleChange);
             this.map.events.remove("stylesetchanged", this.onStylesetChange);
         };
         /**
@@ -4505,7 +4531,7 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
             var _this = this;
             var styleOptionButton = document.createElement("button");
             var friendlyName = this.mapToFriendlyStyleName(name, styleset);
-            styleOptionButton.setAttribute("alt", friendlyName);
+            styleOptionButton.setAttribute("aria-label", friendlyName);
             styleOptionButton.setAttribute("type", "button");
             var styleIconImage = new Image();
             fetchIconPromise
@@ -4525,9 +4551,7 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
                 }
                 _this.styleIcons.set(name, iconUrl);
             });
-            if (this.options.layout === "icons") {
-                styleIconImage.alt = friendlyName;
-            }
+            styleIconImage.setAttribute("aria-hidden", "true");
             styleOptionButton.appendChild(styleIconImage);
             if (this.options.layout === "icons") {
                 styleOptionButton.classList.add(StyleControl.Css.button);
@@ -4567,7 +4591,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);
@@ -4593,7 +4616,7 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
             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);
+                    this.map.events.add("stylechanged", this.onStyleChange);
                     return [2 /*return*/];
                 });
             }); });
@@ -4843,6 +4866,8 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
             _this.table = ["Fast",
                 ["green", "yellow", "red", "dark-red"],
                 "Slow"];
+            _this.map = null;
+            _this.syncHiddenState = null;
             return _this;
         }
         /**
@@ -4852,11 +4877,21 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
          * @return An HTMLElement to be placed on the map for the control.
          */
         TrafficLegendControl.prototype.onAdd = function (map) {
+            this.map = map;
             var container = this.buildContainer(map, exports.ControlStyle.auto, "Traffic Legend");
             var TrafficLegendDiv = this.buildTrafficLegendDiv(map);
+            container.setAttribute("role", "definition");
             container.appendChild(TrafficLegendDiv);
             return container;
         };
+        TrafficLegendControl.prototype.onRemove = function () {
+            _super.prototype.onRemove.call(this);
+            if (this.syncHiddenState) {
+                this.map.events.remove('styledata', this.syncHiddenState);
+                this.syncHiddenState = null;
+            }
+            this.map = null;
+        };
         TrafficLegendControl.prototype.buildTrafficLegendDiv = function (map) {
             var e_1, _a, e_2, _b;
             var trafficLegend = document.createElement("div");
@@ -4921,8 +4956,7 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
             }
             trafficLegendTable.appendChild(tr2);
             trafficLegend.appendChild(trafficLegendTable);
-            // display legend when the traffic flow is shown, hide it otherwise
-            map.events.add("styledata", function (eventData) {
+            this.syncHiddenState = function (eventData) {
                 if (eventData.dataType === "style") {
                     var trafficOptions = map.getTraffic();
                     if (trafficOptions.flow && trafficOptions.flow !== "none") {
@@ -4932,7 +4966,10 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
                         trafficLegend.classList.add("hidden");
                     }
                 }
-            });
+            };
+            // display legend when the traffic flow is shown, hide it otherwise
+            this.syncHiddenState({ dataType: 'style' });
+            map.events.add("styledata", this.syncHiddenState);
             return trafficLegend;
         };
         return TrafficLegendControl;
@@ -12763,6 +12800,12 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
             // They must use setOptions(...).
             return cloneDeepWith_1(this.options, PopupOptions._cloneCustomizer);
         };
+        /**
+         * Returns popup container element.
+         */
+        Popup.prototype.getPopupContainer = function () {
+            return this.containerDiv;
+        };
         /**
          * Drags the popup to the specified pixel.
          * Accounts for the pixel offset when dragging started.
@@ -13792,6 +13835,11 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
          * Literal value `"anonymous"`
          */
         AuthenticationType["anonymous"] = "anonymous";
+        /**
+         * The shared access signature authentication mechanism. Allows a callback responsible for acquiring a token to be provided on requests.
+         * Literal value `"sas"`.
+         */
+        AuthenticationType["sas"] = "sas";
     })(exports.AuthenticationType || (exports.AuthenticationType = {}));
     /**
      * Options for specifying how the map control should authenticate with the Azure Maps services.
@@ -13831,11 +13879,15 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
              */
             _this.aadInstance = undefined;
             /**
-             * A callback to use with the anonymous authentication mechanism.
+             * A callback to use with the anonymous/sas authentication mechanism.
              * This callback will be responsible for resolving to a authentication token.
              * E.g. fetching a CORS protected token from an endpoint.
              */
             _this.getToken = undefined;
+            /**
+             * Optionally provide an initial token for sas authentication.
+             */
+            _this.sasToken = undefined;
             /**
              * Optionally provide an existing `AuthenticationContext` from the ADAL.js library.
              * This authentication context will be used to acquire the AAD token.
@@ -13878,6 +13930,14 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
             this.authType = exports.AuthenticationType.anonymous;
             this.getToken = getTokenCallback;
         };
+        /**
+         * Sets the required options to configure the sas authentication method.
+         * @param getTokenCallback Callback function responsible for resolving to an authentication token.
+         */
+        AuthenticationOptions.prototype.setSasCallbackFunction = function (getTokenCallback) {
+            this.authType = exports.AuthenticationType.sas;
+            this.getToken = getTokenCallback;
+        };
         /**
          * Override the standard merge behavior to handle mutually exclusive options.
          * @internal
@@ -13897,6 +13957,9 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
             else if (merged.authType === exports.AuthenticationType.anonymous) {
                 merged.subscriptionKey = merged.authContext = merged.aadAppId = undefined;
             }
+            else if (merged.authType === exports.AuthenticationType.sas) {
+                merged.authContext = merged.subscriptionKey = merged.aadAppId = undefined;
+            }
             return merged;
         };
         return AuthenticationOptions;
@@ -14623,7 +14686,7 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
                 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(((_a = this.map.authentication) === null || _a === void 0 ? void 0 : _a.signRequest(urlOptions)) || urlOptions).get();
         };
         return NearbyGeographySearchService;
     }());
@@ -15827,8 +15890,10 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
                 _this.createMapKeyBindingInfo();
                 _this.map.getMapContainer().setAttribute("role", "application");
                 _this.map.getMapContainer().setAttribute("aria-label", "Map Application");
+                _this.map.getCanvasContainer().setAttribute("aria-live", "polite");
+                _this.map.getCanvasContainer().setAttribute("aria-describedby", "atlas-map-state atlas-map-style");
                 _this.map.getCanvas().setAttribute("aria-label", "Interactive Map");
-                _this.map.getCanvas().setAttribute("aria-describedby", "atlas-map-state atlas-map-style atlas-map-shortcuts");
+                _this.map.getCanvas().setAttribute("aria-describedby", "atlas-map-shortcuts");
                 _this.map.getCanvas().setAttribute("alt", "Interactive Map");
             };
             this.removeFromMap = function () {
@@ -15850,10 +15915,12 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
                 delete _this.atlasMapStyleInfo;
                 _this.map.getMapContainer().removeAttribute("role");
                 _this.map.getMapContainer().removeAttribute("aria-label");
+                _this.map.getCanvasContainer().removeAttribute("aria-live");
+                _this.map.getCanvasContainer().removeAttribute("aria-describedby");
                 _this.map.getCanvas().removeAttribute("aria-label");
                 _this.map.getCanvas().removeAttribute("aria-describedby");
                 _this.map.getCanvas().removeAttribute("alt");
-                _this.map.events.remove("styledata", _this.updateMapStyle);
+                _this.map.events.remove("stylechanged", _this.updateMapStyle);
             };
             this.createMapKeyBindingInfo = function () {
                 _this.atlasMapKeyBindings = document.createElement("div");
@@ -15878,7 +15945,6 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
                     "Jump focus to the map: Escape."
                 ].join("\n");
                 _this.map.getCanvasContainer().appendChild(_this.atlasMapKeyBindings);
-                _this.atlasMapKeyBindings.setAttribute("aria-live", "polite");
                 var baseShortcutKeyCodes = [
                     // - (zoom out)
                     189,
@@ -15910,7 +15976,6 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
                     _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 () {
@@ -15919,10 +15984,8 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
                 _this.atlasMapStyleInfo.setAttribute("aria-hidden", "true");
                 _this.atlasMapStyleInfo.id = "atlas-map-style";
                 _this.atlasMapStyleInfo.classList.add("hidden-accessible-element");
-                _this.updateMapStyle();
-                _this.map.events.add("styledata", _this.updateMapStyle);
+                _this.map.events.add("stylechanged", _this.updateMapStyle);
                 _this.map.getCanvasContainer().appendChild(_this.atlasMapStyleInfo);
-                _this.atlasMapStyleInfo.setAttribute("aria-live", "polite");
             };
             this.updateMapStyle = function () {
                 _this.atlasMapStyleInfo.innerHTML = "<p>Map style: " + _this.map.getStyle().style + ".</p>";
@@ -16220,15 +16283,106 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
                     _this.map.layers.add(_this.incidentLayer, "labels");
                 }
                 //Create a popup but leave it closed so we can update it and display it later.
-                _this.popup = new Popup({
+                _this.clickPopup = new Popup({
                     position: [0, 0],
                     pixelOffset: [0, -18]
                 });
                 _this.map.addEventListener("mouseover", _this.incidentLayerName, _this.cursorToPointer);
                 _this.map.addEventListener("mouseleave", _this.incidentLayerName, _this.cursorToDefault);
                 _this.map.addEventListener("click", _this.incidentLayerName, _this.openIncidentPopup);
+                _this.map.events.addOnce('idle', _this.setAccessiblePopups);
+                _this.map.events.add('moveend', _this.setAccessiblePopups);
             };
+            this.accessiblePopups = [];
+            this.setAccessiblePopups = function () { return __awaiter(_this, void 0, void 0, function () {
+                var features, localizedStrings, createPopup, insertHiddenBefore, insertHiddenInFront, addHidden;
+                var _this = this;
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0:
+                            this.accessiblePopups.forEach(function (popup) { return popup.remove(); });
+                            this.accessiblePopups = [];
+                            features = this.map.layers.getRenderedShapes(this.map.getCamera().bounds, this.incidentLayer);
+                            return [4 /*yield*/, this.map._getLocalizedStrings()];
+                        case 1:
+                            localizedStrings = _a.sent();
+                            createPopup = function (features, idx) {
+                                var incidentFeature = features[idx];
+                                var incidentPosition = incidentFeature.geometry.coordinates;
+                                var point = new Point(new Position(incidentPosition[0], incidentPosition[1]));
+                                var incident = new Incident(incidentFeature.properties, point, localizedStrings);
+                                var popup = IncidentPopupFactory.build(incident, _this.incidentLanguage);
+                                var element = popup.getPopupContainer();
+                                element.addEventListener('focusin', function (event) {
+                                    // side effects: clear other managed popups 
+                                    _this.clickPopup.remove();
+                                    _this.accessiblePopups.filter(function (p) { return p !== popup; }).forEach(function (popup) { return popup.remove(); });
+                                    // insert previous and next popups
+                                    if (idx - 1 >= 0) {
+                                        insertHiddenBefore(popup, createPopup(features, idx - 1));
+                                    }
+                                    if (idx + 1 < features.length) {
+                                        addHidden(createPopup(features, idx + 1));
+                                    }
+                                    // if we are on boundaries: add the first / last popup 
+                                    // to maintain popups on full page navigation cycle
+                                    if (idx >= 2 && idx == features.length - 1) {
+                                        insertHiddenInFront(createPopup(features, 0));
+                                    }
+                                    if (idx == 0 && features.length >= 2) {
+                                        addHidden(createPopup(features, features.length - 1));
+                                    }
+                                });
+                                if (idx == features.length - 1) {
+                                    element.addEventListener('focusout', function (event) {
+                                        // close the popup if we detect the focus moving away from the page (relatedTarget === null)
+                                        // (will remain open otherwise)
+                                        if (event.relatedTarget === null) {
+                                            popup.close();
+                                        }
+                                    });
+                                }
+                                _this.accessiblePopups.push(popup);
+                                return popup;
+                            };
+                            insertHiddenBefore = function (base, toInsert) {
+                                toInsert.open(_this.map);
+                                toInsert.close();
+                                var containerToSwapIn = toInsert.getPopupContainer();
+                                var baseContainer = base.getPopupContainer();
+                                baseContainer.parentElement.insertBefore(containerToSwapIn, baseContainer);
+                            };
+                            insertHiddenInFront = function (toInsert) {
+                                toInsert.open(_this.map);
+                                toInsert.close();
+                                var containerToSwapIn = toInsert.getPopupContainer();
+                                var parent = containerToSwapIn.parentElement;
+                                parent.insertBefore(containerToSwapIn, parent.firstElementChild);
+                            };
+                            addHidden = function (popup) {
+                                popup.open(_this.map);
+                                popup.close();
+                            };
+                            if (features.length > 0) {
+                                addHidden(createPopup(features, 0));
+                            }
+                            if (features.length > 1) {
+                                addHidden(createPopup(features, features.length - 1));
+                            }
+                            return [2 /*return*/];
+                    }
+                });
+            }); };
             this.removeFromMap = function () {
+                var _a;
+                _this.map.removeEventListener("mouseover", _this.incidentLayerName, _this.cursorToPointer);
+                _this.map.removeEventListener("mouseleave", _this.incidentLayerName, _this.cursorToDefault);
+                _this.map.removeEventListener("click", _this.incidentLayerName, _this.openIncidentPopup);
+                _this.map.events.remove('idle', _this.setAccessiblePopups);
+                _this.map.events.remove('moveend', _this.setAccessiblePopups);
+                _this.accessiblePopups.forEach(function (popup) { return popup.remove(); });
+                _this.accessiblePopups = [];
+                (_a = _this.clickPopup) === null || _a === void 0 ? void 0 : _a.remove();
                 if (_this.map.layers.getLayerById(_this.incidentLayerName) != null) {
                     _this.map.layers.remove(_this.incidentLayerName);
                 }
@@ -16243,14 +16397,22 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
                 _this.map.getCanvas().style.cursor = "";
             };
             this.openIncidentPopup = function (data) {
-                _this.popup.remove();
+                _this.clickPopup.remove();
+                _this.accessiblePopups.forEach(function (popup) { return popup.close(); });
                 var incidentPosition = data.position;
                 var incidentFeature = data.features[0];
                 _this.map._getLocalizedStrings().then(function (localizedStrings) {
                     var point = new Point(new Position(incidentPosition[0], incidentPosition[1]));
                     var incident = new Incident(incidentFeature.properties, point, localizedStrings);
-                    _this.popup = IncidentPopupFactory.build(incident, _this.incidentLanguage);
-                    _this.popup.open(_this.map);
+                    _this.clickPopup = IncidentPopupFactory.build(incident, _this.incidentLanguage);
+                    _this.clickPopup.open(_this.map);
+                    var element = _this.clickPopup.getPopupContainer();
+                    // ensures popup is closed on tabbing when the focus is moved away from the window
+                    element.addEventListener('focusout', function (event) {
+                        if (event.relatedTarget === null) {
+                            _this.clickPopup.close();
+                        }
+                    });
                 });
             };
             this.map = map;
@@ -21958,17 +22120,19 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
              * Triggers the user provided function to fetch the token and stores it.
              * @internal
              */
-            this._triggerTokenFetch = function () {
+            this._triggerTokenFetch = function (isAnonymousAuth) {
+                if (isAnonymousAuth === void 0) { isAnonymousAuth = false; }
                 return new Promise(function (resolve, reject) {
+                    if (typeof _this.options.getToken !== "function") {
+                        reject(new Error("Token cannot be " + (isAnonymousAuth ? 'fetched' : 'renewed') + " because getToken was not set or is not a function."));
+                        return;
+                    }
                     _this.options.getToken(function (token) {
                         try {
                             // Try to get the timeout first as this will guarantee the token is correctly formatted.
                             var timeout = _this._getTokenExpiry(token) - AuthenticationManager.constants.tokenRefreshClockSkew;
-                            _this._storeAccessToken(token);
-                            clearTimeout(_this.tokenTimeOutHandle); // Clear the previous refresh timeout in case it hadn't triggered yet.
-                            // @ts-ignore
-                            // tslint:disable-next-line: no-string-based-set-timeout
-                            _this.tokenTimeOutHandle = setTimeout(_this._triggerTokenFetch, timeout * 1000);
+                            _this._storeToken(token);
+                            _this._setTimeoutTokenFetch(timeout);
                             resolve();
                         }
                         catch (_a) {
@@ -21979,6 +22143,18 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
                     }, _this.map);
                 });
             };
+            /**
+             * Create a timer to trigger the user provided function to fetch the token.
+             * @param seconds delay in seconds
+             * @internal
+             */
+            this._setTimeoutTokenFetch = function (seconds) {
+                clearTimeout(_this.tokenTimeOutHandle); // Clear the previous refresh timeout in case it hadn't triggered yet.
+                // @ts-ignore
+                // tslint:disable-next-line: no-string-based-set-timeout
+                _this.tokenTimeOutHandle = setTimeout(_this._triggerTokenFetch, Math.min(seconds * 1000, 0x7fffffff) // setTimeout will fire immediately if the delay is greater than 2^31-1.
+                );
+            };
             var serviceOptions = map.getServiceOptions();
             this.options = serviceOptions.authOptions;
             this.sessionId = serviceOptions.sessionId;
@@ -22020,6 +22196,28 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
                     }
                     else if (_this.options.authType === exports.AuthenticationType.anonymous) {
                         // Anonymous authentication, just call the users provided callback.
+                        resolve(_this._triggerTokenFetch(true));
+                    }
+                    else if (_this.options.authType === exports.AuthenticationType.sas) {
+                        if (_this.options.sasToken) {
+                            var expiresIn = -1;
+                            try {
+                                expiresIn = _this._getTokenExpiry(_this.options.sasToken);
+                            }
+                            catch (_a) {
+                                reject(new Error("An invalid sasToken was provided."));
+                                return;
+                            }
+                            if (expiresIn > AuthenticationManager.constants.tokenRefreshClockSkew) {
+                                // Save the initial token
+                                _this._storeToken(_this.options.sasToken);
+                                // Create a timer to refresh the token
+                                _this._setTimeoutTokenFetch(expiresIn - AuthenticationManager.constants.tokenRefreshClockSkew);
+                                resolve();
+                                return;
+                            }
+                        }
+                        // Call the users provided callback to fetch the token.
                         resolve(_this._triggerTokenFetch());
                     }
                     else {
@@ -22145,8 +22343,9 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
                 }
                 return token_1;
             }
-            else if (this.options.authType === exports.AuthenticationType.anonymous) {
-                var token = this._getItem(AuthenticationManager.constants.storage.accessTokenKey);
+            else if (this.options.authType === exports.AuthenticationType.anonymous
+                || this.options.authType === exports.AuthenticationType.sas) {
+                var token = this._getItem(AuthenticationManager.constants.storage.tokenKey);
                 if (!token) {
                     // Cached Token not present, invoke the user provided callback function to fetch function
                     this._triggerTokenFetch();
@@ -22161,7 +22360,7 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
                     }
                     else if (expiresIn <= 0) {
                         // token renew failed and dont have a token.
-                        this._saveItem(AuthenticationManager.constants.storage.accessTokenKey, "");
+                        this._saveItem(AuthenticationManager.constants.storage.tokenKey, "");
                         throw new Error(AuthenticationManager.constants.errors.tokenExpired);
                     }
                 }
@@ -22190,9 +22389,9 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
          * @param token token fetched from the user's server endpoint
          * @internal
          */
-        AuthenticationManager.prototype._storeAccessToken = function (token) {
+        AuthenticationManager.prototype._storeToken = function (token) {
             // Store the value
-            this._saveItem(AuthenticationManager.constants.storage.accessTokenKey, token);
+            this._saveItem(AuthenticationManager.constants.storage.tokenKey, token);
             var tokenEvent = {
                 map: this.map,
                 type: AuthenticationManager.constants.events.tokenAcquired
@@ -22281,7 +22480,7 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
             }
         };
         /**
-         * Return the number of milliseconds since 1970/01/01
+         * Return the number of seconds since 1970/01/01
          * @ignore
          */
         AuthenticationManager.prototype._getCurrentTime = function () {
@@ -22300,6 +22499,9 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
                     request.headers[constants.msClientIdHeaderName] = this.options.clientId;
                     request.headers[constants.authorizationHeaderName] = constants.authorizationTokenPrefix + token;
                     break;
+                case exports.AuthenticationType.sas:
+                    request.headers[constants.authorizationHeaderName] = constants.jwtSasPrefix + token;
+                    break;
                 case exports.AuthenticationType.subscriptionKey:
                     request.headers["subscription-key"] = token;
                     break;
@@ -22315,7 +22517,7 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
             // Enable localStorage for IE, as sessionStorage does not work for localhost.
             preferredCacheLocation: "localStorage",
             storage: {
-                accessTokenKey: "access.token.key",
+                tokenKey: "access.token.key",
                 testStorageKey: "testStorage"
             },
             events: {
@@ -24900,6 +25102,11 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
              * @default true
              */
             _this.showLogo = true;
+            /**
+             * Specifies if the map should display labels
+             * @default true
+             */
+            _this.showLabels = true;
             /**
              * Additional custom attribution appended to map attribution.
              * Default `undefined`
@@ -25471,6 +25678,7 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
         }
         StyleManager.prototype.updateIndoorState = function (theme, tilesetId) {
             var _this = this;
+            var _a;
             var styleset = this.map.styles.getMapConfiguration();
             if (styleset) {
                 this.preservedPreindoorStyleset = styleset;
@@ -25480,6 +25688,7 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
                 this.map.styles.setMapConfiguration("defaultIndoor_" + tilesetId, styleset === 'microsoft-maps:default' ? desiredIndoorStyle : undefined);
             }
             else {
+                var didTilesetIdChange_1 = ((_a = this.indoorState) === null || _a === void 0 ? void 0 : _a.tilesetId) !== tilesetId;
                 this.indoorState = {
                     tilesetId: tilesetId,
                     theme: theme
@@ -25493,7 +25702,8 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
                     var targetStylePrefix = currentStyle + "_indoor";
                     var candidateStyle = definitions.styles.find(function (style) { return style.name.startsWith(targetStylePrefix); });
                     if (candidateStyle) {
-                        _this.map.setStyle({ style: candidateStyle.name });
+                        // force style reload if tileset id has changed to make sure the tiles will be re-requested with new tileset applied in indoor source placeholder
+                        _this.map.setStyle({ style: candidateStyle.name }, !didTilesetIdChange_1);
                     }
                 });
             }
@@ -25531,7 +25741,7 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
                 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 ({
+                newPromise = new HijackablePromise(this._request(this.serviceOptions.staticAssetsDomain, constants.stylePath + "/" + constants.styleResourcePath, "StyleDefinitions", { version: this.serviceOptions.styleDefinitionsVersion }).then(function (definitions) { return ({
                     version: isNaN(definitions.version) ? 0 : parseFloat(definitions.version),
                     defaultStyle: definitions.defaultStyle,
                     styles: definitions.styles
@@ -25558,9 +25768,7 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
                             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
+                                styleVersion: _this.serviceOptions.styleDefinitionsVersion,
                             },
                             protocol: "https"
                         }).toString(),
@@ -25604,10 +25812,11 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
         /**
          * @internal
          */
-        StyleManager.prototype.setStyle = function (styleOptions) {
+        StyleManager.prototype.setStyle = function (styleOptions, diff) {
+            if (diff === void 0) { diff = true; }
             try {
                 this.map._getMap().setStyle(this.getStyle(styleOptions), {
-                    diff: true,
+                    diff: diff,
                     stylePatch: this._stylePatch.bind(this),
                     validate: this.serviceOptions.validateStyle
                 });
@@ -25718,7 +25927,7 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
                 currentLayerGroupLayers = [];
             };
             nextStyle.layers.forEach(function (nextLayer) {
-                var _a, _b, _c;
+                var _a, _b, _c, _d, _e;
                 var layerGroup = LayerGroupComparator.getLayerGroup(nextLayer);
                 currentLayerGroupId = currentLayerGroupId ? currentLayerGroupId : layerGroup;
                 // Set visiblity of fill-extrusion layers according to StyleOptions.showBuildingModels
@@ -25740,6 +25949,20 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
                         nextLayer.layout.visibility = "visible";
                     }
                 }
+                // Set visibility of labels
+                var isLabelLayerGroup = layerGroup === 'labels' || layerGroup === 'labels_places' || layerGroup === 'labels_indoor';
+                if (isLabelLayerGroup && nextLayer.type === 'symbol') {
+                    if (styleOptions.showLabels) {
+                        updateLayoutProperty(nextLayer.id, "visibility", "visible");
+                        nextLayer.layout = (_d = nextLayer.layout) !== null && _d !== void 0 ? _d : {};
+                        nextLayer.layout.visibility = "visible";
+                    }
+                    else {
+                        updateLayoutProperty(nextLayer.id, "visibility", "none");
+                        nextLayer.layout = (_e = nextLayer.layout) !== null && _e !== void 0 ? _e : {};
+                        nextLayer.layout.visibility = "none";
+                    }
+                }
                 // Once this _stylePatch returns control to maplibre the next style will be applied immediately in the same context.
                 // To avoid potential data races update LayerManager with new a new set of FundamentalMapLayers from here instead of 
                 // waiting for a styledata.load event to trigger a sync in a different context.
@@ -25802,7 +26025,7 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
             // If there was a previous styledata change event attached, remove it.
             // When the sprite url changes between style changes then mapbox can't perform the diff
             // In such cases it recalculate the style again. Removing previous attached 
-            // event listner makes sure that style changed event is not fired twice in these cases.
+            // event listener makes sure that style changed event is not fired twice in these cases.
             this.map.events.remove("styledata", this._onStyleData);
             this.map.events.addOnce("styledata", this._onStyleData);
         };
@@ -25831,8 +26054,16 @@ 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);
+            if (params.url.toLocaleLowerCase().includes(this.serviceOptions.domain.toLocaleLowerCase()) ||
+                params.url.toLocaleLowerCase().includes(this.serviceOptions.staticAssetsDomain.toLocaleLowerCase())) {
+                // Only add API version param for Azure maps domain requests
+                var targetUrl = new URL(params.url);
+                if (!targetUrl.searchParams.get(constants.apiVersionQueryParameter)) {
+                    targetUrl.searchParams.set(constants.apiVersionQueryParameter, this.serviceOptions.styleAPIVersion);
+                    params.url = targetUrl.href;
+                }
+                (_a = this.map.authentication) === null || _a === void 0 ? void 0 : _a.signRequest(params);
+            }
         };
         /**
          * Fetches a json resource at the specified domain and path.
@@ -26237,8 +26468,10 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
         /**
          * Set the map control's style options. Any options not specified will default to their current values.
          * @param options The options for setting the style of the map control.
+         * @param diff [true] If false, forces a 'full' style update, removing the current style and building the given one instead of attempting a diff-based update. Defaults to true.
          */
-        Map.prototype.setStyle = function (options) {
+        Map.prototype.setStyle = function (options, diff) {
+            if (diff === void 0) { diff = true; }
             // This option may only be set when initializing the map.
             // The delete operation will handle non-exist property.
             delete options.preserveDrawingBuffer;
@@ -26276,7 +26509,7 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
             // if the language is changed, then either those delegates need changed
             // or the styledata event manually invoked.
             this.styleOptions = newOptions;
-            this._setStyleComponents(newOptions);
+            this._setStyleComponents(newOptions, diff);
         };
         /**
          * Returns the map control's current style settings.
@@ -26938,10 +27171,11 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
         /**
          * @internal
          */
-        Map.prototype._rebuildStyle = function () {
+        Map.prototype._rebuildStyle = function (diff) {
+            if (diff === void 0) { diff = true; }
             return __awaiter(this, void 0, void 0, function () {
                 return __generator(this, function (_a) {
-                    this.styles.setStyle(this.styleOptions);
+                    this.styles.setStyle(this.styleOptions, diff);
                     this.imageSprite._restoreImages();
                     return [2 /*return*/];
                 });
@@ -27052,8 +27286,9 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
          * Removes sources and layers that aren't used by the new style or any remaining layers.
          * @private
          */
-        Map.prototype._setStyleComponents = function (styleOptions) {
+        Map.prototype._setStyleComponents = function (styleOptions, diff) {
             var _this = this;
+            if (diff === void 0) { diff = true; }
             if (this.removed) {
                 return;
             }
@@ -27063,7 +27298,7 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
                     _this.styleOptions.style = styleSet.defaultStyle;
                 }
                 _this.styleOptions = styleOptions;
-                _this._rebuildStyle();
+                _this._rebuildStyle(diff);
             });
             return;
         };
@@ -27109,7 +27344,7 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
                 var w = BoundingBox.getWest(bounds);
                 var n = BoundingBox.getNorth(bounds);
                 var e = BoundingBox.getEast(bounds);
-                if (isNaN(s) || isNaN(w) || isNaN(n) || isNaN(e)) {
+                if (!isFinite(s) || !isFinite(w) || !isFinite(n) || !isFinite(e)) {
                     throw new Error("The bounds specified are invalid: [" + bounds + "]");
                 }
                 while (w > e) {