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

Use ConcurrentStack in TileImageLoader

Browse source
This commit is contained in:
Clemens 2021-07-06 18:44:41 +02:00
parent 4710b6d189
commit 7aaa4ed25e
1 changed files with 10 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
MapControl/Shared/TileImageLoader.cs
View file

@ -13,16 +13,6 @@ using System.Threading.Tasks;
namespace MapControl namespace MapControl
{ {
#if NETFRAMEWORK
static class ConcurrentQueueEx
{
public static void Clear<T>(this ConcurrentQueue<T> tileQueue)
{
while (tileQueue.TryDequeue(out _)) ;
}
}
#endif
/// <summary> /// <summary>
/// Loads and optionally caches map tile images for a MapTileLayer. /// Loads and optionally caches map tile images for a MapTileLayer.
/// </summary> /// </summary>
@ -50,7 +40,7 @@ namespace MapControl
/// </summary> /// </summary>
public TileSource TileSource { get; private set; } public TileSource TileSource { get; private set; }
private ConcurrentQueue<Tile> tileQueue; private ConcurrentStack<Tile> pendingTiles;
/// <summary> /// <summary>
/// Loads all pending tiles from the tiles collection. /// Loads all pending tiles from the tiles collection.
@ -59,13 +49,13 @@ namespace MapControl
/// </summary> /// </summary>
public Task LoadTiles(IEnumerable<Tile> tiles, TileSource tileSource, string cacheName) public Task LoadTiles(IEnumerable<Tile> tiles, TileSource tileSource, string cacheName)
{ {
tileQueue?.Clear(); // stop download from current queue pendingTiles?.Clear(); // stop download from current stack
tileQueue = new ConcurrentQueue<Tile>(tiles.Where(tile => tile.Pending)); pendingTiles = new ConcurrentStack<Tile>(tiles.Where(tile => tile.Pending).Reverse());
TileSource = tileSource; TileSource = tileSource;
if (tileSource == null || tileQueue.IsEmpty) if (tileSource == null || pendingTiles.IsEmpty)
{ {
return Task.CompletedTask; return Task.CompletedTask;
} }
@ -79,15 +69,15 @@ namespace MapControl
} }
var tasks = Enumerable var tasks = Enumerable
.Range(0, Math.Min(tileQueue.Count, MaxLoadTasks)) .Range(0, Math.Min(pendingTiles.Count, MaxLoadTasks))
.Select(_ => Task.Run(() => LoadTilesFromQueueAsync(tileQueue, tileSource, cacheName))); .Select(_ => Task.Run(() => LoadPendingTilesAsync(pendingTiles, tileSource, cacheName)));
return Task.WhenAll(tasks); return Task.WhenAll(tasks);
} }
private static async Task LoadTilesFromQueueAsync(ConcurrentQueue<Tile> tileQueue, TileSource tileSource, string cacheName) private static async Task LoadPendingTilesAsync(ConcurrentStack<Tile> pendingTiles, TileSource tileSource, string cacheName)
{ {
while (tileQueue.TryDequeue(out var tile)) while (pendingTiles.TryPop(out var tile))
{ {
tile.Pending = false; tile.Pending = false;
@ -97,7 +87,7 @@ namespace MapControl
} }
catch (Exception ex) catch (Exception ex)
{ {
Debug.WriteLine("TileImageLoader: {0}/{1}/{2}: {3}", tile.ZoomLevel, tile.XIndex, tile.Y, ex.Message); Debug.WriteLine($"TileImageLoader: {tile.ZoomLevel}/{tile.XIndex}/{tile.Y}: {ex.Message}");
} }
} }
} }