azure-maps-control 2.2.2 → 2.2.3

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.2.2";
+    var version = "2.2.3";
 
     /**
      * A helper class that provides methods for getting various forms of the map controls current version.
@@ -14672,6 +14672,10 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
                 defaultRegion: {
                     code: "NGT",
                     strings: "en/resource.json"
+                },
+                latn: {
+                    code: "NGT-Latn",
+                    strings: "en/resource.json"
                 }
             },
             ar: {
@@ -14718,6 +14722,18 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
                 us: {
                     code: "en-US",
                     strings: "en/resource.json"
+                },
+                au: {
+                    code: "en-AU",
+                    strings: "en/resource.json"
+                },
+                gb: {
+                    code: "en-GB",
+                    strings: "en/resource.json"
+                },
+                nz: {
+                    code: "en-NZ",
+                    strings: "en/resource.json"
                 }
             },
             es: {
@@ -14843,14 +14859,31 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
                 }
             },
             zh: {
+                // per https://microsoft.sharepoint.com/sites/globalreadiness/SitePages/Language-fallback.aspx
+                // Chinese - Neutral (zh) fallbacks to en-US
                 defaultRegion: {
-                    code: "zh-Hant",
-                    strings: "zh-tw/resource.json"
+                    code: "zh",
+                    strings: "en/resource.json"
+                }
+            },
+            "zh-hans": {
+                defaultRegion: {
+                    code: "zh-Hans",
+                    strings: "zh-cn/resource.json"
+                },
+                cn: {
+                    code: "zh-Hans-CN",
+                    strings: "zh-cn/resource.json"
                 }
             },
             "zh-hant": {
+                // per discussion with global readiness team, we were explicitly asked to not fallback zh-hant to zh-tw
                 defaultRegion: {
                     code: "zh-Hant",
+                    strings: "en/resource.json"
+                },
+                tw: {
+                    code: "zh-Hant-TW",
                     strings: "zh-tw/resource.json"
                 }
             }
@@ -15479,7 +15512,7 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
     /**
      * 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 }.
-     * It is your responsibility to determine the location of your users, and then set the View parameter correctly for that location. The View parameter in Azure Maps must be used in compliance with applicable laws, including those regarding mapping, of the country where maps, images and other data and third party content that You are authorized to access via Azure Maps is made available.
+     * It is your responsibility to determine the location of your users, and then set the View parameter correctly for that location. The View parameter in Azure Maps must be used in compliance with applicable laws, including those regarding mapping, of the country/region where maps, images and other data and third party content that You are authorized to access via Azure Maps is made available.
      * @param view The new default view
      */
     function setView(view) {
@@ -19472,7 +19505,7 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
             /**
              * 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}
-             * It is your responsibility to determine the location of your users, and then set the View parameter correctly for that location. The View parameter in Azure Maps must be used in compliance with applicable laws, including those regarding mapping, of the country where maps, images and other data and third party content that You are authorized to access via Azure Maps is made available.
+             * It is your responsibility to determine the location of your users, and then set the View parameter correctly for that location. The View parameter in Azure Maps must be used in compliance with applicable laws, including those regarding mapping, of the country/region where maps, images and other data and third party content that You are authorized to access via Azure Maps is made available.
              * default: `undefined`
              * @default undefined
              */
@@ -20103,6 +20136,13 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
              * Preserve the map configuration that was used before the indoor map configuration was set
              */
             this.preservedPreindoorMapConfiguration = undefined;
+            /**
+             * The state of the progressive loading
+             */
+            this._progressiveLoadingState = {
+                mapStyle: undefined,
+                pendingVisibilityChange: undefined,
+            };
             this._deferLayerGroupVisibilities = function (layerGroupLayers, initLayerGroups) {
                 var validInitLayerGroups = initLayerGroups.filter(function (groupName) { return groupName in layerGroupLayers; });
                 // If the initial layer groups are invalid, skip the progressive loading.
@@ -20110,7 +20150,15 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
                     return;
                 var map = _this.map._getMap();
                 var currentZoomLevel = map.getZoom();
-                // Select the layers to be deferred
+                var currentMapStyle = _this.map.getStyle().style;
+                // Cancel and release previous pending callback, if any.
+                if (_this._progressiveLoadingState.pendingVisibilityChange) {
+                    _this.map.events.remove('load', _this._progressiveLoadingState.pendingVisibilityChange);
+                    _this._progressiveLoadingState.pendingVisibilityChange = null;
+                }
+                // Keep the current map style for future comparison.
+                _this._progressiveLoadingState.mapStyle = currentMapStyle;
+                // Select deferrable layers
                 var deferredLayers = Object.entries(layerGroupLayers).reduce(function (deferred, _a) {
                     var _b = __read$c(_a, 2), groupName = _b[0], layers = _b[1];
                     var isInInitialLayerGroup = validInitLayerGroups.includes(groupName);
@@ -20137,22 +20185,34 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
                                 return false;
                             }
                         }
-                        // Defer visible layers only.
+                        // Select visible layers only.
                         return ((_a = layer.layout) === null || _a === void 0 ? void 0 : _a.visibility) !== 'none';
                     })));
                 }, []);
