Skip to content

Commit 3c3be54

Browse files
authored
Merge pull request #243632 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 d2e5bd5 + 89d0999 commit 3c3be54

24 files changed

+513
-380
lines changed

articles/active-directory/governance/lifecycle-workflow-tasks.md

Lines changed: 232 additions & 230 deletions
Large diffs are not rendered by default.

articles/aks/node-updates-kured.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ For AKS clusters that use Windows Server nodes, see [Upgrade a node pool in AKS]
108108

109109
<!-- LINKS - external -->
110110
[kured]: https://github.com/kubereboot/kured
111-
[kured-install]: https://github.com/kubereboot/kured/tree/main/cmd/kured
111+
[kured-install]: https://github.com/kubereboot/charts/tree/main/charts/kured
112112
[kubectl-get-nodes]: https://kubernetes.io/docs/reference/generated/kubectl/kubectl-commands#get
113113

114114
<!-- LINKS - internal -->

articles/azure-maps/how-to-use-indoor-module.md

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ms.custom: devx-track-js
1313

1414
# Use the Azure Maps Indoor Maps module with custom styles (preview)
1515

16-
The Azure Maps Web SDK includes the *Azure Maps Indoor*module, enabling you to render indoor maps created in Azure Maps Creator services.
16+
The Azure Maps Web SDK includes an [Indoor Maps] module, enabling you to render indoor maps created in Azure Maps Creator services.
1717

1818
When you create an indoor map using Azure Maps Creator, default styles are applied. Azure Maps Creator now also supports customizing the styles of the different elements of your indoor maps using the [Style Rest API], or the [visual style editor].
1919

