azure-maps-control 2.3.2 → 2.3.4

package/dist/atlas-core-bare-snr.js

@@ -265,7 +265,7 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
         return Url;
     }());
 
-    var version = "2.3.2";
+    var version = "2.3.4";
 
     /**
      * A helper class that provides methods for getting various forms of the map controls current version.
@@ -18359,7 +18359,7 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
             return undefined;
         };
         /**
-         * Removes all user added layers from the map.
+         * Removes all layers from the map.
          */
         LayerManager.prototype.clear = function () {
             for (var layerIndexIndex = this.layerIndex.length - 1; layerIndexIndex >= 0; layerIndexIndex--) {
@@ -20697,6 +20697,7 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
                 });
                 // Make the deferred layers visible once the map instance is fully loaded.
                 _this._progressiveLoadingState.pendingVisibilityChange = function () {
+                    var _a;
                     // Release the callback.
                     _this._progressiveLoadingState.pendingVisibilityChange = null;
                     // Bail out the callback once map style has changed.
@@ -20710,6 +20711,8 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
                         layer.layout.visibility = 'visible';
                         map.setLayoutProperty(layer.id, 'visibility', 'visible');
                     });
+                    // Reload attribution after the deferred layers are visible.
+                    (_a = _this.map.copyrightDelegate) === null || _a === void 0 ? void 0 : _a.reloadAttribution();
                 };
                 _this.map.events.addOnce('load', _this._progressiveLoadingState.pendingVisibilityChange);
             };
@@ -21182,36 +21185,37 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
                     params.url = targetUrl.href;
                 }
                 (_a = this.map.authentication) === null || _a === void 0 ? void 0 : _a.signRequest(params);
+                // Delete auth token for static assets to allow AFD caching
+                this._deleteAuthTokenForStaticAssets(params);
             }
         };
         /**
          * Fetches a json resource at the specified domain and path.
          */
         StyleManager.prototype._request = function (domain, path, resourceType, customQueryParams) {
-            var _a, _b;
+            var _a;
             if (customQueryParams === void 0) { customQueryParams = {}; }
             return __awaiter$3(this, void 0, void 0, function () {
                 var requestParams, fetchOptions;
-                var _c;
-                return __generator$3(this, function (_d) {
-                    switch (_d.label) {
+                var _b;
+                return __generator$3(this, function (_c) {
+                    switch (_c.label) {
                         case 0:
                             requestParams = {
                                 url: new Url({
                                     protocol: "https",
                                     domain: domain,
                                     path: path,
-                                    queryParams: __assign$8((_c = {}, _c[constants.apiVersionQueryParameter] = this.serviceOptions.styleAPIVersion, 
-                                    // Generate a hash code to avoid cache conflict
-                                    // TODO: Remove this once style version 2023-01-01 is publicly available
-                                    _c.hash = StyleManager._hashCode((_a = this.map.authentication) === null || _a === void 0 ? void 0 : _a.getToken()), _c), customQueryParams)
+                                    queryParams: __assign$8((_b = {}, _b[constants.apiVersionQueryParameter] = this.serviceOptions.styleAPIVersion, _b), customQueryParams)
                                 }).toString()
                             };
                             if (typeof this.serviceOptions.transformRequest === "function" && resourceType) {
                                 // If a transformRequest(...) was specified use it.
                                 requestParams = this.serviceOptions.transformRequest(requestParams.url, resourceType);
                             }
-                            (_b = this.map.authentication) === null || _b === void 0 ? void 0 : _b.signRequest(requestParams);
+                            (_a = this.map.authentication) === null || _a === void 0 ? void 0 : _a.signRequest(requestParams);
+                            // Delete auth token for static assets to allow AFD caching
+                            this._deleteAuthTokenForStaticAssets(requestParams);
                             fetchOptions = {
                                 method: "GET",
                                 mode: "cors",
@@ -21228,25 +21232,26 @@ 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*/, _d.sent()];
+                        case 1: return [2 /*return*/, _c.sent()];
                     }
                 });
             });
         };
         /**
-         * A basic helper function to generate a hash from an input string.
+         * Delete auth token for static assets to allow AFD caching.
          */
-        StyleManager._hashCode = function (str) {
-            if (str === void 0) { str = ""; }
-            var chr, hash = 0;
-            if (!str)
-                return hash;
-            for (var i = 0; i < str.length; i++) {
-                chr = str.charCodeAt(i);
-                hash = (hash << 5) - hash + chr;
-                hash |= 0; // Convert to 32bit integer
+        StyleManager.prototype._deleteAuthTokenForStaticAssets = function (params) {
+            // The following resources are considered as static assets.
+            // StyleSet    /styling/styles
+            // Style       /styling/styles/*
+            // Thumbnail   /styling/styles/*/thumbnail.png
+            // Sprite PNG  /styling/sprites/*/sprite@2x.png
+            // Sprite JSON /styling/sprites/*/sprite@2x.json
+            // Glyph       /styling/glyphs/*/0-255.pbf
+            if (params.url.startsWith("https://" + this.serviceOptions.staticAssetsDomain + "/" + constants.stylePath)) {
+                delete params.headers[constants.msClientIdHeaderName];
+                delete params.headers[constants.authorizationHeaderName];
             }
-            return hash;
         };
         return StyleManager;
     }());
@@ -22432,7 +22437,7 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
             this.dispose();
         };
         /**
-         * Removes all user added sources, layers, markers, and popups from the map.
+         * Removes all sources, layers, markers, and popups from the map.
          * User added images are preserved.
          */
         Map.prototype.clear = function () {

package/dist/atlas-core-bare.js

@@ -265,7 +265,7 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
         return Url;
     }());
 
-    var version = "2.3.2";
+    var version = "2.3.4";
 
     /**
      * A helper class that provides methods for getting various forms of the map controls current version.
@@ -21976,6 +21976,9 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
                     _this.reloadAttribution();
                 });
             };
+            /**
+             * @internal
+             */
             this.reloadAttribution = function () {
                 var sources = _this.getMapStyleVisibleSources();
                 // keep track of all rules as well as registered to determine redundant rules that won't get applied.
@@ -26078,7 +26081,7 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
             return undefined;
         };
         /**
-         * Removes all user added layers from the map.
+         * Removes all layers from the map.
          */
         LayerManager.prototype.clear = function () {
             for (var layerIndexIndex = this.layerIndex.length - 1; layerIndexIndex >= 0; layerIndexIndex--) {
@@ -28416,6 +28419,7 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
                 });
                 // Make the deferred layers visible once the map instance is fully loaded.
                 _this._progressiveLoadingState.pendingVisibilityChange = function () {
+                    var _a;
                     // Release the callback.
                     _this._progressiveLoadingState.pendingVisibilityChange = null;
                     // Bail out the callback once map style has changed.
@@ -28429,6 +28433,8 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
                         layer.layout.visibility = 'visible';
                         map.setLayoutProperty(layer.id, 'visibility', 'visible');
                     });
