Merge pull request #295359 from MicrosoftDocs/repo_sync_working_branch

Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)

Author: Taojunshen

articles/app-service/deploy-local-git.md

@@ -14,7 +14,7 @@ ms.author: cephalin
 This how-to guide shows you how to deploy your app to [Azure App Service](overview.md) from a Git repository on your local computer.
 
 > [!NOTE]
-> This deployment method requires [SCM basic authentication](configure-basic-auth-disable.md), which is less secure than [other deployment methods](deploy-authentication-types.md). When Local Git deployment doesn't work, and you can't configure Local Git deployment in the app's Deployment Center.
+> This deployment method requires [SCM basic authentication](configure-basic-auth-disable.md), which is less secure than [other deployment methods](deploy-authentication-types.md). When Local Git deployment doesn't work, you can't configure Local Git deployment in the app's Deployment Center.
 
 ## Prerequisites
 

articles/azure-government/compliance/compliance-tic.md

@@ -153,7 +153,7 @@ The following diagram shows the general network flow for access to Azure PaaS se
 :::image type="content" source="./media/tic-diagram-e.png" alt-text="PaaS connectivity options for TIC" border="false":::
 
 1. A private connection is made to Azure by using ExpressRoute. ExpressRoute private peering with forced tunneling is used to force all customer virtual network traffic over ExpressRoute and back to on-premises. Microsoft Peering isn't required.
-2. Azure VPN Gateway, when used with ExpressRoute and Microsoft Peering, can overlay end-to-end IPSec encryption between the customer virtual network and the on-premises edge. 
+2. Azure VPN Gateway, when used with ExpressRoute and Microsoft Peering, can overlay end-to-end IPsec encryption between the customer virtual network and the on-premises edge. 
 3. Network connectivity to the customer virtual network is controlled by using network security groups that allow customers to permit/deny traffic based on IP, port, and protocol.
 4. Traffic to and from the customer private virtual network is monitored through Azure Network Watcher and data is analyzed using Log Analytics and Microsoft Defender for Cloud.
 5. The customer virtual network extends to the PaaS service by creating a service endpoint for the customer's service.

articles/azure-maps/zoom-levels-and-tile-grid.md

@@ -494,51 +494,76 @@ namespace AzureMaps
         /// <param name="bounds">A bounding box defined as an array of numbers in the format of [west, south, east, north].</param>
         /// <param name="mapWidth">Map width in pixels.</param>
         /// <param name="mapHeight">Map height in pixels.</param>
-        /// <param name="padding">Width in pixels to use to create a buffer around the map. This is to keep markers from being cut off on the edge</param>
-        /// <param name="tileSize">The size of the tiles in the tile pyramid.</param>
         /// <param name="latitude">Output parameter receiving the center latitude coordinate.</param>
         /// <param name="longitude">Output parameter receiving the center longitude coordinate.</param>
         /// <param name="zoom">Output parameter receiving the zoom level</param>