-                // Hide the deferred layers at initial load, therefore we can save the render time.
+                // Hide the deferrable layers at initial load, therefore we can save the render time.
                 deferredLayers.forEach(function (layer) {
+                    // Since this happens before sending style object into the map rendering,
+                    // we only need to update the style object, but not necessary to update maplibre's layout properties.
                     layer.layout = layer.layout || {};
                     layer.layout.visibility = 'none';
                 });
-                // Make the deferred layers visible once the map instance is fully loaded
-                _this.map.events.addOnce('load', function () {
+                // Make the deferred layers visible once the map instance is fully loaded.
+                _this._progressiveLoadingState.pendingVisibilityChange = function () {
+                    // Release the callback.
+                    _this._progressiveLoadingState.pendingVisibilityChange = null;
+                    // Bail out the callback once map style has changed.
+                    var nextMapStyle = _this.map.getStyle().style;
+                    if (currentMapStyle !== nextMapStyle)
+                        return;
+                    // Make deferred layers visible
                     deferredLayers.forEach(function (layer) {
+                        // This happens after the map rendering; Therefore, we need to update
+                        // both the style object and the maplibre's layout properties.
                         layer.layout.visibility = 'visible';
                         map.setLayoutProperty(layer.id, 'visibility', 'visible');
                     });
-                });
+                };
+                _this.map.events.addOnce('load', _this._progressiveLoadingState.pendingVisibilityChange);
             };
             this._onStyleData = function () {
                 _this._lookUpAsync(_this.map.getStyle()).then(function (style) {
@@ -20434,18 +20494,6 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
             // should be modified before they are applied to the map.
             var styleOptions = this.map.getStyle();
             var trafficOptions = this.map.getTraffic();
-            // force a replacement of language placeholder in the tileset url to avoid resolution to a same cache with placeholders on language change
-            nextStyle.sources = Object.entries(nextStyle.sources).reduce(function (newSources, _a) {
-                var _b = __read$c(_a, 2), sourceKey = _b[0], source = _b[1];
-                var newSource = __assign$8({}, source);
-                if ('url' in newSource && typeof newSource.url === 'string') {
-                    if (newSource.url.includes(constants.languagePlaceHolder)) {
-                        newSource.url = newSource.url.replace(constants.languagePlaceHolder, styleOptions.language);
-                    }
-                }
-                newSources[sourceKey] = newSource;
-                return newSources;
-            }, {});
             var shouldProgressiveLoading = (styleOptions.progressiveLoading &&
                 // The feature only effective at the initial load.
                 !this.map._isLoaded());
@@ -21003,6 +21051,12 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
                 if (!mapboxCameraOptions) {
                     throw new Error("The map cannot be fit to the current canvas with the given CameraBoundsOptions.");
                 }
+                if ('pitch' in options) {
+                    mapboxCameraOptions.pitch = options.pitch;
+                }
+                if ('bearing' in options) {
+                    mapboxCameraOptions.bearing = options.bearing;
+                }
                 this.map.setMaxZoom(cameraBoundsOptions.maxZoom);
                 this._invokeEvent("maxzoomchanged", this.map.getMaxZoom());
                 maxBounds = this._generateSafeBounds(cameraBoundsOptions.maxBounds);
@@ -21125,8 +21179,9 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
             // If this function is restructured such that a styledata event won't always trigger
             // if the language is changed, then either those delegates need changed
             // or the styledata event manually invoked.
+            var noDiffOnLanguageViewChange = diff && (this.styleOptions.language === newOptions.language && this.styleOptions.view === newOptions.view);
             this.styleOptions = newOptions;
-            this._setStyleComponents(newOptions, diff);
+            this._setStyleComponents(newOptions, noDiffOnLanguageViewChange);
         };
         /**
          * Returns the map control's current style settings.

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.2.2";
+    var version = "2.2.3";
 
     /**
      * A helper class that provides methods for getting various forms of the map controls current version.
@@ -14672,6 +14672,10 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
                 defaultRegion: {
                     code: "NGT",
                     strings: "en/resource.json"
+                },
+                latn: {
+                    code: "NGT-Latn",
+                    strings: "en/resource.json"
                 }
             },
             ar: {
@@ -14718,6 +14722,18 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
                 us: {
                     code: "en-US",
                     strings: "en/resource.json"
+                },
+                au: {
+                    code: "en-AU",
+                    strings: "en/resource.json"
+                },
+                gb: {
+                    code: "en-GB",
+                    strings: "en/resource.json"
+                },
+                nz: {
+                    code: "en-NZ",
+                    strings: "en/resource.json"
                 }
             },
             es: {
@@ -14843,14 +14859,31 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
                 }
             },
             zh: {
+                // per https://microsoft.sharepoint.com/sites/globalreadiness/SitePages/Language-fallback.aspx
+                // Chinese - Neutral (zh) fallbacks to en-US
                 defaultRegion: {
-                    code: "zh-Hant",
-                    strings: "zh-tw/resource.json"
+                    code: "zh",
+                    strings: "en/resource.json"
+                }
+            },
+            "zh-hans": {
+                defaultRegion: {
+                    code: "zh-Hans",
+                    strings: "zh-cn/resource.json"
+                },
+                cn: {
+                    code: "zh-Hans-CN",
+                    strings: "zh-cn/resource.json"
                 }
             },
             "zh-hant": {
+                // per discussion with global readiness team, we were explicitly asked to not fallback zh-hant to zh-tw
                 defaultRegion: {
                     code: "zh-Hant",
+                    strings: "en/resource.json"
+                },
+                tw: {
+                    code: "zh-Hant-TW",
                     strings: "zh-tw/resource.json"
                 }
             }
@@ -15479,7 +15512,7 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
     /**
      * 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 }.
-     * It is your responsibility to determine the location of your users, and then set the View parameter correctly for that location. The View parameter in Azure Maps must be used in compliance with applicable laws, including those regarding mapping, of the country where maps, images and other data and third party content that You are authorized to access via Azure Maps is made available.
+     * It is your responsibility to determine the location of your users, and then set the View parameter correctly for that location. The View parameter in Azure Maps must be used in compliance with applicable laws, including those regarding mapping, of the country/region where maps, images and other data and third party content that You are authorized to access via Azure Maps is made available.
      * @param view The new default view
      */
     function setView(view) {
@@ -16212,8 +16245,6 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
             this._minRoadDistance = 25;
             // 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";
             /*
              * Show details based on zoom level.
              *
@@ -16635,6 +16666,8 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
             this._map.events.addOnce("idle", function () {
                 if (!_this._disposed) {
                     _this._updateCam(true);
+                    // Find the id of the vector tile source being used.
+                    _this._baseVectorTileSourceId = MapViewDescriptor._baseVectorTileSourceIds.find(function (id) { return _this._map.sources.getById(id); });
                     // 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();
@@ -16732,8 +16765,9 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
                             info_1 = {};
                             cPx_1 = this._map.positionsToPixels([cam.center])[0];
                             ErrorHandler.tryCatch(this._map, function () {
-                                intersects_1 = _this._map._getMap().queryRenderedFeatures(cPx_1, {
-                                    layers: _this._polygonStyleLayer,
+                                var map = _this._map._getMap();
+                                intersects_1 = map.queryRenderedFeatures(cPx_1, {
+                                    layers: _this._polygonStyleLayer.filter(function (layerId) { return map.getLayer(layerId); }),
                                     filter: ["==", ["geometry-type"], "Polygon"]
                                 });
                             }, function () { });
@@ -17241,6 +17275,8 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
             if (increment === void 0) { increment = 1; }
             return Math.round(val / increment) * increment;
         };
+        // Ids of vector tile sources for different style APIs.
+        MapViewDescriptor._baseVectorTileSourceIds = ["microsoft.base", "vectorTiles", "bing-mvt"];
         return MapViewDescriptor;
     }());
 
@@ -27061,7 +27097,7 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
             /**
              * 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}
-             * It is your responsibility to determine the location of your users, and then set the View parameter correctly for that location. The View parameter in Azure Maps must be used in compliance with applicable laws, including those regarding mapping, of the country where maps, images and other data and third party content that You are authorized to access via Azure Maps is made available.
+             * It is your responsibility to determine the location of your users, and then set the View parameter correctly for that location. The View parameter in Azure Maps must be used in compliance with applicable laws, including those regarding mapping, of the country/region where maps, images and other data and third party content that You are authorized to access via Azure Maps is made available.
              * default: `undefined`
              * @default undefined
              */
@@ -27692,6 +27728,13 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
              * Preserve the map configuration that was used before the indoor map configuration was set
              */
             this.preservedPreindoorMapConfiguration = undefined;
+            /**
+             * The state of the progressive loading
+             */
+            this._progressiveLoadingState = {
+                mapStyle: undefined,
+                pendingVisibilityChange: undefined,
+            };
             this._deferLayerGroupVisibilities = function (layerGroupLayers, initLayerGroups) {
                 var validInitLayerGroups = initLayerGroups.filter(function (groupName) { return groupName in layerGroupLayers; });
                 // If the initial layer groups are invalid, skip the progressive loading.
@@ -27699,7 +27742,15 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
                     return;
                 var map = _this.map._getMap();
                 var currentZoomLevel = map.getZoom();
-                // Select the layers to be deferred
+                var currentMapStyle = _this.map.getStyle().style;
+                // Cancel and release previous pending callback, if any.
+                if (_this._progressiveLoadingState.pendingVisibilityChange) {
+                    _this.map.events.remove('load', _this._progressiveLoadingState.pendingVisibilityChange);
+                    _this._progressiveLoadingState.pendingVisibilityChange = null;
+                }
+                // Keep the current map style for future comparison.
+                _this._progressiveLoadingState.mapStyle = currentMapStyle;
+                // Select deferrable layers
                 var deferredLayers = Object.entries(layerGroupLayers).reduce(function (deferred, _a) {
                     var _b = __read$e(_a, 2), groupName = _b[0], layers = _b[1];
                     var isInInitialLayerGroup = validInitLayerGroups.includes(groupName);
@@ -27726,22 +27777,34 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
                                 return false;
                             }
                         }
-                        // Defer visible layers only.
+                        // Select visible layers only.
                         return ((_a = layer.layout) === null || _a === void 0 ? void 0 : _a.visibility) !== 'none';
                     })));
                 }, []);
