ClemensFischer/XAML-Map-Control
1
0
Fork 0
mirror of https://github.com/ClemensFischer/XAML-Map-Control.git synced 2026-04-01 11:05:36 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update TileImageLoader.cs

Browse source
This commit is contained in:
Clemens 2021-11-28 23:50:22 +01:00
parent bf12727bac
commit eade7c4dad
1 changed files with 31 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
MapControl/Shared/TileImageLoader.cs
View file

@ -53,29 +53,27 @@ namespace MapControl
TileSource = tileSource; TileSource = tileSource;
if (tileSource == null) if (tileSource != null)
{ {
return Task.CompletedTask; pendingTiles = new ConcurrentStack<Tile>(tiles.Where(tile => tile.Pending).Reverse());
var numTasks = Math.Min(pendingTiles.Count, MaxLoadTasks);
if (numTasks > 0)
{
if (Cache == null || tileSource.UriFormat == null || !tileSource.UriFormat.StartsWith("http"))
{
cacheName = null; // no tile caching
}
var tasks = Enumerable.Range(0, numTasks)
.Select(_ => Task.Run(() => LoadPendingTiles(pendingTiles, tileSource, cacheName)));
return Task.WhenAll(tasks);
}
} }
pendingTiles = new ConcurrentStack<Tile>(tiles.Where(tile => tile.Pending).Reverse()); return Task.CompletedTask;
var numTasks = Math.Min(pendingTiles.Count, MaxLoadTasks);
if (numTasks < 1)
{
return Task.CompletedTask;
}
if (Cache == null || tileSource.UriFormat == null || !tileSource.UriFormat.StartsWith("http"))
{
cacheName = null; // no tile caching
}
var tasks = Enumerable.Range(0, numTasks)
.Select(_ => Task.Run(() => LoadPendingTiles(pendingTiles, tileSource, cacheName)));
return Task.WhenAll(tasks);
} }
private static async Task LoadPendingTiles(ConcurrentStack<Tile> pendingTiles, TileSource tileSource, string cacheName) private static async Task LoadPendingTiles(ConcurrentStack<Tile> pendingTiles, TileSource tileSource, string cacheName)
@ -104,22 +102,22 @@ namespace MapControl
var uri = tileSource.GetUri(tile.XIndex, tile.Y, tile.ZoomLevel); var uri = tileSource.GetUri(tile.XIndex, tile.Y, tile.ZoomLevel);
if (uri == null) if (uri != null)
{ {
return Task.CompletedTask; var extension = Path.GetExtension(uri.LocalPath);
if (string.IsNullOrEmpty(extension) || extension == ".jpeg")
{
extension = ".jpg";
}
var cacheKey = string.Format(CultureInfo.InvariantCulture,
"{0}/{1}/{2}/{3}{4}", cacheName, tile.ZoomLevel, tile.XIndex, tile.Y, extension);
return LoadCachedTile(tile, uri, cacheKey);
} }
var extension = Path.GetExtension(uri.LocalPath); return Task.CompletedTask;
if (string.IsNullOrEmpty(extension) || extension == ".jpeg")
{
extension = ".jpg";
}
var cacheKey = string.Format(CultureInfo.InvariantCulture,
"{0}/{1}/{2}/{3}{4}", cacheName, tile.ZoomLevel, tile.XIndex, tile.Y, extension);
return LoadCachedTile(tile, uri, cacheKey);
} }
private static DateTime GetExpiration(TimeSpan? maxAge) private static DateTime GetExpiration(TimeSpan? maxAge)