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 2023-08-15 07:27:50 +02:00
parent 5ecfac508e
commit 81ccc7bf96
1 changed files with 16 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
MapControl/Shared/TileImageLoader.cs
View file

@ -9,7 +9,6 @@ using System.Diagnostics;
using System.Globalization; using System.Globalization;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace MapControl namespace MapControl
@ -26,31 +25,23 @@ namespace MapControl
{ {
} }
public bool IsCanceled { get; private set; }
public bool TryDequeue(out Tile tile) public bool TryDequeue(out Tile tile)
{ {
if (IsCanceled || !TryPop(out tile)) if (TryPop(out tile))
{ {
tile = null;
return false;
}
tile.IsPending = false; tile.IsPending = false;
return true; return true;
} }
public void Cancel() tile = null;
{ return false;
IsCanceled = true;
Clear();
} }
} }
/// <summary> /// <summary>
/// Maximum number of parallel tile loading tasks. The default value is 4. /// Maximum number of parallel tile loading tasks. The default value is 4.
/// </summary> /// </summary>
public static int MaxLoadTasks { get; set; } = 4; public static int MaxLoadTasks { get; set; } = 1;
/// <summary> /// <summary>
/// Default expiration time for cached tile images. Used when no expiration time /// Default expiration time for cached tile images. Used when no expiration time
@ -73,33 +64,29 @@ namespace MapControl
/// </summary> /// </summary>
public Task LoadTiles(IEnumerable<Tile> tiles, TileSource tileSource, string cacheName, IProgress<double> progress) public Task LoadTiles(IEnumerable<Tile> tiles, TileSource tileSource, string cacheName, IProgress<double> progress)
{ {
pendingTiles?.Cancel(); pendingTiles?.Clear();
if (tiles != null && tileSource != null) if (tiles != null && tileSource != null)
{ {
pendingTiles = new TileQueue(tiles); pendingTiles = new TileQueue(tiles);
var numTasks = Math.Min(pendingTiles.Count, MaxLoadTasks); var tileCount = pendingTiles.Count;
var taskCount = Math.Min(tileCount, MaxLoadTasks);
if (numTasks > 0) if (taskCount > 0)
{ {
if (Cache == null || tileSource.UriTemplate == null || !tileSource.UriTemplate.StartsWith("http")) if (Cache == null || tileSource.UriTemplate == null || !tileSource.UriTemplate.StartsWith("http"))
{ {
cacheName = null; // no tile caching cacheName = null; // no tile caching
} }
var progressLoaded = 0; progress?.Report(0d);
var progressTotal = 0;
if (progress != null) var tileQueue = pendingTiles; // pendingTiles may change while LoadTilesFromQueue() is running
{
progressTotal = pendingTiles.Count;
progress.Report(0d);
}
async Task LoadTiles() async Task LoadTilesFromQueue()
{ {
while (pendingTiles.TryDequeue(out var tile)) while (tileQueue.TryDequeue(out var tile))
{ {
try try
{ {
@ -110,16 +97,11 @@ namespace MapControl
Debug.WriteLine($"TileImageLoader: {tile.ZoomLevel}/{tile.Column}/{tile.Row}: {ex.Message}"); Debug.WriteLine($"TileImageLoader: {tile.ZoomLevel}/{tile.Column}/{tile.Row}: {ex.Message}");
} }
if (progress != null && !pendingTiles.IsCanceled) progress?.Report((double)(tileCount - tileQueue.Count) / tileCount);
{
Interlocked.Increment(ref progressLoaded);
progress.Report((double)progressLoaded / progressTotal);
}
} }
} }
return Task.WhenAll(Enumerable.Range(0, numTasks).Select(_ => Task.Run(LoadTiles))); return Task.WhenAll(Enumerable.Range(0, taskCount).Select(_ => Task.Run(LoadTilesFromQueue)));
} }
} }