Skip to content

Commit 645da11

Browse files
authored
Merge pull request #231930 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)
2 parents 23423c5 + 34847aa commit 645da11

File tree

53 files changed

+279
-278
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+279
-278
lines changed

articles/azure-arc/servers/ssh-arc-troubleshoot.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,12 @@ Resolution:
5353
```powershell
5454
# Set 22 port:
5555
azcmagent config list
56-
azcmagent config get incomingconnections.port
57-
azcmagent config set incomingconnections.port 22
56+
azcmagent config get incomingconnections.ports
57+
azcmagent config set incomingconnections.ports 22
5858
azcmagent config
5959
6060
# Add multiple ports:
61-
azcmagent config set incomingconnections.port 22,3516
61+
azcmagent config set incomingconnections.ports 22,6516
6262
```
6363

6464
## Azure permissions issues

articles/azure-maps/add-bubble-layer-map-ios.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
title: Add a bubble layer to iOS maps
33
titleSuffix: Microsoft Azure Maps
44
description: Learn how to render points on maps as circles with fixed sizes. See how to use the Azure Maps iOS SDK to add and customize bubble layers for this purpose.
5-
author: eriklindeman
6-
ms.author: eriklind
5+
author: sinnypan
6+
ms.author: sipa
77
ms.date: 11/23/2021
88
ms.topic: how-to
99
ms.service: azure-maps

articles/azure-maps/add-controls-map-ios.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
title: Add controls to an iOS map
33
titleSuffix: Microsoft Azure Maps
44
description: How to add zoom control, pitch control, rotate control and a style picker to a map in Microsoft Azure Maps iOS SDK.
5-
author: eriklindeman
6-
ms.author: eriklind
5+
author: sinnypan
6+
ms.author: sipa
77
ms.date: 11/19/2021
88
ms.topic: how-to
99
ms.service: azure-maps
@@ -23,7 +23,7 @@ A zoom control adds buttons for zooming the map in and out. The following code s
2323
map.controls.add(ZoomControl())
2424
```
2525

26-
The screenshot below is of a zoom control loaded on a map.
26+
This screenshot shows a zoom control loaded on a map.
2727

2828
:::image type="content" source="./media/ios-sdk/add-controls-to-map-ios/zoom.png" alt-text="Screenshot showing the zoom control on a map." lightbox="./media/ios-sdk/add-controls-to-map-ios/zoom.png":::
2929

@@ -36,7 +36,7 @@ A pitch control adds buttons for tilting the pitch to map relative to the horizo
3636
map.controls.add(PitchControl())
3737
```
3838

39-
The screenshot below is of a pitch control loaded on a map.
39+
This screenshot shows a pitch control loaded on a map.
4040

4141
:::image type="content" source="./media/ios-sdk/add-controls-to-map-ios/pitch.png" alt-text="Screenshot showing the pitch control on a map." lightbox="./media/ios-sdk/add-controls-to-map-ios/pitch.png":::
4242

@@ -49,7 +49,7 @@ A rotation control adds a button for rotating the map. The following code sample
4949
map.controls.add(RotationControl())
5050
```
5151

52-
The screenshot below is of a rotation control loaded on a map.
52+
This screenshot shows a rotation control loaded on a map.
5353

5454
:::image type="content" source="./media/ios-sdk/add-controls-to-map-ios/rotation.png" alt-text="Screenshot showing the rotation control on a map." lightbox="./media/ios-sdk/add-controls-to-map-ios/rotation.png":::
5555

@@ -62,13 +62,13 @@ A traffic control adds a button for toggling the visibility of traffic data on t
6262
map.controls.add(TrafficControl())
6363
```
6464

65-
The screenshot below is of a traffic control loaded on a map.
65+
This screenshot shows a traffic control loaded on a map.
6666

6767
:::image type="content" source="./media/ios-sdk/add-controls-to-map-ios/traffic.png" alt-text="Screenshot showing the traffic control on a map." lightbox="./media/ios-sdk/add-controls-to-map-ios/traffic.png":::
6868

6969
## A map with all controls
7070

71-
Multiple controls can be put into an array and added to the map all at once and positioned in the same area of the map to simplify development. The following code adds the standard navigation controls to the map using this approach.
71+
Multiple controls can be added to an array and the map then positioned in the same area of the map to simplify development. The following code adds the standard navigation controls to the map using this approach.
7272

7373
```swift
7474
map.controls.add([
@@ -79,7 +79,7 @@ map.controls.add([
7979
])
8080
```
8181

82-
The screenshot below shows all controls loaded on a map. The order they are added to the map, is the order they will appear.
82+
This screenshot shows all controls loaded on a map, appearing in the order they were added.
8383

