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

Version 4.12.2 Minor changes in TileImageLoader.

Browse source
This commit is contained in:
ClemensF 2019-06-08 23:18:33 +02:00
parent 0c0a0ae511
commit 8491a4fc7c
16 changed files with 70 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

87
MapControl/Shared/TileImageLoader.cs
View file

@ -63,71 +63,66 @@ namespace MapControl
if (tileSource != null && tiles.Any())
{
if (Cache == null || tileSource.UriFormat == null || !tileSource.UriFormat.StartsWith("http"))
{
sourceName = null; // do not use cache
}
pendingTiles.PushRange(tiles.Reverse().ToArray());
Func<Tile, Task> loadFunc;
if (Cache != null && !string.IsNullOrEmpty(sourceName) &&
tileSource.UriFormat != null && tileSource.UriFormat.StartsWith("http"))
{
loadFunc = tile => LoadCachedTileImageAsync(tile, tileSource, sourceName);
}
else
{
loadFunc = tile => LoadTileImageAsync(tile, tileSource);
}
var newTasks = Math.Min(pendingTiles.Count, MaxLoadTasks) - taskCount;
while (--newTasks >= 0)
{
Interlocked.Increment(ref taskCount);
var task = Task.Run(() => LoadTilesAsync(loadFunc)); // do not await
}
Task.Run(async () => // do not await
{
Tile tile;
//Debug.WriteLine("{0}: {1} tasks", Environment.CurrentManagedThreadId, taskCount);
while (pendingTiles.TryPop(out tile))
{
tile.Pending = false;
try
{
await LoadTileImageAsync(tile, tileSource, sourceName);
}
catch (Exception ex)
{
Debug.WriteLine("TileImageLoader: {0}/{1}/{2}: {3}", tile.ZoomLevel, tile.XIndex, tile.Y, ex.Message);
}
}
Interlocked.Decrement(ref taskCount);
});
}
}
}
private async Task LoadTilesAsync(Func<Tile, Task> loadTileImageFunc)
private async Task LoadTileImageAsync(Tile tile, TileSource tileSource, string sourceName)
{
Tile tile;
while (pendingTiles.TryPop(out tile))
if (string.IsNullOrEmpty(sourceName))
{
tile.Pending = false;
try
{
await loadTileImageFunc(tile);
}
catch (Exception ex)
{
Debug.WriteLine("TileImageLoader: {0}/{1}/{2}: {3}", tile.ZoomLevel, tile.XIndex, tile.Y, ex.Message);
}
await LoadTileImageAsync(tile, tileSource);
}
Interlocked.Decrement(ref taskCount);
//Debug.WriteLine("{0}: {1} tasks", Environment.CurrentManagedThreadId, taskCount);
}
private async Task LoadCachedTileImageAsync(Tile tile, TileSource tileSource, string sourceName)
{
var uri = tileSource.GetUri(tile.XIndex, tile.Y, tile.ZoomLevel);
if (uri != null)
else
{
var extension = Path.GetExtension(uri.LocalPath);
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(CacheKeyFormat, sourceName, tile.ZoomLevel, tile.XIndex, tile.Y, extension);
await LoadTileImageAsync(tile, uri, cacheKey);
}
var cacheKey = string.Format(CacheKeyFormat, sourceName, tile.ZoomLevel, tile.XIndex, tile.Y, extension);
await LoadCachedTileImageAsync(tile, uri, cacheKey);
}
}

8
MapControl/Shared/TileSource.cs
View file

@ -110,15 +110,9 @@ namespace MapControl
/// </summary>
public virtual async Task<ImageSource> LoadImageAsync(int x, int y, int zoomLevel)
{
ImageSource imageSource = null;
var uri = GetUri(x, y, zoomLevel);
if (uri != null)
{
imageSource = await ImageLoader.LoadImageAsync(uri);
}
return imageSource;
return uri != null ? await ImageLoader.LoadImageAsync(uri) : null;
}
private string GetDefaultUri(int x, int y, int zoomLevel)