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:
ClemensF 2021-01-23 17:41:52 +01:00
parent e50fb1c039
commit 06e8a0585e
1 changed files with 38 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

74
MapControl/Shared/TileImageLoader.cs
View file

@ -13,6 +13,16 @@ 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>
@ -35,21 +45,7 @@ namespace MapControl
/// </summary> /// </summary>
public static TimeSpan MaxCacheExpiration { get; set; } = TimeSpan.FromDays(10); public static TimeSpan MaxCacheExpiration { get; set; } = TimeSpan.FromDays(10);
private readonly ConcurrentQueue<Tile> tileQueue = new ConcurrentQueue<Tile>();
private class TileQueue : ConcurrentStack<Tile>
{
public void Enqueue(IEnumerable<Tile> tiles)
{
PushRange(tiles.Reverse().ToArray());
}
public bool TryDequeue(out Tile tile)
{
return TryPop(out tile);
}
}
private readonly TileQueue tileQueue = new TileQueue();
private TileSource tileSource; private TileSource tileSource;
private string cacheName; private string cacheName;
private int taskCount; private int taskCount;
@ -70,12 +66,18 @@ namespace MapControl
if (tiles.Any() && tileSource != null) if (tiles.Any() && tileSource != null)
{ {
if (Cache != null && tileSource.UriFormat != null && tileSource.UriFormat.StartsWith("http")) if (!string.IsNullOrEmpty(cache) &&
Cache != null &&
tileSource.UriFormat != null &&
tileSource.UriFormat.StartsWith("http"))
{ {
cacheName = cache; cacheName = cache;
} }
tileQueue.Enqueue(tiles); foreach (var tile in tiles)
{
tileQueue.Enqueue(tile);
}
while (taskCount < Math.Min(tileQueue.Count, MaxLoadTasks)) while (taskCount < Math.Min(tileQueue.Count, MaxLoadTasks))
{ {
@ -98,14 +100,7 @@ namespace MapControl
try try
{ {
if (string.IsNullOrEmpty(cache)) await LoadTileAsync(tile, source, cache).ConfigureAwait(false);
{
await LoadTileAsync(tile, source).ConfigureAwait(false);
}
else
{
await LoadCachedTileAsync(tile, source, cache).ConfigureAwait(false);
}
} }
catch (Exception ex) catch (Exception ex)
{ {
@ -116,22 +111,29 @@ namespace MapControl
Interlocked.Decrement(ref taskCount); Interlocked.Decrement(ref taskCount);
} }
private static async Task LoadCachedTileAsync(Tile tile, TileSource tileSource, string cacheName) private static async Task LoadTileAsync(Tile tile, TileSource tileSource, string cacheName)
{ {
var uri = tileSource.GetUri(tile.XIndex, tile.Y, tile.ZoomLevel); if (cacheName == null)
if (uri != null)
{ {
var extension = Path.GetExtension(uri.LocalPath); await LoadTileAsync(tile, tileSource).ConfigureAwait(false);
}
else
{
var uri = tileSource.GetUri(tile.XIndex, tile.Y, tile.ZoomLevel);
if (string.IsNullOrEmpty(extension) || extension == ".jpeg") if (uri != null)
{ {
extension = ".jpg"; var extension = Path.GetExtension(uri.LocalPath);
if (string.IsNullOrEmpty(extension) || extension == ".jpeg")
{
extension = ".jpg";
}
var cacheKey = string.Format("{0}/{1}/{2}/{3}{4}", cacheName, tile.ZoomLevel, tile.XIndex, tile.Y, extension);
await LoadCachedTileAsync(tile, uri, cacheKey).ConfigureAwait(false);
} }
var cacheKey = string.Format("{0}/{1}/{2}/{3}{4}", cacheName, tile.ZoomLevel, tile.XIndex, tile.Y, extension);
await LoadCachedTileAsync(tile, uri, cacheKey).ConfigureAwait(false);
} }
} }