Skip to content

Commit 36e3fe1

Browse files
authored
Merge pull request #246629 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 4ecd436 + 7c5a511 commit 36e3fe1

File tree

5 files changed

+53
-45
lines changed

5 files changed

+53
-45
lines changed

articles/ai-services/language-service/text-analytics-for-health/includes/quickstarts/csharp-sdk.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ namespace Example
5858
class Program
5959
{
6060
// This example requires environment variables named "LANGUAGE_KEY" and "LANGUAGE_ENDPOINT"
61-
private static readonly AzureKeyCredential credentials = Environment.GetEnvironmentVariable("LANGUAGE_KEY");
62-
private static readonly Uri endpoint = Environment.GetEnvironmentVariable("LANGUAGE_ENDPOINT");
61+
private static readonly AzureKeyCredential credentials = new (Environment.GetEnvironmentVariable("LANGUAGE_KEY"));
62+
private static readonly Uri endpoint = new (Environment.GetEnvironmentVariable("LANGUAGE_ENDPOINT"));
6363

6464
// Example method for extracting information from healthcare-related text
6565
static async Task healthExample(TextAnalyticsClient client)

articles/azure-functions/functions-host-json.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,7 @@ Controls the logging behaviors of the function app, including Application Insigh
392392

393393
|Property |Default | Description |
394394
|---------|---------|---------|
395-
|fileLoggingMode|debugOnly|Determines the file logging behavior when running in Azure. Options are `never`, `always`, and `debugOnly`. This setting isn't used when running locally. When possible, you should use Application Insights when debugging your functions in Azure. Using `always` negatively impacts your app's cold start behavior and data throughput. The default `debguOnly` setting generates log files when you are debugging using the Azure portal. |
395+
|fileLoggingMode|debugOnly|Determines the file logging behavior when running in Azure. Options are `never`, `always`, and `debugOnly`. This setting isn't used when running locally. When possible, you should use Application Insights when debugging your functions in Azure. Using `always` negatively impacts your app's cold start behavior and data throughput. The default `debugOnly` setting generates log files when you are debugging using the Azure portal. |
396396
|logLevel|n/a|Object that defines the log category filtering for functions in the app. This setting lets you filter logging for specific functions. For more information, see [Configure log levels](configure-monitoring.md#configure-log-levels). |
397397
|console|n/a| The [console](#console) logging setting. |
398398
|applicationInsights|n/a| The [applicationInsights](#applicationinsights) setting. |

articles/azure-maps/webgl-custom-layer.md

Lines changed: 27 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ services: azure-maps
1313
# Add a custom WebGL layer to a map
1414

1515
The Azure Maps Web SDK supports creating custom layers
16-
using [WebGL][getting_started_with_webgl]. WebGL is based
17-
on [OpenGL ES][OpenGL ES] and enables rendering 2D and 3D
16+
using [WebGL]. WebGL is based
17+
on [OpenGL ES] and enables rendering 2D and 3D
1818
graphics in web browsers.
1919

2020
Using WebGL, you can build high-performance interactive
@@ -24,7 +24,7 @@ scenarios like simulations, data visualization, animations and
2424

2525
Developers can access the WebGL context of the map during
2626
rendering and use custom WebGL layers to integrate with other
27-
libraries such as [three.js][threejs] and [deck.gl][deckgl]
27+
libraries such as [three.js] and [deck.gl]
2828
to provide enriched and interactive content on the map.
2929

3030
## Add a WebGL layer
@@ -119,12 +119,12 @@ This sample renders a triangle on the map using a WebGL layer.
119119

120120
![A screenshot showing a triangle rendered on a map, using a WebGL layer.](./media/how-to-webgl-custom-layer/triangle.png)
121121

122-
For a fully functional sample with source code, see [Simple 2D WebGL layer][Simple 2D WebGL layer] in the Azure Maps Samples.
122+
For a fully functional sample with source code, see [Simple 2D WebGL layer] in the Azure Maps Samples.
123123

124124
The map's camera matrix is used to project spherical Mercator point to
125-
gl coordinates. Mercator point \[0, 0\] represents the top left corner
125+
`gl` coordinates. Mercator point \[0, 0\] represents the top left corner
126126
of the Mercator world and \[1, 1\] represents the bottom right corner.
127-
When the `renderingMode` is `"3d"`, the z coordinate is conformal.
127+
When `renderingMode` is `"3d"`, the z coordinate is conformal.
128128
A box with identical x, y, and z lengths in Mercator units would be
129129
rendered as a cube.
130130

@@ -136,7 +136,7 @@ methods can be used to project a Mercator point to a Position.
136136
## Render a 3D model
137137

138138
Use a WebGL layer to render 3D models. The following example shows how
139-
to load a [glTF][glTF] file and render it on the map using [three.js][threejs].
139+
to load a [glTF] file and render it on the map using [three.js].
140140

141141
You need to add the following script files.
142142

@@ -149,10 +149,10 @@ This sample renders an animated 3D parrot on the map.
149149

150150
![A screenshot showing an an animated 3D parrot on the map.](./media/how-to-webgl-custom-layer/3d-parrot.gif)
151151

152-
For a fully functional sample with source code, see [Three custom WebGL layer][Three custom WebGL layer] in the Azure Maps Samples.
152+
For a fully functional sample with source code, see [Three custom WebGL layer] in the Azure Maps Samples.
153153

154154
The `onAdd` function loads a `.glb` file into memory and instantiates
155-
three.js objects such as Camera, Scene, Light, and a `THREE.WebGLRenderer`.
155+
[three.js] objects such as Camera, Scene, Light, and a `THREE.WebGLRenderer`.
156156

157157
The `render` function calculates the projection matrix of the camera
158158
and renders the model to the scene.
@@ -166,7 +166,7 @@ one of the style options while creating the map.
166166

167167
## Render a 3D model using babylon.js
168168

169-
[Babylon.js][babylonjs] is one of the world's leading WebGL-based graphics engines. The following example shows how to load a GLTF file and render it on the map using babylon.js.
169+
[Babylon.js] is one of the world's leading WebGL-based graphics engines. The following example shows how to load a GLTF file and render it on the map using babylon.js.
170170

171171
You need to add the following script files.
172172

@@ -183,11 +183,11 @@ The `render` function calculates the projection matrix of the camera and renders
183183

184184
![A screenshot showing an example of rendering a 3D model using babylon.js.](./media/how-to-webgl-custom-layer/render-3d-model.png)
185185

186-
For a fully functional sample with source code, see [Babylon custom WebGL layer][Babylon custom WebGL layer] in the Azure Maps Samples.
186+
For a fully functional sample with source code, see [Babylon custom WebGL layer] in the Azure Maps Samples.
187187

188188
## Render a deck.gl layer
189189

190-
A WebGL layer can be used to render layers from the [deck.gl][deckgl]
190+
A WebGL layer can be used to render layers from the [deck.gl]
191191
library. The following sample demonstrates the data visualization of
192192
people migration flow in the United States from county to county
193193
within a certain time range.
@@ -230,40 +230,39 @@ class DeckGLLayer extends atlas.layer.WebGLLayer {
230230
}
231231
```
232232
233-
234-
This sample renders an arc-layer google the [deck.gl][deckgl] library.
233+
This sample renders an arc-layer google the [deck.gl] library.
235234
236235
![A screenshot showing an arc-layer from the Deck G L library.](./media/how-to-webgl-custom-layer/arc-layer.png)
237236
238-
For a fully functional sample with source code, see [Deck GL custom WebGL layer][Deck GL custom WebGL layer] in the Azure Maps Samples.
237+
For a fully functional sample with source code, see [Deck GL custom WebGL layer] in the Azure Maps Samples.
239238
240239
## Next steps
241240
242241
Learn more about the classes and methods used in this article:
243242
244243
> [!div class="nextstepaction"]
245-
> [WebGLLayer][WebGLLayer]
244+
> [WebGLLayer]
246245
247246
> [!div class="nextstepaction"]
248-
> [WebGLLayerOptions][WebGLLayerOptions]
247+
> [WebGLLayerOptions]
249248
250249
> [!div class="nextstepaction"]
251-
> [WebGLRenderer interface][WebGLRenderer interface]
250+
> [WebGLRenderer interface]
252251
253252
> [!div class="nextstepaction"]
254-
> [MercatorPoint][MercatorPoint]
253+
> [MercatorPoint]
255254
256-
[getting_started_with_webgl]: https://developer.mozilla.org/en-US/docs/web/api/webgl_api/tutorial/getting_started_with_webgl
257-
[threejs]: https://threejs.org/
258-
[deckgl]: https://deck.gl/
255+
[Babylon custom WebGL layer]: https://samples.azuremaps.com/?sample=babylon-custom-webgl-layer
256+
[Babylon.js]: https://www.babylonjs.com/
257+
[Deck GL custom WebGL layer]: https://samples.azuremaps.com/?sample=deck-gl-custom-webgl-layer
258+
[deck.gl]: https://deck.gl/
259259
[glTF]: https://www.khronos.org/gltf/
260+
[MercatorPoint]: /javascript/api/azure-maps-control/atlas.data.mercatorpoint
260261
[OpenGL ES]: https://www.khronos.org/opengles/
261-
[babylonjs]: https://www.babylonjs.com/
262+
[Simple 2D WebGL layer]: https://samples.azuremaps.com/?sample=simple-2d-webgl-layer
263+
[Three custom WebGL layer]: https://samples.azuremaps.com/?sample=three-custom-webgl-layer
264+
[three.js]: https://threejs.org/
265+
[WebGL]: https://developer.mozilla.org/en-US/docs/web/api/webgl_api/tutorial/getting_started_with_webgl
262266
[WebGLLayer]: /javascript/api/azure-maps-control/atlas.layer.webgllayer
263267
[WebGLLayerOptions]: /javascript/api/azure-maps-control/atlas.webgllayeroptions
264268
[WebGLRenderer interface]: /javascript/api/azure-maps-control/atlas.webglrenderer
265-
[MercatorPoint]: /javascript/api/azure-maps-control/atlas.data.mercatorpoint
266-
[Simple 2D WebGL layer]: https://samples.azuremaps.com/?sample=simple-2d-webgl-layer
267-
[Deck GL custom WebGL layer]: https://samples.azuremaps.com/?sample=deck-gl-custom-webgl-layer
268-
[Three custom WebGL layer]: https://samples.azuremaps.com/?sample=three-custom-webgl-layer
269-
[Babylon custom WebGL layer]: https://samples.azuremaps.com/?sample=babylon-custom-webgl-layer

articles/azure-maps/zoom-levels-and-tile-grid.md

Lines changed: 22 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ services: azure-maps
1212

1313
# Zoom levels and tile grid
1414

15-
Azure Maps use the Spherical Mercator projection coordinate system (EPSG: 3857). A projection is the mathematical model used to transform the spherical globe into a flat map. The Spherical Mercator projection stretches the map at the poles to create a square map. This projection significantly distorts the scale and area of the map but has two important properties that outweigh this distortion:
15+
Azure Maps use the Spherical Mercator projection coordinate system ([EPSG:3857]). A projection is the mathematical model used to transform the spherical globe into a flat map. The Spherical Mercator projection stretches the map at the poles to create a square map. This projection significantly distorts the scale and area of the map but has two important properties that outweigh this distortion:
1616

1717
- It's a conformal projection, which means that it preserves the shape of relatively small objects. Preserving the shape of small objects is especially important when showing aerial imagery. For example, we want to avoid distorting the shape of buildings. Square buildings should appear square, not rectangular.
18-
- It's a cylindrical projection. North and south are always up and down, and west and east are always left and right.
18+
- It's a cylindrical projection. North and south are always up and down, and west and east are always left and right.
1919

2020
To optimize the performance of map retrieval and display, the map is divided into square tiles. The Azure Maps SDK's use tiles that have a size of 512 x 512 pixels for road maps, and smaller 256 x 256 pixels for satellite imagery. Azure Maps provides raster and vector tiles for 23 zoom levels, numbered 0 through 22. At zoom level 0, the entire world fits on a single tile:
2121

@@ -27,7 +27,7 @@ Zoom level 1 uses four tiles to render the world: a 2 x 2 square
2727

2828
Each additional zoom level quad-divides the tiles of the previous one, creating a grid of 2<sup>zoom</sup> x 2<sup>zoom</sup>. Zoom level 22 is a grid 2<sup>22</sup> x 2<sup>22</sup>, or 4,194,304 x 4,194,304 tiles (17,592,186,044,416 tiles in total).
2929

30-
The Azure Maps interactive map controls for web and Android support 25 zoom levels, numbered 0 through 24. Although road data will only be available at the zoom levels in when the tiles are available.
30+
The Azure Maps interactive map controls for web and Android support 25 zoom levels, numbered 0 through 24. Although road data is only available at the zoom levels in when the tiles are available.
3131

3232
The following table provides the full list of values for zoom levels where the tile size is **512** pixels square at latitude 0:
3333

@@ -115,16 +115,16 @@ When determining which zoom level to use, remember each location is in a fixed p
115115

116116
Once the zoom level is determined, the x and y values can be calculated. The top-left tile in each zoom grid is x=0, y=0; the bottom-right tile is at x=2<sup>zoom-1</sup>, y=2<sup>zoom-1</sup>.
117117

118-
Here is the zoom grid for zoom level 1:
118+
Here's the zoom grid for zoom level 1:
119119

120120
:::image type="content" border="false" source="./media/zoom-levels-and-tile-grid/api_x_y.png" alt-text="Zoom grid for zoom level 1":::
121121

122122
## Quadkey indices
123123

124-
Some mapping platforms use a `quadkey` indexing naming convention that combines the tile ZY coordinates into a one-dimension string called `quadtree` keys or `quadkeys` for short. Each `quadkey` uniquely identifies a single tile at a particular level of detail, and it can be used as a key in common database B-tree indexes. The Azure Maps SDKs support the overlaying of tile layers that use `quadkey` naming convention in addition to other naming conventions as documented in the [Add a tile layer](map-add-tile-layer.md) document.
124+
Some mapping platforms use a `quadkey` indexing naming convention that combines the tile ZY coordinates into a one-dimension string called `quadtree` keys or `quadkeys` for short. Each `quadkey` uniquely identifies a single tile at a particular level of detail, and it can be used as a key in common database B-tree indexes. The Azure Maps SDKs support the overlaying of tile layers that use `quadkey` naming convention in addition to other naming conventions as documented in the [Add a tile layer] document.
125125

126126
> [!NOTE]
127-
> The `quadkeys` naming convention only works for zoom levels of one or greater. The Azure Maps SDK's support zoom level 0 which is a single map tile for the whole world.
127+
> The `quadkeys` naming convention only works for zoom levels of one or greater. The Azure Maps SDK's support zoom level 0 which is a single map tile for the whole world.
128128
129129
To convert tile coordinates into a `quadkey`, the bits of the Y and X coordinates are interleaved, and the result is interpreted as a base-4 number (with leading zeros maintained) and converted into a string. For instance, given tile XY coordinates of (3, 5) at level 3, the `quadkey` is determined as follows:
130130

@@ -136,7 +136,7 @@ tileY = 5 = 101 (base 2)
136136
quadkey = 100111 (base 2) = 213 (base 4) = "213"
137137
```
138138

139-
`Qquadkeys` have several interesting properties. First, the length of a `quadkey` (the number of digits) equals the zoom level of the corresponding tile. Second, the `quadkey` of any tile starts with the `quadkey` of its parent tile (the containing tile at the previous level). As shown in the example below, tile 2 is the parent of tiles 20 through 23:
139+
`Qquadkeys` have several interesting properties. First, the length of a `quadkey` (the number of digits) equals the zoom level of the corresponding tile. Second, the `quadkey` of any tile starts with the `quadkey` of its parent tile (the containing tile at the previous level). As shown in the following example, tile 2 is the parent of tiles 20 through 23:
140140

141141
:::image type="content" border="false" source="./media/zoom-levels-and-tile-grid/quadkey-tile-pyramid.png" alt-text="Quadkey tile pyramid":::
142142

@@ -927,23 +927,32 @@ module AzureMaps {
927927
* * *
928928

929929
> [!NOTE]
930-
> The interactive map controls in the Azure Maps SDK's have helper functions for converting between geospatial positions and viewport pixels.
931-
> - [Web SDK: Map pixel and position calculations](/javascript/api/azure-maps-control/atlas.map#pixelstopositions-pixel---)
930+
> The interactive map controls in the Azure Maps SDK's have helper functions for converting between geospatial positions and viewport pixels.
931+
>
932+
> - [Web SDK: Map pixel and position calculations]
932933
933934
## Next steps
934935

935936
Directly access map tiles from the Azure Maps REST services:
936937

937938
> [!div class="nextstepaction"]
938-
> [Get map tiles](/rest/api/maps/render/getmaptile)
939+
> [Get map tiles]
939940
940941
> [!div class="nextstepaction"]
941-
> [Get traffic flow tiles](/rest/api/maps/traffic/gettrafficflowtile)
942+
> [Get traffic flow tiles]
942943
943944
> [!div class="nextstepaction"]
944-
> [Get traffic incident tiles](/rest/api/maps/traffic/gettrafficincidenttile)
945+
> [Get traffic incident tiles]
945946
946947
Learn more about geospatial concepts:
947948

948949
> [!div class="nextstepaction"]
949-
> [Azure Maps glossary](glossary.md)
950+
> [Azure Maps glossary]
951+
952+
[EPSG:3857]: https://epsg.io/3857
953+
[Web SDK: Map pixel and position calculations]: /javascript/api/azure-maps-control/atlas.map#pixelstopositions-pixel---
954+
[Add a tile layer]: map-add-tile-layer.md
955+
[Get map tiles]: /rest/api/maps/render/getmaptile
956+
[Get traffic flow tiles]: /rest/api/maps/traffic/gettrafficflowtile
957+
[Get traffic incident tiles]: /rest/api/maps/traffic/gettrafficincidenttile
958+
[Azure Maps glossary]: glossary.md

articles/azure-monitor/app/opentelemetry-add-modify.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ The following table represents the currently supported custom telemetry types:
292292
|-------------------------------------------|---------------|----------------|--------------|------------|------------|----------|--------|
293293
| **ASP.NET Core** | | | | | | | |
294294
| &nbsp;&nbsp;&nbsp;OpenTelemetry API | | Yes | Yes | Yes | | Yes | |
295-
| &nbsp;&nbsp;&nbsp;iLogger API | | | | | | | Yes |
295+
| &nbsp;&nbsp;&nbsp;ILogger API | | | | | | | Yes |
296296
| &nbsp;&nbsp;&nbsp;AI Classic API | | | | | | | |
297297
| | | | | | | | |
298298
| **Java** | | | | | | | |

0 commit comments

Comments
 (0)