ClemensFischer/XAML-Map-Control
1
0
Fork 0
mirror of https://github.com/ClemensFischer/XAML-Map-Control.git synced 2025-12-06 07:12:04 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update TileImageLoader.cs

Browse source
This commit is contained in:
ClemensFischer 2025-01-20 19:28:59 +01:00
parent 507bc93d99
commit 115525cbfc
1 changed files with 22 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
MapControl/Shared/TileImageLoader.cs
View file

@ -91,7 +91,14 @@ namespace MapControl
progress?.Report((double)(tileCount - tileStack.Count) / tileCount); progress?.Report((double)(tileCount - tileStack.Count) / tileCount);
await LoadTileAsync(tile, tileSource, cacheName).ConfigureAwait(false); try
{
await LoadTileAsync(tile, tileSource, cacheName).ConfigureAwait(false);
}
catch (Exception ex)
{
Debug.WriteLine($"{nameof(TileImageLoader)}: {tile.ZoomLevel}/{tile.Column}/{tile.Row}: {ex.Message}");
}
} }
} }
@ -107,33 +114,27 @@ namespace MapControl
private static async Task LoadTileAsync(Tile tile, TileSource tileSource, string cacheName) private static async Task LoadTileAsync(Tile tile, TileSource tileSource, string cacheName)
{ {
// Both tileSource.LoadImageAsync calls below are executed in the UI thread in WinUI and UWP. // Pass tileSource.LoadImageAsync calls to platform-specific method
// LoadTileAsync(Tile, Func<Task<ImageSource>>) for execution on the UI thread in WinUI/UWP.
try if (string.IsNullOrEmpty(cacheName))
{ {
if (string.IsNullOrEmpty(cacheName)) await LoadTileAsync(tile, () => tileSource.LoadImageAsync(tile.Column, tile.Row, tile.ZoomLevel)).ConfigureAwait(false);
{ }
await LoadTileAsync(tile, () => tileSource.LoadImageAsync(tile.Column, tile.Row, tile.ZoomLevel)).ConfigureAwait(false); else
} {
else var uri = tileSource.GetUri(tile.Column, tile.Row, tile.ZoomLevel);
{
var uri = tileSource.GetUri(tile.Column, tile.Row, tile.ZoomLevel);
if (uri != null) if (uri != null)
{
var buffer = await LoadCachedBufferAsync(tile, uri, cacheName).ConfigureAwait(false);
if (buffer != null && buffer.Length > 0)
{ {
var buffer = await LoadCachedBufferAsync(tile, uri, cacheName).ConfigureAwait(false); await LoadTileAsync(tile, () => tileSource.LoadImageAsync(buffer)).ConfigureAwait(false);
if (buffer != null && buffer.Length > 0)
{
await LoadTileAsync(tile, () => tileSource.LoadImageAsync(buffer)).ConfigureAwait(false);
}
} }
} }
} }
catch (Exception ex)
{
Debug.WriteLine($"{nameof(TileImageLoader)}: {tile.ZoomLevel}/{tile.Column}/{tile.Row}: {ex.Message}");
}
} }
private static async Task<byte[]> LoadCachedBufferAsync(Tile tile, Uri uri, string cacheName) private static async Task<byte[]> LoadCachedBufferAsync(Tile tile, Uri uri, string cacheName)