Skip to content

Commit addbd8f

Browse files
huypubhuypub
authored
Merge pull request #233300 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 cb466b7 + fa1c2a9 commit addbd8f

File tree

10 files changed

+74
-51
lines changed

10 files changed

+74
-51
lines changed

‎articles/active-directory-b2c/add-api-connector.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ms.date: 12/20/2022
99
author: garrodonnell
1010
ms.author: godonnell
1111
manager: CelesteDG
12-
ms.custom: "it-pro"
12+
ms.custom: "it-pro,b2c-support"
1313
zone_pivot_groups: b2c-policy-type
1414
---
1515

@@ -144,7 +144,6 @@ Content-type: application/json
144144
}
145145
],
146146
"displayName": "John Smith",
147-
"objectId": "11111111-0000-0000-0000-000000000000",
148147
"givenName":"John",
149148
"surname":"Smith",
150149
"step": "PostFederationSignup",
@@ -198,7 +197,6 @@ Content-type: application/json
198197
}
199198
],
200199
"displayName": "John Smith",
201-
"objectId": "11111111-0000-0000-0000-000000000000",
202200
"givenName":"John",
203201
"surname":"Smith",
204202
"jobTitle":"Supplier",

‎articles/active-directory/develop/scenario-web-api-call-api-app-configuration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ using Microsoft.Identity.Web;
126126
builder.Services.AddAuthentication(JwtBearerDefaults.AuthenticationScheme)
127127
.AddMicrosoftIdentityWebApi(Configuration, "AzureAd")
128128
.EnableTokenAcquisitionToCallDownstreamApi()
129-
.AddDownstreamApi("MyApi", Configuration.GetSection("GraphBeta"))
129+
.AddDownstreamWebApi("MyApi", Configuration.GetSection("GraphBeta"))
130130
.AddInMemoryTokenCaches();
131131
// ...
132132
```

‎articles/azure-maps/azure-maps-qps-rate-limits.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ ms.custom: mode-other
1212

1313
# Azure Maps QPS rate limits
1414

15-
Azure Maps does not have any maximum daily limits on the number of requests that can be made, however there are limits to the maximum number of queries per second (QPS).
15+
Azure Maps doesn't have any maximum daily limits on the number of requests that can be made, however there are limits to the maximum number of queries per second (QPS).
1616

17-
Below are the QPS usage limits for each Azure Maps service by Pricing Tier.
17+
The following list shows the QPS usage limits for each Azure Maps service by Pricing Tier.
1818

1919
| Azure Maps service | QPS Limit: Gen 2 Pricing Tier | QPS Limit: Gen 1 S1 Pricing Tier | QPS Limit: Gen 1 S0 Pricing Tier |
2020
| ----------------- | :--------------------------: | :------------------------------: | :------------------------: |
@@ -39,4 +39,6 @@ Below are the QPS usage limits for each Azure Maps service by Pricing Tier.
3939
| Traffic service | 50 | 50 | 50 |
4040
| Weather service | 50 | 50 | 50 |
4141

42-
When QPS limits are reached, an HTTP 429 error will be returned. If you are using the Gen 2 or Gen 1 S1 pricing tiers, you can create an Azure Maps *Technical* Support Request in the [Azure portal](https://portal.azure.com/) to increase a specific QPS limit if needed. QPS limits for the Gen 1 S0 pricing tier cannot be increased.
42+
When QPS limits are reached, an HTTP 429 error is returned. If you're using the Gen 2 or Gen 1 S1 pricing tiers, you can create an Azure Maps *Technical* Support Request in the [Azure portal] to increase a specific QPS limit if needed. QPS limits for the Gen 1 S0 pricing tier can't be increased.
43+
44+
[Azure portal]: https://portal.azure.com/

‎articles/azure-maps/choose-map-style.md

Lines changed: 30 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ ms.custom: devx-track-js
1111

1212
# Change the style of the map
1313

14-
The map control supports several different map [style options](/javascript/api/azure-maps-control/atlas.styleoptions) and [base map styles](supported-map-styles.md). All styles can be set when the map control is being initialized. Or, you can set styles by using the map control's `setStyle` function. This article shows you how to use these style options to customize the map's appearance. Also, you'll learn how to implement the style picker control in your map. The style picker control allows the user to toggle between different base styles.
14+
The map control supports several different map [style options] and [base map styles]. All styles can be set when the map control is being initialized. Or, you can set styles by using the map control's `setStyle` function. This article shows you how to use these style options to customize the map's appearance and how to implement the style picker control in your map. The style picker control allows the user to toggle between different base styles.
1515

1616
## Set map style options
1717

18-
Style options can be set during web control initialization. Or, you can update style options by calling the map control's `setStyle` function. To see all available style options, see [style options](/javascript/api/azure-maps-control/atlas.styleoptions).
18+
Style options can be set during web control initialization. Or, you can update style options by calling the map control's `setStyle` function. To see all available style options, see [style options].
1919

2020
```javascript
2121
//Set the style options when creating the map.
@@ -49,11 +49,11 @@ The following tool shows how the different style options change how the map is r
4949
5050
## Set a base map style
5151
52-
You can also initialize the map control with one of the [base map styles](supported-map-styles.md) that are available in the Web SDK. You can then use the `setStyle` function to update the base style with a different map style.
52+
You can also initialize the map control with one of the [base map styles] that are available in the Web SDK. You can then use the `setStyle` function to update the base style with a different map style.
5353
5454
### Set a base map style on initialization
5555
56-
Base styles of the map control can be set during initialization. In the following code, the `style` option of the map control is set to the [`grayscale_dark` base map style](supported-map-styles.md#grayscale_dark).
56+
Base styles of the map control can be set during initialization. In the following code, the `style` option of the map control is set to the [`grayscale_dark` base map style].
5757
5858
```javascript
5959
var map = new atlas.Map('map', {
@@ -70,13 +70,13 @@ var map = new atlas.Map('map', {
7070
7171
### Update the base map style
7272
73-
The base map style can be updated by using the `setStyle` function and setting the `style` option to either change to a different base map style or add additional style options.
73+
The base map style can be updated by using the `setStyle` function and setting the `style` option to either change to a different base map style or add more style options.
7474
7575
```javascript
7676
map.setStyle({ style: 'satellite' });
7777
```
7878
79-
In the following code, after a map instance is loaded, the map style is updated from `grayscale_dark` to `satellite` using the [setStyle](/javascript/api/azure-maps-control/atlas.map#setstyle-styleoptions-) function.
79+
In the following code, after a map instance is loaded, the map style is updated from `grayscale_dark` to `satellite` using the [setStyle] function.
8080
8181
<br/>
8282
@@ -87,20 +87,20 @@ In the following code, after a map instance is loaded, the map style is updated
8787
8888
The style picker control provides an easy to use button with flyout panel that can be used by the end user to switch between base styles.
8989
90-
The style picker has two different layout options: `icon` and `list`. Also, the style picker allows you to choose two different style picker control `style` options: `light` and `dark`. In this example, the style picker uses the `icon` layout and displays a select list of base map styles in the form of icons. The style control picker includes the following base set of styles: `["road", "grayscale_light", "grayscale_dark", "night", "road_shaded_relief"]`. For more information on style picker control options, see [Style Control Options](/javascript/api/azure-maps-control/atlas.stylecontroloptions).
90+
The style picker has two different layout options: `icon` and `list`. Also, the style picker allows you to choose two different style picker control `style` options: `light` and `dark`. In this example, the style picker uses the `icon` layout and displays a select list of base map styles in the form of icons. The style control picker includes the following base set of styles: `["road", "grayscale_light", "grayscale_dark", "night", "road_shaded_relief"]`. For more information on style picker control options, see [Style Control Options].
9191
92-
The image below shows the style picker control displayed in `icon` layout.
92+
The following image shows the style picker control displayed in `icon` layout.
9393
9494
:::image type="content" source="./media/choose-map-style/style-picker-icon-layout.png" alt-text="Style picker icon layout":::
9595
96-
The image below shows the style picker control displayed in `list` layout.
96+
The following image shows the style picker control displayed in `list` layout.
9797
9898
:::image type="content" source="./media/choose-map-style/style-picker-list-layout.png" alt-text="Style picker list layout":::
9999
100100
> [!IMPORTANT]
101101
> By default the style picker control lists all the styles available under the S0 pricing tier of Azure Maps. If you want to reduce the number of styles in this list, pass an array of the styles you want to appear in the list into the `mapStyle` option of the style picker. If you are using Gen 1 (S1) or Gen 2 pricing tier and want to show all available styles, set the `mapStyles` option of the style picker to `"all"`.
102102
103-
The following code shows you how to override the default `mapStyles` base style list. In this example, we're setting the `mapStyles` option to list which base styles we want to be displayed by the style picker control.
103+
The following code shows you how to override the default `mapStyles` base style list. In this example, we're setting the `mapStyles` option to list the base styles to display in the style picker control.
104104
105105
<br/>
106106
@@ -112,24 +112,37 @@ The following code shows you how to override the default `mapStyles` base style
112112
To learn more about the classes and methods used in this article:
113113
114114
> [!div class="nextstepaction"]
115-
> [Map](/javascript/api/azure-maps-control/atlas.map)
115+
> [Map]
116116
117117
> [!div class="nextstepaction"]
118-
> [StyleOptions](/javascript/api/azure-maps-control/atlas.styleoptions)
118+
> [StyleOptions]
119119
120120
> [!div class="nextstepaction"]
121-
> [StyleControl](/javascript/api/azure-maps-control/atlas.control.stylecontrol)
121+
> [StyleControl]
122122
123123
> [!div class="nextstepaction"]
124-
> [StyleControlOptions](/javascript/api/azure-maps-control/atlas.stylecontroloptions)
124+
> [StyleControlOptions]
125125
126126
See the following articles for more code samples to add to your maps:
127127
128128
> [!div class="nextstepaction"]
129-
> [Add map controls](map-add-controls.md)
129+
> [Add map controls]
130130
131131
> [!div class="nextstepaction"]
132-
> [Add a symbol layer](map-add-pin.md)
132+
> [Add a symbol layer]
133133
134134
> [!div class="nextstepaction"]
135-
> [Add a bubble layer](map-add-bubble-layer.md)
135+
> [Add a bubble layer]
136+
137+
[style options]: /javascript/api/azure-maps-control/atlas.styleoptions
138+
[base map styles]: supported-map-styles.md
139+
[`grayscale_dark` base map style]: supported-map-styles.md#grayscale_dark
140+
[setStyle]: /javascript/api/azure-maps-control/atlas.map#setstyle-styleoptions-
141+
[Style Control Options]: /javascript/api/azure-maps-control/atlas.stylecontroloptions
142+
[Map]: /javascript/api/azure-maps-control/atlas.map
143+
[StyleOptions]: /javascript/api/azure-maps-control/atlas.styleoptions
144+
[StyleControl]: /javascript/api/azure-maps-control/atlas.control.stylecontrol
145+
[StyleControlOptions]: /javascript/api/azure-maps-control/atlas.stylecontroloptions
146+
[Add map controls]: map-add-controls.md
147+
[Add a symbol layer]: map-add-pin.md
148+
[Add a bubble layer]: map-add-bubble-layer.md

‎articles/azure-maps/choose-pricing-tier.md

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,26 +11,30 @@ services: azure-maps
1111

1212
# Choose the right pricing tier in Azure Maps
1313

14-
Azure Maps now offers two pricing tiers: Gen 1 and Gen 2. The new Gen 2 pricing tier contains all Azure Maps capabilities with increased QPS (Queries Per Second) limits over Gen 1, and it allows you to achieve cost savings as Azure Maps transactions increases. The purpose of this article is to help you choose the right pricing tier for your needs.
14+
Azure Maps now offers two pricing tiers: Gen 1 and Gen 2. The new Gen 2 pricing tier contains all Azure Maps capabilities included in the Gen 1 tier, but with increased QPS (Queries Per Second) limits, allowing you to achieve cost savings as Azure Maps transactions increase. This article helps you determine the right pricing tier for your needs.
1515

1616
## Pricing tier targeted customers
1717

18-
See the **pricing tier targeted customers** table below for a better understanding of Gen 1 and Gen 2 pricing tiers. For more information, see [Azure Maps pricing](https://aka.ms/CreatorPricing). If you're a current Azure Maps customer, you can learn how to change from Gen 1 to Gen 2 pricing in the [Manage pricing tier](how-to-manage-pricing-tier.md) article.
18+
The following **pricing tier targeted customers** table shows the Gen 1 and Gen 2 pricing tiers. For more information, see [Azure Maps pricing]. If you're a current Azure Maps customer, you can learn how to change from Gen 1 to Gen 2 pricing in the [Manage pricing tier] article.
1919

2020
| Pricing tier | SKU | Targeted Customers|
2121
|---------------|:---:| ------------------|
2222
|**Gen 1**|S0| The S0 pricing tier works for applications in all stages of production: from proof-of-concept development and early stage testing to application production and deployment. However, this tier is designed for small-scale development, or customers with low concurrent users, or both. S0 has a restriction of 50 QPS for all services combined.
2323
| |S1| The S1 pricing tier is for customers with large-scale enterprise applications, mission-critical applications, or high volumes of concurrent users. It's also for those customers who require advanced geospatial services.
24-
| **Gen 2** | Maps/Location Insights | Gen 2 pricing is for new and current Azure Maps customers. Gen 2 comes with a free monthly tier of transactions to be used to test and build on Azure maps. Maps and Location Insights SKU’s contain all Azure Maps capabilities. It allows you to achieve cost savings as Azure Maps transactions increases. Additionally, it has higher QPS limits than Gen 1. The Gen 2 pricing tier is required when using [Creator for indoor maps](creator-indoor-maps.md).
25-
| | |
24+
| **Gen 2** | Maps/Location Insights | Gen 2 pricing is for new and current Azure Maps customers. Gen 2 comes with a free monthly tier of transactions to be used to test and build on Azure maps. Maps and Location Insights SKUs contain all Azure Maps capabilities. It allows you to achieve cost savings as Azure Maps transactions increases. Additionally, it has higher QPS limits than Gen 1. The Gen 2 pricing tier is required when using [Creator for indoor maps].
2625

27-
For more information on QPS limits, please refer to [Azure Maps QPS rate limits](azure-maps-qps-rate-limits.md).
26+
For more information on QPS limits, see [Azure Maps QPS rate limits].
2827

29-
For additional pricing information on [Creator for indoor maps](creator-indoor-maps.md), see the *Creator* section in [Azure Maps pricing](https://aka.ms/CreatorPricing).
28+
For pricing information on [Creator for indoor maps], see the *Creator* section in [Azure Maps pricing].
3029

3130
## Next steps
3231

3332
Learn more about how to view and change pricing tiers:
3433

3534
> [!div class="nextstepaction"]
3635
> [Manage a pricing tier](how-to-manage-pricing-tier.md)
36+
37+
[Azure Maps pricing]: https://aka.ms/CreatorPricing
38+
[Manage pricing tier]: how-to-manage-pricing-tier.md
39+
[Creator for indoor maps]: creator-indoor-maps.md
40+
[Azure Maps QPS rate limits]: azure-maps-qps-rate-limits.md

0 commit comments

Comments
 (0)