Merge pull request #250770 from stevemunk/Gen1-deprecation-PR2

Azure Maps Gen1 price tier deprecation PR #2 of 4.

Author: American-Dipper

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

@@ -101,7 +101,9 @@ The following image shows the style picker control displayed in `list` layout.
 :::image type="content" source="./media/choose-map-style/style-picker-list-layout.png" alt-text="Style picker list layout":::
 
 > [!IMPORTANT]
-> 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"`.
+> By default the style picker control lists all the styles available under the Gen1 (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 Gen1 (S1) or Gen2 pricing tier and want to show all available styles, set the `mapStyles` option of the style picker to `"all"`.
+>
+> Gen1 pricing tier is now deprecated and will be retired on 9/15/26. Gen2 pricing tier replaces Gen1 (both S0 and S1) pricing tier. If your Azure Maps account has Gen1 pricing tier selected, you can switch to Gen2 pricing before it’s retired, otherwise it will automatically be updated. For more information, see [Manage the pricing tier of your Azure Maps account].
 
 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.
 
@@ -153,16 +155,17 @@ See the following articles for more code samples to add to your maps:
 [style options]: /javascript/api/azure-maps-control/atlas.styleoptions
 [base map styles]: supported-map-styles.md
 
+[Add a bubble layer]: map-add-bubble-layer.md
+[Add a symbol layer]: map-add-pin.md
+[Add map controls]: map-add-controls.md
+[Azure Maps Samples]: https://samples.azuremaps.com
 [grayscale_dark]: supported-map-styles.md#grayscale_dark
+[Manage the pricing tier of your Azure Maps account]: how-to-manage-pricing-tier.md
+[Map style options source code]: https://github.com/Azure-Samples/AzureMapsCodeSamples/blob/main/Samples/Map/Map%20style%20options/Map%20style%20options.html
+[Map style options]: https://samples.azuremaps.com/map/map-style-options
+[Map]: /javascript/api/azure-maps-control/atlas.map
 [setStyle]: /javascript/api/azure-maps-control/atlas.map#azure-maps-control-atlas-map-setstyle
 [Style Control Options]: /javascript/api/azure-maps-control/atlas.stylecontroloptions
-[Map]: /javascript/api/azure-maps-control/atlas.map
-[StyleOptions]: /javascript/api/azure-maps-control/atlas.styleoptions
 [StyleControl]: /javascript/api/azure-maps-control/atlas.control.stylecontrol
 [StyleControlOptions]: /javascript/api/azure-maps-control/atlas.stylecontroloptions
-[Add map controls]: map-add-controls.md
-[Add a symbol layer]: map-add-pin.md
-[Add a bubble layer]: map-add-bubble-layer.md
-[Map style options]: https://samples.azuremaps.com/map/map-style-options
-[Map style options source code]: https://github.com/Azure-Samples/AzureMapsCodeSamples/blob/main/Samples/Map/Map%20style%20options/Map%20style%20options.html
-[Azure Maps Samples]: https://samples.azuremaps.com
+[StyleOptions]: /javascript/api/azure-maps-control/atlas.styleoptions

articles/azure-maps/migrate-from-bing-maps.md

@@ -26,7 +26,7 @@ In this tutorial, you'll learn:
 
 ## Prerequisites
 
-If you don't have an Azure subscription, create a [free account] before you begin.
+If you don't have an Azure subscription, create a [free Azure account] before you begin.
 
 * An [Azure Maps account]
 * A [subscription key]
@@ -84,7 +84,6 @@ Here are some licensing-related resources for Azure Maps:
 * [Azure Maps pricing page]
 * [Azure pricing calculator]
 * [Azure Maps term of use] (Scroll down to the Azure Maps section)
-* [Choose the right pricing tier in Azure Maps]
 
 ## Suggested migration plan
 
@@ -172,8 +171,6 @@ Learn the details of how to migrate your Bing Maps application with these articl
 [Azure support options]: https://azure.microsoft.com/support/options/
 [azure.com]: https://azure.com
 [Basic snap to road logic]: https://samples.azuremaps.com/?search=Snap%20to%20road&sample=basic-snap-to-road-logic
-[Choose the right pricing tier in Azure Maps]: choose-pricing-tier.md
-[free account]: https://azure.microsoft.com/free/
 [free Azure account]: https://azure.microsoft.com/free/
 [manage authentication in Azure Maps]: how-to-manage-authentication.md
 [Microsoft Azure terms of use]: https://www.microsoftvolumelicensing.com/DocumentSearch.aspx?Mode=3&DocumentTypeId=31

articles/azure-maps/migrate-from-google-maps.md

@@ -75,7 +75,6 @@ Here are some related resources for Azure Maps:
 
 * [Azure Maps pricing page]
 * [Azure pricing calculator]
-* [Choose the right pricing tier in Azure Maps]
 * [Azure Maps term of use] - included in the Microsoft Online Services Terms.
 
 ## Suggested migration plan
@@ -139,7 +138,6 @@ Learn the details of how to migrate your Google Maps application with these arti
 [Azure pricing calculator]: https://azure.microsoft.com/pricing/calculator/?service=azure-maps
 [Azure subscription]: https://azure.com
 [Azure support options]: https://azure.microsoft.com/support/options
-[Choose the right pricing tier in Azure Maps]: choose-pricing-tier.md
 [free account]: https://azure.microsoft.com/free/
 [Manage authentication in Azure Maps]: how-to-manage-authentication.md
 [Microsoft learning center shows]: https://aka.ms/AzureMapsVideos

articles/azure-maps/set-android-map-styles.md

@@ -20,9 +20,6 @@ This article shows you two ways to set map styles using the Azure Maps Android S
 
 Be sure to complete the steps in the Quickstart: [Create an Android app].
 
->[!IMPORTANT]
->The procedure in this section requires an Azure Maps account in Gen 1 or Gen 2 pricing tier. For more information on pricing tiers, see [Choose the right pricing tier in Azure Maps].
-
 ## Set map style in the layout
 
 You can set a map style in the layout file for your activity class when adding the map control. The following code sets the center location, zoom level, and map style.
@@ -253,6 +250,5 @@ See the following articles for more code samples to add to your maps:
 
 [Add a bubble layer]: map-add-bubble-layer-android.md
 [Add a symbol layer]: how-to-add-symbol-to-android-map.md
-[Choose the right pricing tier in Azure Maps]: choose-pricing-tier.md
 [Create an Android app]: quick-android-map.md
 [supported map styles in Azure Maps]: supported-map-styles.md

articles/azure-maps/supported-map-styles.md

@@ -14,9 +14,6 @@ services: azure-maps
 
 Azure Maps supports several different built-in map styles as described in this article.
 
->[!important]
->The procedure in this section requires an Azure Maps account in Gen 1 or Gen 2 pricing tier. For more information on pricing tiers, see [Choose the right pricing tier in Azure Maps].
-
 ## road
 
 A **road** map is a standard map that displays roads. It also displays natural and artificial features, and the labels for those features.
@@ -166,8 +163,7 @@ Learn about how to set a map style in Azure Maps:
 > [!div class="nextstepaction"]
 > [Choose a map style]
 
-[Choose the right pricing tier in Azure Maps]: choose-pricing-tier.md
 [Map image]: /rest/api/maps/render/getmapimage
 [Map tile]: /rest/api/maps/render/getmaptile
 [Satellite tile]: /rest/api/maps/render/getmapimagerytilepreview
-[Choose a map style]: choose-map-style.md
+[Choose a map style]: choose-map-style.md