-                // Hide the deferred layers at initial load, therefore we can save the render time.
+                // Hide the deferrable layers at initial load, therefore we can save the render time.
                 deferredLayers.forEach(function (layer) {
+                    // Since this happens before sending style object into the map rendering,
+                    // we only need to update the style object, but not necessary to update maplibre's layout properties.
                     layer.layout = layer.layout || {};
                     layer.layout.visibility = 'none';
                 });
-                // Make the deferred layers visible once the map instance is fully loaded
-                _this.map.events.addOnce('load', function () {
+                // Make the deferred layers visible once the map instance is fully loaded.
+                _this._progressiveLoadingState.pendingVisibilityChange = function () {
+                    // Release the callback.
+                    _this._progressiveLoadingState.pendingVisibilityChange = null;
+                    // Bail out the callback once map style has changed.
+                    var nextMapStyle = _this.map.getStyle().style;
+                    if (currentMapStyle !== nextMapStyle)
+                        return;
+                    // Make deferred layers visible
                     deferredLayers.forEach(function (layer) {
+                        // This happens after the map rendering; Therefore, we need to update
+                        // both the style object and the maplibre's layout properties.
                         layer.layout.visibility = 'visible';
                         map.setLayoutProperty(layer.id, 'visibility', 'visible');
                     });
-                });
+                };
+                _this.map.events.addOnce('load', _this._progressiveLoadingState.pendingVisibilityChange);
             };
             this._onStyleData = function () {
                 _this._lookUpAsync(_this.map.getStyle()).then(function (style) {
@@ -28023,18 +28086,6 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
             // should be modified before they are applied to the map.
             var styleOptions = this.map.getStyle();
             var trafficOptions = this.map.getTraffic();
-            // force a replacement of language placeholder in the tileset url to avoid resolution to a same cache with placeholders on language change
-            nextStyle.sources = Object.entries(nextStyle.sources).reduce(function (newSources, _a) {
-                var _b = __read$e(_a, 2), sourceKey = _b[0], source = _b[1];
-                var newSource = __assign$8({}, source);
-                if ('url' in newSource && typeof newSource.url === 'string') {
-                    if (newSource.url.includes(constants.languagePlaceHolder)) {
-                        newSource.url = newSource.url.replace(constants.languagePlaceHolder, styleOptions.language);
-                    }
-                }
-                newSources[sourceKey] = newSource;
-                return newSources;
-            }, {});
             var shouldProgressiveLoading = (styleOptions.progressiveLoading &&
                 // The feature only effective at the initial load.
                 !this.map._isLoaded());
@@ -28598,6 +28649,12 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
                 if (!mapboxCameraOptions) {
                     throw new Error("The map cannot be fit to the current canvas with the given CameraBoundsOptions.");
                 }
+                if ('pitch' in options) {
+                    mapboxCameraOptions.pitch = options.pitch;
+                }
+                if ('bearing' in options) {
+                    mapboxCameraOptions.bearing = options.bearing;
+                }
                 this.map.setMaxZoom(cameraBoundsOptions.maxZoom);
                 this._invokeEvent("maxzoomchanged", this.map.getMaxZoom());
                 maxBounds = this._generateSafeBounds(cameraBoundsOptions.maxBounds);
@@ -28720,8 +28777,9 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
             // If this function is restructured such that a styledata event won't always trigger
             // if the language is changed, then either those delegates need changed
             // or the styledata event manually invoked.
+            var noDiffOnLanguageViewChange = diff && (this.styleOptions.language === newOptions.language && this.styleOptions.view === newOptions.view);
             this.styleOptions = newOptions;
-            this._setStyleComponents(newOptions, diff);
+            this._setStyleComponents(newOptions, noDiffOnLanguageViewChange);
         };
         /**
          * Returns the map control's current style settings.