mirror of
https://github.com/ClemensFischer/XAML-Map-Control.git
synced 2025-12-06 07:12:04 +01:00
Update TileImageLoader.cs
This commit is contained in:
parent
34fda668c9
commit
c3386d1fbb
|
|
@ -102,10 +102,10 @@ namespace MapControl
|
||||||
|
|
||||||
progress?.Report((double)(tileCount - pendingTiles.Count) / tileCount);
|
progress?.Report((double)(tileCount - pendingTiles.Count) / tileCount);
|
||||||
|
|
||||||
|
var requestCancellationToken = RequestCancellationEnabled ? cancellationToken : CancellationToken.None;
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
var requestCancellationToken = RequestCancellationEnabled ? cancellationToken : CancellationToken.None;
|
|
||||||
|
|
||||||
await LoadTileImage(tile, tileSource, cacheName, requestCancellationToken).ConfigureAwait(false);
|
await LoadTileImage(tile, tileSource, cacheName, requestCancellationToken).ConfigureAwait(false);
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
|
|
@ -126,12 +126,7 @@ namespace MapControl
|
||||||
tasks[i] = Task.Run(LoadTilesFromQueueAsync, cancellationToken);
|
tasks[i] = Task.Run(LoadTilesFromQueueAsync, cancellationToken);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!cancellationToken.IsCancellationRequested)
|
await Task.WhenAll(tasks);
|
||||||
{
|
|
||||||
progress?.Report(0d);
|
|
||||||
|
|
||||||
await Task.WhenAll(tasks);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
catch (OperationCanceledException)
|
catch (OperationCanceledException)
|
||||||
{
|
{
|
||||||
|
|
@ -140,7 +135,7 @@ namespace MapControl
|
||||||
|
|
||||||
if (cancellationToken.IsCancellationRequested)
|
if (cancellationToken.IsCancellationRequested)
|
||||||
{
|
{
|
||||||
Logger?.LogTrace("Cancelled LoadTilesAsync with {count} queued tiles", pendingTiles.Count);
|
Logger?.LogTrace("Cancelled LoadTilesAsync with {count} pending tiles", pendingTiles.Count);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue