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-08-25 20:41:33 +02:00
parent 67f319e98c
commit a70dfef794
1 changed files with 39 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
MapControl/Shared/TileImageLoader.cs
View file

@ -3,11 +3,9 @@ using Microsoft.Extensions.Caching.Memory;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options; using Microsoft.Extensions.Options;
using System; using System;
using System.Collections.Concurrent;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
#if WPF #if WPF
using System.Windows.Media; using System.Windows.Media;
@ -72,7 +70,7 @@ namespace MapControl
/// </summary> /// </summary>
public static int MaxLoadTasks { get; set; } = 4; public static int MaxLoadTasks { get; set; } = 4;
private readonly ConcurrentStack<Tile> tileStack = new ConcurrentStack<Tile>(); private readonly Queue<Tile> tileQueue = new Queue<Tile>();
private int tileCount; private int tileCount;
private int taskCount; private int taskCount;
@ -87,43 +85,59 @@ namespace MapControl
cacheName = null; // disable caching cacheName = null; // disable caching
} }
var currentTiles = tiles.Where(tile => tile.IsPending).Reverse().ToArray(); lock (tileQueue)
{
tileQueue.Clear();
tileStack.Clear(); foreach (var tile in tiles.Where(tile => tile.IsPending))
tileStack.PushRange(currentTiles); {
tileCount = currentTiles.Length; tileQueue.Enqueue(tile);
}
tileCount = tileQueue.Count;
var maxTasks = Math.Min(tileCount, MaxLoadTasks); var maxTasks = Math.Min(tileCount, MaxLoadTasks);
while (taskCount < maxTasks) while (taskCount < maxTasks)
{ {
Interlocked.Increment(ref taskCount); taskCount++;
Logger?.LogDebug("Task count: {count}", taskCount); Logger?.LogDebug("Task count: {count}", taskCount);
_ = Task.Run(LoadTiles); _ = Task.Run(async () => await LoadTilesFromStack(tileSource, cacheName, progress).ConfigureAwait(false));
} }
async Task LoadTiles()
{
await LoadTilesFromStack(tileSource, cacheName, progress).ConfigureAwait(false);
Interlocked.Decrement(ref taskCount);
Logger?.LogDebug("Task count: {count}", taskCount);
} }
} }
public void CancelLoadTiles() public void CancelLoadTiles()
{ {
tileStack.Clear(); lock (tileQueue)
{
tileQueue.Clear();
tileCount = 0;
}
} }
private async Task LoadTilesFromStack(TileSource tileSource, string cacheName, IProgress<double> progress) private async Task LoadTilesFromStack(TileSource tileSource, string cacheName, IProgress<double> progress)
{ {
while (tileStack.TryPop(out var tile)) while (true)
{ {
tile.IsPending = false; Tile tile;
int tileNumber;
var tileNumber = tileCount - tileStack.Count; lock (tileQueue)
{
if (tileQueue.Count == 0)
{
taskCount--;
Logger?.LogDebug("Task count: {count}", taskCount);
break;
}
tile = tileQueue.Dequeue();
tileNumber = tileCount - tileQueue.Count;
}
tile.IsPending = false;
progress?.Report((double)tileNumber / tileCount); progress?.Report((double)tileNumber / tileCount);