-        public static void BestMapView(double[] bounds, double mapWidth, double mapHeight, int padding, int tileSize, out double centerLat, out double centerLon, out double zoom)
+        /// <param name="padding">Width in pixels to use to create a buffer around the map. This is to keep markers from being cut off on the edge. Default: 0</param>
+        /// <param name="tileSize">The size of the tiles in the tile pyramid. Default: 512</param>
+        /// <param name="maxZoom">Optional maximum zoom level to return. Useful when the bounding box represents a very small area. Default: 24</param>
+        /// <param name="allowFloatZoom">Specifies if the returned zoom level should be a float or rounded down to an whole integer zoom level. Default: true</param>
+        public static void BestMapView(BoundingBox bounds, double mapWidth, double mapHeight, out double centerLat, out double centerLon, out double zoom, int padding = 0, int tileSize = 512, double maxZoom = 24, bool allowFloatZoom = true)
         {
-            if (bounds == null || bounds.Length < 4)
-            {
-                centerLat = 0;
-                centerLon = 0;
-                zoom = 1;
-                return;
-            }
-
-            double boundsDeltaX;
-
-            //Check if east value is greater than west value which would indicate that bounding box crosses the antimeridian.
-            if (bounds[2] > bounds[0])
-            {
-                boundsDeltaX = bounds[2] - bounds[0];
-                centerLon = (bounds[2] + bounds[0]) / 2;
-            }
-            else
-            {
-                boundsDeltaX = 360 - (bounds[0] - bounds[2]);
-                centerLon = ((bounds[2] + bounds[0]) / 2 + 360) % 360 - 180;
-            }
-
-            var ry1 = Math.Log((Math.Sin(bounds[1] * Math.PI / 180) + 1) / Math.Cos(bounds[1] * Math.PI / 180));
-            var ry2 = Math.Log((Math.Sin(bounds[3] * Math.PI / 180) + 1) / Math.Cos(bounds[3] * Math.PI / 180));
-            var ryc = (ry1 + ry2) / 2;
-
-            centerLat = Math.Atan(Math.Sinh(ryc)) * 180 / Math.PI;
-
-            var resolutionHorizontal = boundsDeltaX / (mapWidth - padding * 2);
-
-            var vy0 = Math.Log(Math.Tan(Math.PI * (0.25 + centerLat / 360)));
-            var vy1 = Math.Log(Math.Tan(Math.PI * (0.25 + bounds[3] / 360)));
-            var zoomFactorPowered = (mapHeight * 0.5 - padding) / (40.7436654315252 * (vy1 - vy0));
-            var resolutionVertical = 360.0 / (zoomFactorPowered * tileSize);
-
-            var resolution = Math.Max(resolutionHorizontal, resolutionVertical);
-
-            zoom = Math.Log(360 / (resolution * tileSize), 2);
+        	centerLat = 0;
+        	centerLon = 0;
+        	zoom = 0;
+        
+        	if (bounds != null && mapWidth > 0 && mapHeight > 0)
+        	{
+        		//Ensure padding is valid.
+        		padding = Math.Abs(padding);
+        
+        		//Ensure max zoom is within valid range.
+        		maxZoom = Clip(maxZoom, 0, 24);
+        
+        		//Do pixel calculations at zoom level 24 as that will provide a high level of visual accuracy.
+        		int pixelZoom = 24;
+        
+        		//Calculate mercator pixel coordinate at zoom level 24.
+        		var wnPixel = PositionToGlobalPixel(new double[] { bounds[0], bounds[3] }, pixelZoom, tileSize);
+        		var esPixel = PositionToGlobalPixel(new double[] { bounds[2], bounds[1] }, pixelZoom, tileSize);
+        
+        		//Calculate the pixel distance between pixels for each axis.
+        		double dx = esPixel[0] - wnPixel[0];
+        		double dy = esPixel[1] - wnPixel[1];
+        
+        		//Calculate the average pixel positions to get the visual center.
+        		double xAvg = (esPixel[0] + wnPixel[0]) / 2;
+        		double yAvg = (esPixel[1] + wnPixel[1]) / 2;
+        
+        		//Determine if the bounding box crosses the antimeridian. (West pixel will be greater than East pixel).
+        		if (wnPixel[0] > esPixel[0])
+        		{
+        			double mapSize = MapSize(24, tileSize);
+        
+        			//We are interested in the opposite area of the map. Calculate the opposite area and visual center.
+        			dx = mapSize - Math.Abs(dx);
+        
+        			//Offset the visual center by half the global map width at zoom 24 on the x axis.
+        			xAvg += mapSize / 2;
+        		}
+        
+        		//Convert visual center pixel from zoom 24 to lngLat.
+        		center = GlobalPixelToPosition(new Pixel(xAvg, yAvg), pixelZoom, tileSize);
+        
+        		//Calculate scale of screen pixels per unit on the Web Mercator plane.
+        		double scaleX = (mapWidth - padding * 2) / Math.Abs(dx) * Math.Pow(2, pixelZoom);
+        		double scaleY = (mapHeight - padding * 2) / Math.Abs(dy) * Math.Pow(2, pixelZoom);
+        
+        		//Calculate zoom levels based on the x/y scales. Choose the most zoomed out value.
+        		zoom = Math.Max(0, Math.Min(maxZoom, Math.Log2(Math.Abs(Math.Min(scaleX, scaleY)))));
+        
+        		//Round down zoom level if float values are not desired.
+        		if (!allowFloatZoom)
+        		{
+        			zoom = Math.Floor(zoom);
+        		}
+        	}
+        
+        	return new CameraOptions
+        	{
+        		Center = center,
+        		Zoom = zoom
+        	};
         }
     }
 }
