Skip to content

Commit c0a2ab2

Browse files
authored
Merge pull request #295515 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 8528d16 + 20b2fd5 commit c0a2ab2

File tree

11 files changed

+82
-15
lines changed

11 files changed

+82
-15
lines changed

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

Lines changed: 71 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ var map = new atlas.Map('map', {
2727
style: 'road'
2828

2929
//Additional map options.
30-
};
30+
});
3131

3232
//Update the style options at anytime using `setStyle` function.
3333
map.setStyle({
@@ -37,8 +37,6 @@ map.setStyle({
3737
});
3838
```
3939

40-
For a fully functional sample that shows how the different styles affect how the map is rendered, see [Map style options] in the [Azure Maps Samples]. For the source code for this sample, see [Map style options source code].
41-
4240
<!-----------------------------------------------------------------------------------------------
4341
<br/>
4442
> [!VIDEO https://codepen.io/azuremaps/embed/eYNMjPb?height=700&theme-id=0&default-tab=result]
@@ -57,7 +55,7 @@ var map = new atlas.Map('map', {
5755
style: 'grayscale_dark',
5856

5957
//Additional map options
60-
);
58+
});
6159
```
6260

6361
:::image type="content" source="./media/choose-map-style/set-base-map-style-on-initialization.png" alt-text="Screenshot showing the grayscale dark style being set during the map load process.":::
@@ -85,6 +83,74 @@ map.setStyle({ style: 'satellite' });
8583
> [!VIDEO //codepen.io/azuremaps/embed/yqXYzY/?height=265&theme-id=0&default-tab=js,result&embed-version=2&editable=true]
8684
----------------------------------------------------------------------------------------------->
8785

86+
## Customize the base map
87+
The [styleOverrides] options enable users to streamline the base map by turning off specific map elements like country/region borders, administrative district borders, building footprints, and road detail layers. This allows for a cleaner and simpler map view, making it easier to visualize geometry data.
88+
89+
The following code shows how to disable country/region borders and building footprints on the map.
90+
91+
```javascript
92+
var map = new atlas.Map('map', {
93+
styleOverrides: {
94+
countryRegion: { borderVisible: false },
95+
buildingFootprint: { visible: false },
96+
},
97+
98+
//Additional map options
99+
});
100+
```
101+
102+
Here are examples of all five available `styleOverrides` options:
103+
104+
- Country/region borders
105+
106+
```javascript
107+
styleOverrides: {
108+
countryRegion: { borderVisible: false }
109+
}
110+
```
111+
:::image type="content" source="./media/choose-map-style/country-region.gif" alt-text="An animated GIF that shows country/region borders on a map.":::
112+
113+
- Admin district borders
114+
115+
```javascript
116+
styleOverrides: {
117+
adminDistrict: { borderVisible: false }
118+
}
119+
```
120+
:::image type="content" source="./media/choose-map-style/admin-district.gif" alt-text="An animated GIF that shows admin district borders.":::
121+
122+
- Second admin district borders
123+
124+
```javascript
125+
styleOverrides: {
126+
adminDistrict2: { borderVisible: false }
127+
}
128+
```
129+
:::image type="content" source="./media/choose-map-style/admin-district-2.gif" alt-text="An animated GIF that shows second admin district borders.":::
130+
131+
- Building footprints
132+
133+
```javascript
134+
styleOverrides: {
135+
buildingFootprint: { visible: false }
136+
}
137+
```
138+
:::image type="content" source="./media/choose-map-style/building-footprint.gif" alt-text="An animated GIF that shows building footprints.":::
139+
140+
- Road details
141+
142+
```javascript
143+
styleOverrides: {
144+
roadDetails: { visible: false }
145+
}
146+
```
147+
:::image type="content" source="./media/choose-map-style/road-details.gif" alt-text="An animated GIF that shows road details.":::
148+
149+
> [!NOTE]
150+
> For more information on the supported map styles on each `styleOverrides` option, see the [styleOverrides] API documentation.
151+
152+
For a sample showing the different styles and how they affect how the map is rendered, see [Map style options] in the [Azure Maps Samples]. For this sample's source code, see [Map style options source code].
153+
88154
## Add the style picker control
89155

90156
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.
@@ -154,6 +220,7 @@ See the following articles for more code samples to add to your maps:
154220
> [Add a bubble layer]
155221
156222
[style options]: /javascript/api/azure-maps-control/atlas.styleoptions
223+
[styleOverrides]: /javascript/api/azure-maps-control/atlas.styleoverrides
157224
[base map styles]: supported-map-styles.md
158225

159226
[Add a bubble layer]: map-add-bubble-layer.md
147 KB
Loading
253 KB
Loading
240 KB
Loading
211 KB
Loading
392 KB
Loading

articles/azure-vmware/introduction.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,8 @@ When a customer has a deployed Azure VMware Solution private cloud, they can sca
5353

5454
**Azure VMware Solution stretched clusters private cloud**: The AV64 SKU isn't supported with Azure VMware Solution stretched clusters private cloud. This means that an AV64-based expansion isn't possible for an Azure VMware Solution stretched clusters private cloud.
5555

56-
[!NOTE]
57-
58-
All traffic from an AV64 host towards a customer network will utilize the IP address of the VMKernel Network Interface 1.
56+
> [!NOTE]
57+
> All traffic from an AV64 host towards a customer network will utilize the IP address of the VMKernel Network Interface 1.
5958
6059
### AV64 Cluster vSAN fault domain (FD) design and recommendations
6160

articles/azure-web-pubsub/socket-io-serverless-tutorial.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ You should follow the steps to initiate a local Azure Function project.
9898
});
9999
```
100100
101-
This step creates a function `negotiate` with Http Trigger and `SocketIONegotiation` output binding, which means you can use an Http call to trigger the function and return a negotiation result that generated by `SocketIONegotiation` binding.
101+
This step creates a function `negotiate` with HTTP Trigger and `SocketIONegotiation` output binding, which means you can use an HTTP call to trigger the function and return a negotiation result that generated by `SocketIONegotiation` binding.
102102
103103
1. Create a function for handing messages.
104104
@@ -219,7 +219,7 @@ You should follow the steps to initiate a local Azure Function project.
219219
220220
async function index(request, context) {
221221
try {
222-
context.log(`Http function processed request for url "${request.url}"`);
222+
context.log(`HTTP function processed request for url "${request.url}"`);
223223
224224
const filePath = path.join(__dirname,'../public/index.html');
225225
const html = await fs.readFile(filePath);

articles/communication-services/tutorials/calling-widget/calling-widget-js-tutorial.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -158,8 +158,8 @@ Next you want to open `index.html` in VS Code and add the following snippet.
158158
</body>
159159
```
160160

161-
[!IMPORTANT]
162-
It's important here to note that this file `index.html` and the JavaScript bundle `outboundCallComposite.js` need to be in the same folder if you wish to not edit any of the importing in this file.
161+
> [!IMPORTANT]
162+
> It's important here to note that this file `index.html` and the JavaScript bundle `outboundCallComposite.js` need to be in the same folder if you wish to not edit any of the importing in this file.
163163
164164
#### 3. Setting up Azure Communication Services and your Teams Voice Application
165165

@@ -197,8 +197,8 @@ npx http-server@latest -p 3000
197197
```
198198
This script using Node starts an HTTP server and hosts the `index.html` file and JavaScript bundle. In a browser open http://localhost:3000. You should see a white page with a button, and when you click it you should see the following screen.
199199

200-
[!IMPORTANT]
201-
Note, if you try to go to the page not using local host, your calling experience won't work due to security reasons.
200+
> [!IMPORTANT]
201+
> Note, if you try to go to the page not using local host, your calling experience won't work due to security reasons.
202202
203203
[![Screenshot of js bundle sample app homescreen.](../media/calling-widget/js-bundle-splash.png)](../media/calling-widget/js-bundle-splash.png#lightbox)
204204

articles/container-apps/tutorial-ci-cd-runners-jobs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -609,7 +609,7 @@ Create a new agent pool to run the self-hosted runner.
609609
610610
To run a self-hosted runner, you need to create a personal access token (PAT) in Azure DevOps. The PAT is used to authenticate the runner with Azure DevOps. It's also used by the scale rule to determine the number of pending pipeline runs and trigger new job executions.
611611

612-
[!NOTE]
612+
> [!NOTE]
613613
> Personal Access Tokens (PATs) have an expiration date. Regularly rotate your tokens to ensure they remain valid (not expired) to maintain uninterrupted service.
614614

615615
1. In Azure DevOps, select *User settings* next to your profile picture in the upper-right corner.

0 commit comments

Comments
 (0)