+                    // Reload attribution after the deferred layers are visible.
+                    (_a = _this.map.copyrightDelegate) === null || _a === void 0 ? void 0 : _a.reloadAttribution();
                 };
                 _this.map.events.addOnce('load', _this._progressiveLoadingState.pendingVisibilityChange);
             };
@@ -28901,36 +28907,37 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
                     params.url = targetUrl.href;
                 }
                 (_a = this.map.authentication) === null || _a === void 0 ? void 0 : _a.signRequest(params);
+                // Delete auth token for static assets to allow AFD caching
+                this._deleteAuthTokenForStaticAssets(params);
             }
         };
         /**
          * Fetches a json resource at the specified domain and path.
          */
         StyleManager.prototype._request = function (domain, path, resourceType, customQueryParams) {
-            var _a, _b;
+            var _a;
             if (customQueryParams === void 0) { customQueryParams = {}; }
             return __awaiter$4(this, void 0, void 0, function () {
                 var requestParams, fetchOptions;
-                var _c;
-                return __generator$4(this, function (_d) {
-                    switch (_d.label) {
+                var _b;
+                return __generator$4(this, function (_c) {
+                    switch (_c.label) {
                         case 0:
                             requestParams = {
                                 url: new Url({
                                     protocol: "https",
                                     domain: domain,
                                     path: path,
-                                    queryParams: __assign$8((_c = {}, _c[constants.apiVersionQueryParameter] = this.serviceOptions.styleAPIVersion, 
-                                    // Generate a hash code to avoid cache conflict
-                                    // TODO: Remove this once style version 2023-01-01 is publicly available
-                                    _c.hash = StyleManager._hashCode((_a = this.map.authentication) === null || _a === void 0 ? void 0 : _a.getToken()), _c), customQueryParams)
+                                    queryParams: __assign$8((_b = {}, _b[constants.apiVersionQueryParameter] = this.serviceOptions.styleAPIVersion, _b), customQueryParams)
                                 }).toString()
                             };
                             if (typeof this.serviceOptions.transformRequest === "function" && resourceType) {
                                 // If a transformRequest(...) was specified use it.
                                 requestParams = this.serviceOptions.transformRequest(requestParams.url, resourceType);
                             }
-                            (_b = this.map.authentication) === null || _b === void 0 ? void 0 : _b.signRequest(requestParams);
+                            (_a = this.map.authentication) === null || _a === void 0 ? void 0 : _a.signRequest(requestParams);
+                            // Delete auth token for static assets to allow AFD caching
+                            this._deleteAuthTokenForStaticAssets(requestParams);
                             fetchOptions = {
                                 method: "GET",
                                 mode: "cors",
@@ -28947,25 +28954,26 @@ 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*/, _d.sent()];
+                        case 1: return [2 /*return*/, _c.sent()];
                     }
                 });
             });
         };
         /**
-         * A basic helper function to generate a hash from an input string.
+         * Delete auth token for static assets to allow AFD caching.
          */
-        StyleManager._hashCode = function (str) {
-            if (str === void 0) { str = ""; }
-            var chr, hash = 0;
-            if (!str)
-                return hash;
-            for (var i = 0; i < str.length; i++) {
-                chr = str.charCodeAt(i);
-                hash = (hash << 5) - hash + chr;
-                hash |= 0; // Convert to 32bit integer
+        StyleManager.prototype._deleteAuthTokenForStaticAssets = function (params) {
+            // The following resources are considered as static assets.
+            // StyleSet    /styling/styles
+            // Style       /styling/styles/*
+            // Thumbnail   /styling/styles/*/thumbnail.png
+            // Sprite PNG  /styling/sprites/*/sprite@2x.png
+            // Sprite JSON /styling/sprites/*/sprite@2x.json
+            // Glyph       /styling/glyphs/*/0-255.pbf
+            if (params.url.startsWith("https://" + this.serviceOptions.staticAssetsDomain + "/" + constants.stylePath)) {
+                delete params.headers[constants.msClientIdHeaderName];
+                delete params.headers[constants.authorizationHeaderName];
             }
-            return hash;
         };
         return StyleManager;
     }());
@@ -30157,7 +30165,7 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
             this.dispose();
         };
         /**
-         * Removes all user added sources, layers, markers, and popups from the map.
+         * Removes all sources, layers, markers, and popups from the map.
          * User added images are preserved.
          */
         Map.prototype.clear = function () {