8484
:::image type="content" source="./media/ios-sdk/add-controls-to-map-ios/all.png" alt-text="Screenshot showing a map with all controls added to it." lightbox="./media/ios-sdk/add-controls-to-map-ios/all.png":::
8585

articles/azure-maps/add-heat-map-layer-ios.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
title: Add a heat map layer to iOS maps
33
titleSuffix: Microsoft Azure Maps
44
description: Learn how to create a heat map. See how to use the Azure Maps iOS SDK to add a heat map layer to a map. Find out how to customize heat map layers.
5-
author: eriklindeman
6-
ms.author: eriklind
5+
author: sinnypan
6+
ms.author: sipa
77
ms.date: 11/23/2021
88
ms.topic: how-to
99
ms.service: azure-maps
@@ -116,7 +116,7 @@ NSExpression(
116116
- `sourceLayer`: If the data source connected to the layer is a vector tile source, a source layer within the vector tiles must be specified.
117117
- `visible`: Hides or shows the layer.
118118

119-
This following is an example of a heat map where a liner interpolation expression is used to create a smooth color gradient. The `mag` property defined in the data is used with an exponential interpolation to set the weight or relevance of each data point.
119+
The following example demonstrates a heat map using a liner interpolation expression to create a smooth color gradient. The `mag` property defined in the data is used with an exponential interpolation to set the weight or relevance of each data point.
120120

121121
```swift
122122
let layer = HeatMapLayer(source: source, options: [

articles/azure-maps/add-image-layer-map-ios.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
title: Add an Image layer to an iOS map
33
titleSuffix: Microsoft Azure Maps
44
description: Learn how to add images to a map. See how to use the Azure Maps iOS SDK to customize image layers and overlay images on fixed sets of coordinates.
5-
author: eriklindeman
6-
ms.author: eriklind
5+
author: sinnypan
6+
ms.author: sipa
77
ms.date: 11/23/2021
88
ms.topic: how-to
99
ms.service: azure-maps
@@ -44,7 +44,7 @@ let layer = ImageLayer(options: [
4444
map.layers.insertLayer(layer, below: "labels")
4545
```
4646

47-
Alternatively, a URL to an image hosted on the online can be specified. However, if your scenario allows, add the image to your project's `Assets` folder, that will load faster since the image will be locally available and won't have to be downloaded.
47+
Alternatively, a URL to an image hosted on the online can be specified. However, if your scenario allows, add the image to your project's `Assets` folder, that loads faster since the image is locally available with no need to be downloaded.
4848

4949
```swift
5050
// Create an image layer.

articles/azure-maps/add-line-layer-map-ios.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
title: Add a line layer to iOS maps
33
titleSuffix: Microsoft Azure Maps
44
description: Learn how to add lines to maps. See examples that use the Azure Maps iOS SDK to add line layers to maps and to customize lines with symbols and color gradients.
5-
author: eriklindeman
6-
ms.author: eriklind
5+
author: sinnypan
6+
ms.author: sipa
77
ms.date: 11/23/2021
88
ms.topic: how-to
99
ms.service: azure-maps
@@ -53,7 +53,7 @@ The following screenshot shows the above code rendering a line in a line layer.
5353

5454
## Data-driven line style
5555

56-
The following code creates two line features and adds a speed limit value as a property to each line. A line layer uses a data-drive style expression color the lines based on the speed limit value. Since the line data overlays along roads, the code below adds the line layer below the label layer so that road labels can still clearly be read.
56+
The following code creates two line features and adds a speed limit value as a property to each line. A line layer uses a data-drive style expression color the lines based on the speed limit value. Since the line data overlays along roads, the following code adds the line layer below the label layer so that road labels remain visible.
5757

5858
```swift
5959
// Create a data source and add it to the map.
@@ -105,7 +105,7 @@ let layer = LineLayer(source: source, options: [
105105
map.layers.insertLayer(layer, below: "labels")
106106
```
107107

108-
The following screenshot shows the above code rendering two lines in a line layer with their color being retrieved from a data driven style expression based on a property in the line features.
108+
The following screenshot shows the above code that renders two lines in a line layer with their color retrieved from a data driven style expression based on a property in the line features.
109109

110110
:::image type="content" source="./media/ios-sdk/add-line-layer-map-ios/data-driven.png" alt-text="Add a line layer to a map.":::
111111

@@ -169,7 +169,7 @@ The following screenshot shows the above code displaying a line rendered using a
169169

170170
## Add symbols along a line
171171

172-
This sample shows how to add arrow icons along a line on the map. When using a symbol layer, set the `symbolPlacement` option to `.line`. This option will render the symbols along the line and rotate the icons (0 degrees = right).
172+
This sample shows how to add arrow icons along a line on the map. When using a symbol layer, set the `symbolPlacement` option to `.line`. This option renders the symbols along the line and rotates the icons (0 degrees = right).
173173

174174
```swift
175175
// Create a data source and add it to the map.
@@ -233,9 +233,9 @@ For this sample, the following image was loaded into the assets folder of the ap
233233
|:------------------------------------------------------------------------------------:|
234234
| `purple-arrow-right.png` |
235235

236-
The screenshot below shows the above code displaying a line with arrow icons displayed along it.
236+
The following screenshot shows the above code displaying a line with arrow icons displayed along it.
237237

238-
:::image type="content" source="./media/ios-sdk/add-line-layer-map-ios/symbol.png" alt-text="A line with purple arrow icons displayed along it pointing to the right.":::
238+
:::image type="content" source="./media/ios-sdk/add-line-layer-map-ios/symbol.png" alt-text="A line with purple arrow icons displayed along it pointing in the direction of the route.":::
239239

240240
## Additional information
241241

articles/azure-maps/add-polygon-extrusion-layer-map-ios.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
title: Add a polygon extrusion layer to an iOS map
33
titleSuffix: Microsoft Azure Maps
44
description: How to add a polygon extrusion layer to the Microsoft Azure Maps iOS SDK.
5-
author: eriklindeman
6-
ms.author: eriklind
5+
author: sinnypan
6+
ms.author: sipa
77
ms.date: 11/23/2021
88
ms.topic: how-to
99
ms.service: azure-maps

articles/azure-maps/add-polygon-layer-map-ios.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
title: Add a polygon layer to iOS maps
33
titleSuffix: Microsoft Azure Maps
44
description: Learn how to add polygons or circles to maps. See how to use the Azure Maps iOS SDK to customize geometric shapes and make them easy to update and maintain.
5-
author: eriklindeman
6-
ms.author: eriklind
5+
author: sinnypan
6+
ms.author: sipa
77
ms.date: 11/23/2021
88
ms.topic: how-to
99
ms.service: azure-maps

articles/azure-maps/add-symbol-layer-ios.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
title: Add a symbol layer to iOS maps
33
titleSuffix: Microsoft Azure Maps
44
description: Learn how to add a marker to a map. See an example that uses the Azure Maps iOS SDK to add a symbol layer that contains point-based data from a data source.
5-
author: eriklindeman
6-
ms.author: eriklind
5+
author: sinnypan
6+
ms.author: sipa
77
ms.date: 11/19/2021
88
ms.topic: how-to
99
ms.service: azure-maps
@@ -25,7 +25,7 @@ Be sure to complete the steps in the [Quickstart: Create an iOS app](quick-ios-a
2525

2626
Before you can add a symbol layer to the map, you need to take a couple of steps. First, create a data source, and add it to the map. Create a symbol layer. Then, pass in the data source to the symbol layer, to retrieve the data from the data source. Finally, add data into the data source, so that there's something to be rendered.
2727

28-
The code below demonstrates what should be added to the map after it has loaded. This sample renders a single point on the map using a symbol layer.
28+
The following code demonstrates what should be added to the map after it has loaded. This sample renders a single point on the map using a symbol layer.
2929

3030
```swift
3131
//Create a data source and add it to the map.
@@ -157,7 +157,7 @@ The following screenshot shows the above code rendering a point feature using a
157157
158158
## Predefined Symbol Marker Icons
159159

160-
Initially the map has the built-in default marker icon, which is already loaded into the image sprite of the map. It will be used by default if nothing is set to the `iconImage` option. In case you need to do it manually, set `"marker-default"` to the `iconImage` option.
160+
Initially the map has the built-in default marker icon, which is already loaded into the image sprite of the map. It's used by default if nothing is set to the `iconImage` option. In case you need to do it manually, set `"marker-default"` to the `iconImage` option.
161161

162162
```swift
163163
let layer = SymbolLayer(source: source, options: [.iconImage("marker-default")])
@@ -175,7 +175,7 @@ map.images.add(.azm_markerRed, withID: "marker-red")
175175
let layer = SymbolLayer(source: source, options: [.iconImage("marker-red")])
176176
```
177177

178-
The code below lists all of the built-in icon images available as static variables of `UIImage` class.
178+
The code below lists the built-in icon images available as static variables of `UIImage` class.
179179

180180
```swift
181181
UIImage.azm_markerDefault // Dark blue

articles/azure-maps/add-tile-layer-map-ios.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
title: Add a tile layer to iOS maps
33
titleSuffix: Microsoft Azure Maps
44
description: Learn how to add a tile layer to a map. See an example that uses the Azure Maps iOS SDK to add a weather radar overlay to a map.
5-
author: eriklindeman
6-
ms.author: eriklind
5+
author: sinnypan
6+
ms.author: sipa
77
ms.date: 11/23/2021
88
ms.topic: how-to
99
ms.service: azure-maps
@@ -14,7 +14,7 @@ services: azure-maps
1414

1515
This article shows you how to render a tile layer on a map using the Azure Maps iOS SDK. Tile layers allow you to superimpose images on top of Azure Maps base map tiles. More information on Azure Maps tiling system can be found in the [Zoom levels and tile grid](zoom-levels-and-tile-grid.md) documentation.
1616

17-
A Tile layer loads in tiles from a server. These images can be pre-rendered and stored like any other image on a server, using a naming convention that the tile layer understands. Or, these images can be rendered with a dynamic service that generates the images near real time. There are three different tile service naming conventions supported by Azure Maps TileLayer class:
17+
A Tile layer loads in tiles from a server. These images can be prerendered and stored like any other image on a server, using a naming convention that the tile layer understands. Or, these images can be rendered with a dynamic service that generates the images near real time. There are three different tile service naming conventions supported by Azure Maps TileLayer class:
1818

1919
* X, Y, Zoom notation - Based on the zoom level, x is the column and y is the row position of the tile in the tile grid.
2020
* Quadkey notation - Combination x, y, zoom information into a single string value that is a unique identifier for a tile.
@@ -39,7 +39,7 @@ To complete the process in this article, you need to install [Azure Maps iOS SDK
3939

4040
## Add a tile layer to the map
4141

42-
This sample shows how to create a tile layer that points to a set of tiles. This sample uses the "x, y, zoom" tiling system. The source of this tile layer is the [OpenSeaMap project](https://openseamap.org/index.php), which contains crowd sourced nautical charts. Often when viewing tile layers it is desirable to be able to clearly see the labels of cities on the map. This behavior can be achieved by inserting the tile layer below the map label layers.
42+
This sample shows how to create a tile layer that points to a set of tiles. This sample uses the "x, y, zoom" tiling system. The source of this tile layer is the [OpenSeaMap project](https://openseamap.org/index.php), which contains crowd sourced nautical charts. Often when viewing tile layers it's desirable to be able to clearly see the labels of cities on the map. This behavior can be achieved by inserting the tile layer below the map label layers.
4343

4444
```swift
4545
map.layers.insertLayer(
@@ -60,7 +60,7 @@ The following screenshot shows the above code displaying a tile layer of nautica
6060

6161
## Add an OGC web-mapping service (WMS)
6262

63-
A web-mapping service (WMS) is an Open Geospatial Consortium (OGC) standard for serving images of map data. There are many open data sets available in this format that you can use with Azure Maps. This type of service can be used with a tile layer if the service supports the `EPSG:3857` coordinate reference system (CRS). When using a WMS service, set the width and height parameters to the same value that is supported by the service, be sure to set this same value in the `tileSize` option. In the formatted URL, set the `BBOX` parameter of the service with the `{bbox-epsg-3857}` placeholder.
63+
A web-mapping service (WMS) is an Open Geospatial Consortium (OGC) standard for serving images of map data. There are many open data sets available in this format that you can use with Azure Maps. This type of service can be used with a tile layer if the service supports the `EPSG:3857` coordinate reference system (CRS). When using a WMS service, set the width and height parameters to the same value supported by the service, be sure to set this same value in the `tileSize` option. In the formatted URL, set the `BBOX` parameter of the service with the `{bbox-epsg-3857}` placeholder.
6464

6565
```swift
6666
map.layers.insertLayer(
@@ -78,7 +78,7 @@ The following screenshot shows the above code overlaying a web-mapping service o
7878

7979
## Add an OGC web-mapping tile service (WMTS)
8080

81-
A web-mapping tile service (WMTS) is an Open Geospatial Consortium (OGC) standard for serving tiled based overlays for maps. There are many open data sets available in this format that you can use with Azure Maps. This type of service can be used with a tile layer if the service supports the `EPSG:3857` or `GoogleMapsCompatible` coordinate reference system (CRS). When using a WMTS service, set the width and height parameters to the same value that is supported by the service, be sure to set this same value in the `tileSize` option. In the formatted URL, replace the following placeholders accordingly:
81+
A web-mapping tile service (WMTS) is an Open Geospatial Consortium (OGC) standard for serving tiled based overlays for maps. There are many open data sets available in this format that you can use with Azure Maps. This type of service can be used with a tile layer if the service supports the `EPSG:3857` or `GoogleMapsCompatible` coordinate reference system (CRS). When using a WMTS service, set the width and height parameters to the same value supported by the service, be sure to set this same value in the `tileSize` option. In the formatted URL, replace the following placeholders accordingly:
8282

8383
* `{TileMatrix}` => `{z}`
8484
* `{TileRow}` => `{y}`

0 commit comments

Comments
 (0)