ClemensFischer/XAML-Map-Control
1
0
Fork 0
mirror of https://github.com/ClemensFischer/XAML-Map-Control.git synced 2026-03-27 23:55:37 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update TileImageLoader.cs

Browse source
This commit is contained in:
ClemensFischer 2024-08-31 09:11:15 +02:00
parent 961c8387c6
commit cbe2751db7
1 changed files with 7 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
MapControl/Shared/TileImageLoader.cs
View file

@ -25,25 +25,6 @@ namespace MapControl
public partial class TileImageLoader : ITileImageLoader public partial class TileImageLoader : ITileImageLoader
{ {
private class TileQueue : ConcurrentStack<Tile>
{
public TileQueue(IEnumerable<Tile> tiles)
: base(tiles.Where(tile => tile.IsPending).Reverse())
{
}
public bool TryDequeue(out Tile tile)
{
if (!TryPop(out tile))
{
return false;
}
tile.IsPending = false;
return true;
}
}
/// <summary> /// <summary>
/// Default folder path where a persistent cache implementation may save data, i.e. "C:\ProgramData\MapControl\TileCache". /// Default folder path where a persistent cache implementation may save data, i.e. "C:\ProgramData\MapControl\TileCache".
/// </summary> /// </summary>
@ -74,7 +55,7 @@ namespace MapControl
public static int MaxLoadTasks { get; set; } = 4; public static int MaxLoadTasks { get; set; } = 4;
private TileQueue pendingTiles; private ConcurrentStack<Tile> pendingTiles;
/// <summary> /// <summary>
/// Loads all pending tiles from the tiles collection. /// Loads all pending tiles from the tiles collection.
@ -87,7 +68,7 @@ namespace MapControl
if (tiles != null && tileSource != null) if (tiles != null && tileSource != null)
{ {
pendingTiles = new TileQueue(tiles); pendingTiles = new ConcurrentStack<Tile>(tiles.Where(tile => tile.IsPending).Reverse());
var tileCount = pendingTiles.Count; var tileCount = pendingTiles.Count;
var taskCount = Math.Min(tileCount, MaxLoadTasks); var taskCount = Math.Min(tileCount, MaxLoadTasks);
@ -101,14 +82,16 @@ namespace MapControl
progress?.Report(0d); progress?.Report(0d);
var tileQueue = pendingTiles; // pendingTiles may change while tasks are running
var tasks = new Task[taskCount]; var tasks = new Task[taskCount];
var tileStack = pendingTiles; // pendingTiles member may change while tasks are running
async Task LoadTilesFromQueueAsync() async Task LoadTilesFromQueueAsync()
{ {
while (tileQueue.TryDequeue(out var tile)) while (tileStack.TryPop(out var tile)) // use captured tileStack variable in local function
{ {
progress?.Report((double)(tileCount - tileQueue.Count) / tileCount); tile.IsPending = false;
progress?.Report((double)(tileCount - tileStack.Count) / tileCount);
await LoadTileAsync(tile, tileSource, cacheName).ConfigureAwait(false); await LoadTileAsync(tile, tileSource, cacheName).ConfigureAwait(false);
} }