@@ -63,11 +63,13 @@ To use the globally hosted Azure Content Delivery Network version of the *Azure
6363
```
6464
6565
Inside your source file, import atlas-indoor.min.css:
66+
6667
```js
6768
import "azure-maps-indoor/dist/atlas-indoor.min.css";
6869
```
6970
7071
Then add loaders to the module rules portion of the Webpack config:
72+
7173
```js
7274
module.exports = {
7375
module: {
@@ -292,33 +294,38 @@ For a live demo of an indoor map with available source code, see [Creator Indoor
292294
Read about the APIs that are related to the *Azure Maps Indoor* module:
293295

294296
> [!div class="nextstepaction"]
295-
> [Drawing package requirements](drawing-requirements.md)
297+
> [Drawing package requirements]
296298
297299
>[!div class="nextstepaction"]
298-
> [Creator for indoor maps](creator-indoor-maps.md)
300+
> [Creator for indoor maps]
299301
300302
Learn more about how to add more data to your map:
301303

302304
> [!div class="nextstepaction"]
303-
> [Indoor Maps dynamic styling](indoor-map-dynamic-styling.md)
305+
> [Indoor Maps dynamic styling]
304306
305307
> [!div class="nextstepaction"]
306-
> [Code samples](/samples/browse/?products=azure-maps)
308+
> [Code samples]
307309
308310
[Azure Content Delivery Network]: #embed-the-indoor-maps-module
309311
[Azure Maps account]: quick-demo-map-app.md#create-an-azure-maps-account
310312
[Azure Maps Creator resource]: how-to-manage-creator.md
313+
[Indoor Maps]: https://www.npmjs.com/package/azure-maps-indoor
311314
[Azure Maps service geographic scope]: geographic-scope.md
312315
[azure-maps-indoor package]: https://www.npmjs.com/package/azure-maps-indoor
316+
[Code samples]: /samples/browse/?products=azure-maps
313317
[Create custom styles for indoor maps]: how-to-create-custom-styles.md
318+
[Creator for indoor maps]: creator-indoor-maps.md
314319
[Creator Indoor Maps]: https://samples.azuremaps.com/?sample=creator-indoor-maps
320+
[Drawing package requirements]: drawing-requirements.md
315321
[dynamic map styling]: indoor-map-dynamic-styling.md
322+
[Indoor Maps dynamic styling]: indoor-map-dynamic-styling.md
316323
[map configuration API]: /rest/api/maps/v20220901preview/map-configuration
317324
[map configuration]: creator-indoor-maps.md#map-configuration
318325
[Style Rest API]: /rest/api/maps/v20220901preview/style
326+
[style-loader]: https://webpack.js.org/loaders/style-loader
319327
[Subscription key]: quick-demo-map-app.md#get-the-subscription-key-for-your-account
320328
[Tileset List API]: /rest/api/maps/v2/tileset/list
321329
[Use Creator to create indoor maps]: tutorial-creator-indoor-maps.md
322-
[visual style editor]: https://azure.github.io/Azure-Maps-Style-Editor/
323-
[Webpack]: https://webpack.js.org/
324-
[style-loader]: https://webpack.js.org/loaders/style-loader/
330+
[visual style editor]: https://azure.github.io/Azure-Maps-Style-Editor
331+
[Webpack]: https://webpack.js.org

articles/azure-maps/how-to-use-map-control.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ms.custom: devx-track-js
1313

1414
# Use the Azure Maps map control
1515

16-
The Map Control client-side JavaScript library allows you to render maps and embedded Azure Maps functionality into your web or mobile application.
16+
The Azure Maps Web SDK provides a [Map Control] that enables the customization of interactive maps with your own content and imagery for display in your web or mobile applications. This module is a helper library that makes it easy to use the Azure Maps REST services in web or Node.js applications by using JavaScript or TypeScript.
1717

1818
This article uses the Azure Maps Web SDK, however the Azure Maps services work with any map control. For a list of third-party map control plug-ins, see [Azure Maps community - Open-source projects].
1919

@@ -22,8 +22,7 @@ This article uses the Azure Maps Web SDK, however the Azure Maps services work w
2222
To use the Map Control in a web page, you must have one of the following prerequisites:
2323

2424
* An [Azure Maps account]
25-
* A [subscription key]
26-
* Obtain your Azure Active Directory (Azure AD) credentials with [authentication options]
25+
* A [subscription key] or Azure Active Directory (Azure AD) credentials. For more information, see [authentication options].
2726

2827
## Create a new map in a web page
2928

@@ -295,3 +294,4 @@ For a list of samples showing how to integrate Azure AD with Azure Maps, see:
295294
[ng-azure-maps]: https://github.com/arnaudleclerc/ng-azure-maps
296295
[subscription key]: quick-demo-map-app.md#get-the-subscription-key-for-your-account
297296
[Vue Azure Maps]: https://github.com/rickyruiz/vue-azure-maps
297+
[Map Control]: https://www.npmjs.com/package/azure-maps-control

articles/azure-maps/how-to-use-services-module.md

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ms.custom: devx-track-js
1313

1414
# Use the Azure Maps services module
1515

16-
The Azure Maps Web SDK provides a *services module*. This module is a helper library that makes it easy to use the Azure Maps REST services in web or Node.js applications by using JavaScript or TypeScript.
16+
The Azure Maps Web SDK provides a [services module]. This module is a helper library that makes it easy to use the Azure Maps REST services in web or Node.js applications by using JavaScript or TypeScript.
1717

1818
## Use the services module in a webpage
1919

@@ -256,29 +256,39 @@ If directly accessing the Azure Maps REST services, change the URL domain to `at
256256
Learn more about the classes and methods used in this article:
257257

258258
> [!div class="nextstepaction"]
259-
> [MapsURL](/javascript/api/azure-maps-rest/atlas.service.mapsurl)
259+
> [MapsURL]
260260
261261
> [!div class="nextstepaction"]
262-
> [SearchURL](/javascript/api/azure-maps-rest/atlas.service.searchurl)
262+
> [SearchURL]
263263
264264
> [!div class="nextstepaction"]
265-
> [RouteURL](/javascript/api/azure-maps-rest/atlas.service.routeurl)
265+
> [RouteURL]
266266
267267
> [!div class="nextstepaction"]
268-
> [SubscriptionKeyCredential](/javascript/api/azure-maps-rest/atlas.service.subscriptionkeycredential)
268+
> [SubscriptionKeyCredential]
269269
270270
> [!div class="nextstepaction"]
271-
> [TokenCredential](/javascript/api/azure-maps-rest/atlas.service.tokencredential)
271+
> [TokenCredential]
272272
273273
For more code samples that use the services module, see these articles:
274274

275275
> [!div class="nextstepaction"]
276-
> [Show search results on the map](./map-search-location.md)
276+
> [Show search results on the map]
277277
278278
> [!div class="nextstepaction"]
279-
> [Get information from a coordinate](./map-get-information-from-coordinate.md)
279+
> [Get information from a coordinate]
280280
281281
> [!div class="nextstepaction"]
282-
> [Show directions from A to B](./map-route.md)
282+
> [Show directions from A to B]
283+
284+
[MapsURL]: /javascript/api/azure-maps-rest/atlas.service.mapsurl
285+
[SearchURL]: /javascript/api/azure-maps-rest/atlas.service.searchurl
286+
[RouteURL]: /javascript/api/azure-maps-rest/atlas.service.routeurl
287+
[SubscriptionKeyCredential]: /javascript/api/azure-maps-rest/atlas.service.subscriptionkeycredential
288+
[TokenCredential]: /javascript/api/azure-maps-rest/atlas.service.tokencredential
289+
[Show search results on the map]: map-search-location.md
290+
[Get information from a coordinate]: map-get-information-from-coordinate.md
291+
[Show directions from A to B]: map-route.md
283292

284293
[Authentication with Azure Maps]: azure-maps-authentication.md
294+
[services module]: https://www.npmjs.com/package/azure-maps-rest

articles/azure-maps/how-to-use-spatial-io-module.md

Lines changed: 41 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
---
2-
title: How to use the Azure Maps spatial IO module | Microsoft Azure Maps
3-
description: Learn how to use the Spatial IO module provided by the Azure Maps Web SDK. This module provides robust features to make it easy for developers to integrate spatial data with the Azure Maps web sdk.
2+
title: How to use the Azure Maps spatial IO module
3+
titleSuffix: Microsoft Azure Maps
4+
description: Learn how to use the Spatial IO module provided by the Azure Maps Web SDK. This module provides robust features to make it easy for developers to integrate spatial data with the Azure Maps web SDK.
45
author: eriklindeman
56
ms.author: eriklind
67
ms.date: 02/28/2020
@@ -13,15 +14,15 @@ ms.custom:
1314

1415
# How to use the Azure Maps Spatial IO module
1516

16-
The Azure Maps Web SDK provides the **Spatial IO module**, which integrates spatial data with the Azure Maps web SDK using JavaScript or TypeScript. The robust features in this module allow developers to:
17+
The Azure Maps Web SDK provides the [Spatial IO module], which integrates spatial data with the Azure Maps web SDK using JavaScript or TypeScript. The robust features in this module allow developers to:
1718

18-
- [Read and write common spatial data files](spatial-io-read-write-spatial-data.md). Supported file formats include: KML, KMZ, GPX, GeoRSS, GML, GeoJSON and CSV files containing columns with spatial information. Also supports Well-Known Text (WKT).
19-
- [Connect to Open Geospatial Consortium (OGC) services and integrate with Azure Maps web SDK. Overlay Web Map Services (WMS) and Web Map Tile Services (WMTS) as layers on the map](spatial-io-add-ogc-map-layer.md).
20-
- [Query data in a Web Feature Service (WFS)](spatial-io-connect-wfs-service.md).
21-
- [Overlay complex data sets that contain style information and have them render automatically using minimal code](spatial-io-add-simple-data-layer.md).
22-
- [Leverage high-speed XML and delimited file reader and writer classes](spatial-io-core-operations.md).
19+
- [Read and write spatial data]. Supported file formats include: KML, KMZ, GPX, GeoRSS, GML, GeoJSON and CSV files containing columns with spatial information. Also supports Well-Known Text (WKT).
20+
- Connect to Open Geospatial Consortium (OGC) services and integrate with Azure Maps web SDK, and overlay Web Map Services (WMS) and Web Map Tile Services (WMTS) as layers on the map. For more information, see [Add a map layer from the Open Geospatial Consortium (OGC)].
21+
- Query data in a Web Feature Service (WFS). For more information, see [Connect to a WFS service].
22+
- Overlay complex data sets that contain style information and have them render automatically. For more information, see [Add a simple data layer].
23+
- Leverage high-speed XML and delimited file reader and writer classes. For more information, see [Core IO operations].
2324

24-
In this guide, we'll learn how to integrate and use the Spatial IO module in a web application.
25+
This guide demonstrates how to integrate and use the Spatial IO module in a web application.
2526

2627
This video provides an overview of Spatial IO module in the Azure Maps Web SDK.
2728

@@ -30,24 +31,24 @@ This video provides an overview of Spatial IO module in the Azure Maps Web SDK.
3031
> [!VIDEO https://learn.microsoft.com/Shows/Internet-of-Things-Show/Easily-integrate-spatial-data-into-the-Azure-Maps/player?format=ny]
3132
3233
> [!WARNING]
33-
> Only use data and services that are from a source you trust, especially if referencing it from another domain. The spatial IO module does take steps to minimize risk, however the safest approach is too not allow any danagerous data into your application to begin with.
34+
> Only use data and services that are from a source you trust, especially if referencing it from another domain. The spatial IO module does take steps to minimize risk, however the safest approach is too not allow any dangerous data into your application to begin with.
3435
3536
## Prerequisites
3637

37-
* An [Azure Maps account]
38-
* A [subscription key]
38+
- An [Azure Maps account]
39+
- A [subscription key]
3940

4041
## Installing the Spatial IO module
4142

4243
You can load the Azure Maps spatial IO module using one of the two options:
4344

44-
* The globally hosted Azure CDN for the Azure Maps spatial IO module. For this option, you add a reference to the JavaScript in the `<head>` element of the HTML file.
45+
- The globally hosted Azure CDN for the Azure Maps spatial IO module. For this option, you add a reference to the JavaScript in the `<head>` element of the HTML file.
4546

4647
```html
4748
<script src="https://atlas.microsoft.com/sdk/javascript/spatial/0/atlas-spatial.js"></script>
4849
```
4950

50-
* The source code for [azure-maps-spatial-io](https://www.npmjs.com/package/azure-maps-spatial-io) can be loaded locally, and then hosted with your app. This package also includes TypeScript definitions. For this option, use the following command to install the package:
51+
- The source code for [azure-maps-spatial-io] can be loaded locally, and then hosted with your app. This package also includes TypeScript definitions. For this option, use the following command to install the package:
5152

5253
```sh
5354
npm install azure-maps-spatial-io
@@ -63,7 +64,7 @@ You can load the Azure Maps spatial IO module using one of the two options:
6364

6465
1. Create a new HTML file.
6566

66-
2. Load the Azure Maps Web SDK and initialize the map control. See the [Azure Maps map control](./how-to-use-map-control.md) guide for the details. Once you're done with this step, your HTML file should look like this:
67+
1. Load the Azure Maps Web SDK and initialize the map control. See the [Azure Maps map control] guide for the details. Once you're done with this step, your HTML file should look like this:
6768

6869
```html
6970
<!DOCTYPE html>
@@ -117,13 +118,13 @@ You can load the Azure Maps spatial IO module using one of the two options:
117118
</html>
118119
```
119120

120-
2. Load the Azure Maps spatial IO module. For this exercise, use the CDN for the Azure Maps spatial IO module. Add the reference below to the `<head>` element of your HTML file:
121+
1. Load the Azure Maps spatial IO module. For this exercise, use the CDN for the Azure Maps spatial IO module. Add the following reference to the `<head>` element of your HTML file:
121122

122123
```html
123124
<script src="https://atlas.microsoft.com/sdk/javascript/spatial/0/atlas-spatial.js"></script>
124125
```
125126

126-
3. Initialize a `datasource`, and add the data source to the map. Initialize a `layer`, and add the data source to the map layer. Then, render both the data source and the layer. Before you scroll down to see the full code in the next step, think about the best places to put the data source and layer code snippets. Recall that, before we programmatically manipulate the map, we should wait until the map resource are ready.
127+
1. Initialize a `datasource`, and add the data source to the map. Initialize a `layer`, and add the data source to the map layer. Then, render both the data source and the layer. Before you scroll down to see the full code in the next step, think about the best places to put the data source and layer code snippets. Recall that, before we programmatically manipulate the map, we should wait until the map resource are ready.
127128

128129
```javascript
129130
var datasource, layer;
@@ -141,7 +142,7 @@ You can load the Azure Maps spatial IO module using one of the two options:
141142
map.layers.add(layer);
142143
```
143144

144-
4. Putting it all together, your HTML code should look like the following code. This sample demonstrates how to read an XML file from a URL. Then, load and display the file's feature data on the map.
145+
1. Your HTML code should now look like the following code. This sample demonstrates how to read an XML file from a URL. Then, load and display the file's feature data on the map.
145146

146147
```html
147148
<!DOCTYPE html>
@@ -218,7 +219,7 @@ You can load the Azure Maps spatial IO module using one of the two options:
218219
</html>
219220
```
220221

221-
5. Remember to replace `<Your Azure Maps Key>` with your subscription key. Open your HTML file, and you'll see results similar to the following image:
222+
1. Remember to replace `<Your Azure Maps Key>` with your subscription key. You should see results similar to the following image in your HTML file:
222223

223224
<center>
224225

@@ -228,30 +229,43 @@ You can load the Azure Maps spatial IO module using one of the two options:
228229

229230
## Next steps
230231

231-
The feature we demonstrated here is only one of the many features available in the Spatial IO module. Read the guides below to learn how to use other functionalities in the Spatial IO module:
232+
The feature we demonstrated is only one of the many features available in the Spatial IO module. Read the following guides to learn how to use other functionalities in the Spatial IO module:
232233

233234
> [!div class="nextstepaction"]
234-
> [Add a simple data layer](spatial-io-add-simple-data-layer.md)
235+
> [Add a simple data layer]
235236

236237
> [!div class="nextstepaction"]
237-
> [Read and write spatial data](spatial-io-read-write-spatial-data.md)
238+
> [Read and write spatial data]
238239

239240
> [!div class="nextstepaction"]
240-
> [Add an OGC map layer](spatial-io-add-ogc-map-layer.md)
241+
> [Add an OGC map layer]
241242

242243
> [!div class="nextstepaction"]
243-
> [Connect to a WFS service](spatial-io-connect-wfs-service.md)
244+
> [Connect to a WFS service]
244245

245246
> [!div class="nextstepaction"]
246-
> [Leverage core operations](spatial-io-core-operations.md)
247+
> [Leverage core operations]
247248

248249
> [!div class="nextstepaction"]
249-
> [Supported data format details](spatial-io-supported-data-format-details.md)
250+
> [Supported data format details]
250251

251252
Refer to the Azure Maps Spatial IO documentation:
252253

253254
> [!div class="nextstepaction"]
254-
> [Azure Maps Spatial IO package](/javascript/api/azure-maps-spatial-io/)
255+
> [Azure Maps Spatial IO package]
255256

257+
[Add a map layer from the Open Geospatial Consortium (OGC)]: spatial-io-add-ogc-map-layer.md
258+
[Add a simple data layer]: spatial-io-add-simple-data-layer.md
259+
[Add an OGC map layer]: spatial-io-add-ogc-map-layer.md
256260
[Azure Maps account]: quick-demo-map-app.md#create-an-azure-maps-account
261+
[Azure Maps map control]: how-to-use-map-control.md
262+
[Azure Maps Spatial IO package]: /javascript/api/azure-maps-spatial-io
263+
[azure-maps-spatial-io]: https://www.npmjs.com/package/azure-maps-spatial-io
264+
[Connect to a WFS service]: spatial-io-connect-wfs-service.md
265+
[Core IO operations]: spatial-io-core-operations.md
266+
[Leverage core operations]: spatial-io-core-operations.md
267+
[Read and write spatial data]: spatial-io-read-write-spatial-data.md
268+
[Spatial IO module]: https://www.npmjs.com/package/azure-maps-spatial-io
257269
[subscription key]: quick-demo-map-app.md#get-the-subscription-key-for-your-account
270+
[Supported data format details]: spatial-io-supported-data-format-details.md
271+

0 commit comments

Comments
 (0)