@@ -873,51 +898,70 @@ module AzureMaps {
          * @param mapHeight Map height in pixels.
          * @param padding Width in pixels to use to create a buffer around the map. This is to keep markers from being cut off on the edge.
          * @param tileSize The size of the tiles in the tile pyramid.
+         * @param maxZoom Optional maximum zoom level to return. Useful when the bounding box represents a very small area.
+         * @param allowFloatZoom Specifies if the returned zoom level should be a float or rounded down to an whole integer zoom level. 
          * @returns The center and zoom level to best position the map view over the provided bounding box.
          */
-        public static BestMapView(bounds: number[], mapWidth: number, mapHeight: number, padding: number, tileSize: number): { center: number[], zoom: number } {
-            if (bounds == null || bounds.length < 4) {
-                return {
-                    center: [0, 0],
-                    zoom: 1
-                };
-            }
-
-            var boundsDeltaX: number;
-            var centerLat: number;
-            var centerLon: number;
-
-            //Check if east value is greater than west value which would indicate that bounding box crosses the antimeridian.
-            if (bounds[2] > bounds[0]) {
-                boundsDeltaX = bounds[2] - bounds[0];
-                centerLon = (bounds[2] + bounds[0]) / 2;
-            }
-            else {
-                boundsDeltaX = 360 - (bounds[0] - bounds[2]);
-                centerLon = ((bounds[2] + bounds[0]) / 2 + 360) % 360 - 180;
-            }
-
-            var ry1 = Math.log((Math.sin(bounds[1] * Math.PI / 180) + 1) / Math.cos(bounds[1] * Math.PI / 180));
-            var ry2 = Math.log((Math.sin(bounds[3] * Math.PI / 180) + 1) / Math.cos(bounds[3] * Math.PI / 180));
-            var ryc = (ry1 + ry2) / 2;
-
-            centerLat = Math.atan(Math.sinh(ryc)) * 180 / Math.PI;
-
-            var resolutionHorizontal = boundsDeltaX / (mapWidth - padding * 2);
-
-            var vy0 = Math.log(Math.tan(Math.PI * (0.25 + centerLat / 360)));
-            var vy1 = Math.log(Math.tan(Math.PI * (0.25 + bounds[3] / 360)));
-            var zoomFactorPowered = (mapHeight * 0.5 - padding) / (40.7436654315252 * (vy1 - vy0));
-            var resolutionVertical = 360.0 / (zoomFactorPowered * tileSize);
-
-            var resolution = Math.max(resolutionHorizontal, resolutionVertical);
-
-            var zoom = Math.log2(360 / (resolution * tileSize));
-
-            return {
-                center: [centerLon, centerLat],
-                zoom: zoom
-            };
+        public static BestMapView(bounds: number, mapWidth: number, mapHeight: number, padding: number = 0, tileSize: number = 512, maxZoom: number = 24, allowFloatZoom: boolean = true): { center: number[], zoom: number } {
+        	//Ensure valid bounds and map dimensions are provided.
+        	if (bounds == null || bounds.length < 4 || !mapWidth || !mapHeight || mapWidth <= 0 || mapHeight <= 0) {
+        		return {
+        			center: [0, 0],
+        			zoom: 0
+        		};
+        	}
+        
+        	//Ensure padding is valid.
+        	padding = Math.abs(padding || 0);
+        	
+        	//Ensure max zoom is within valid range.
+        	maxZoom = this.Clip(maxZoom, 0, 24);
+        	
+        	//Do pixel calculations at zoom level 24 as that will provide a high level of visual accuracy.
+        	const pixelZoom = 24;
+        
+        	//Calculate mercator pixel coordinate at zoom level 24.
+        	const wnPixel = this.PositionToGlobalPixel([bounds[0], bounds[3]], pixelZoom, tileSize);
+        	const esPixel = this.PositionToGlobalPixel([bounds[2], bounds[1]], pixelZoom, tileSize);
+        	
+        	//Calculate the pixel distance between pixels for each axis.
+        	let dx = esPixel[0] - wnPixel[0];
+        	const dy = esPixel[1] - wnPixel[1];
+        	
+        	//Calculate the average pixel positions to get the visual center.
+        	let xAvg = (esPixel[0] + wnPixel[0]) / 2;
+        	const yAvg = (esPixel[1] + wnPixel[1]) / 2;
+        		
+        	//Determine if the bounding box crosses the antimeridian. (West pixel will be greater than East pixel).
+        	if(wnPixel[0] > esPixel[0]) {
+        		const mapSize = this.MapSize(24, tileSize);
+		
+        		//We are interested in the opposite area of the map. Calculate the opposite area and visual center.
+        		dx = mapSize - Math.abs(dx);
+        		
+        		//Offset the visual center by half the global map width at zoom 24 on the x axis.
+        		xAvg += mapSize / 2;		
+        	}
+        
+        	//Convert visual center pixel from zoom 24 to lngLat.
+        	const centerLngLat = this.GlobalPixelToPosition([xAvg, yAvg], pixelZoom, tileSize);
+        
+        	//Calculate scale of screen pixels per unit on the Web Mercator plane.
+        	const scaleX = (mapWidth - padding * 2) / Math.abs(dx) * Math.pow(2, pixelZoom);
+        	const scaleY = (mapHeight - padding * 2) / Math.abs(dy) * Math.pow(2, pixelZoom);
+        
+        	//Calculate zoom levels based on the x/y scales. Choose the most zoomed out value.
+        	let zoom = Math.max(0, Math.min(maxZoom, Math.log2(Math.abs(Math.min(scaleX, scaleY)))));
+        
+        	//Round down zoom level if float values are not desired.
+        	if(!allowFloatZoom) {
+        		zoom = Math.floor(zoom);
+        	}
+        
+        	return {
+        		center: centerLngLat,
+        		zoom
+        	};
         }
     }
 }

articles/operator-nexus/how-to-validate-cables.md

@@ -208,7 +208,7 @@ networkFabricInfoSkuId": "M8-A400-A100-C16-ab",
 |Status Type  |Definition  |
 |---------|---------|
 |Compliant     | Validation status is compliant with the BOM specification for the interface. |
-|NonCompliant     | Validation isn't compliant with the BOM specification for the interface.        |
+|NonCompliant     | Validation status isn't compliant with the BOM specification for the interface.        |
 |Unknown     | Validation is unable to retrieve interface connection details or lldp data isn't returned. The `Unknown` status is returned if the destination device is powered off, missing, disconnected, or unsupported for this interface type. |
 
 #### Validation attributes

articles/security/fundamentals/backup-plan-to-protect-against-ransomware.md

@@ -7,7 +7,7 @@ ms.subservice: security-fundamentals
 ms.topic: article
 ms.author: mbaldwin
 manager: rkarlin
-ms.date: 06/27/2024
+ms.date: 10/16/2024
 ---
 
 # Backup and restore plan to protect against ransomware