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 Updated FileDbCache and MapImages

Browse source
This commit is contained in:
ClemensF 2019-07-16 20:13:52 +02:00
parent 85c54f075c
commit a860c8d341
13 changed files with 148 additions and 4865 deletions
Download patch file Download diff file Expand all files Collapse all files

68
MapControl/Shared/TileImageLoader.cs
View file

@ -24,21 +24,21 @@ namespace MapControl
public static int MaxLoadTasks { get; set; } = 4;
/// <summary>
/// Minimum expiration time for cached tile images. The default value is one hour.
/// Default expiration time for cached tile images. Used when no expiration time
/// was transmitted on download. The default value is one day.
/// </summary>
public static TimeSpan MinCacheExpiration { get; set; } = TimeSpan.FromHours(1);
public static TimeSpan DefaultCacheExpiration { get; set; } = TimeSpan.FromDays(1);
/// <summary>
/// Minimum expiration time for cached tile images. The default value is one day.
/// </summary>
public static TimeSpan MinCacheExpiration { get; set; } = TimeSpan.FromDays(1);
/// <summary>
/// Maximum expiration time for cached tile images. The default value is one week.
/// </summary>
public static TimeSpan MaxCacheExpiration { get; set; } = TimeSpan.FromDays(7);
/// <summary>
/// Default expiration time for cached tile images. Used when no expiration time
/// was transmitted on download. The default value is one day.
/// </summary>
public static TimeSpan DefaultCacheExpiration { get; set; } = TimeSpan.FromDays(1);
/// <summary>
/// Format string for creating cache keys from the sourceName argument passed to LoadTilesAsync,
/// the ZoomLevel, XIndex, and Y properties of a Tile, and the image file extension.
@ -68,29 +68,38 @@ namespace MapControl
/// Loads all pending tiles from the tiles collection.
/// If tileSource.UriFormat starts with "http" and sourceName is a non-empty string,
/// tile images will be cached in the TileImageLoader's Cache (if it's not null).
/// The method is async void because it implements void ITileImageLoader.LoadTilesAsync
/// and is not awaited when it is called in MapTileLayer.UpdateTiles().
/// </summary>
public void LoadTilesAsync(IEnumerable<Tile> tiles, TileSource tileSource, string sourceName)
public async void LoadTilesAsync(IEnumerable<Tile> tiles, TileSource tileSource, string sourceName)
{
tileQueue.Clear();
if (tileSource != null)
tiles = tiles.Where(tile => tile.Pending);
if (tiles.Any() && tileSource != null)
{
SetLoadTileImageFunction(tileSource, sourceName);
tiles = tiles.Where(tile => tile.Pending);
if (tiles.Any())
if (Cache != null &&
tileSource.UriFormat != null &&
tileSource.UriFormat.StartsWith("http") &&
!string.IsNullOrEmpty(sourceName))
{
tileQueue.Enqueue(tiles);
loadTileImage = tile => LoadCachedTileImageAsync(tile, tileSource, sourceName);
}
else
{
loadTileImage = tile => LoadTileImageAsync(tile, tileSource);
}
var newTasks = Math.Min(tileQueue.Count, MaxLoadTasks) - taskCount;
tileQueue.Enqueue(tiles);
if (newTasks > 0)
{
Interlocked.Add(ref taskCount, newTasks);
var newTasks = Math.Min(tileQueue.Count, MaxLoadTasks) - taskCount;
Task.WhenAll(Enumerable.Range(0, newTasks).Select(n => LoadTilesFromQueueAsync())); // not awaited
}
if (newTasks > 0)
{
Interlocked.Add(ref taskCount, newTasks);
await Task.WhenAll(Enumerable.Range(0, newTasks).Select(n => LoadTilesFromQueueAsync())).ConfigureAwait(false);
}
}
}
@ -116,21 +125,6 @@ namespace MapControl
Interlocked.Decrement(ref taskCount);
}
private void SetLoadTileImageFunction(TileSource tileSource, string sourceName)
{
if (Cache != null &&
tileSource.UriFormat != null &&
tileSource.UriFormat.StartsWith("http") &&
!string.IsNullOrEmpty(sourceName))
{
loadTileImage = tile => LoadCachedTileImageAsync(tile, tileSource, sourceName);
}
else
{
loadTileImage = tile => LoadTileImageAsync(tile, tileSource);
}
}
private static async Task LoadCachedTileImageAsync(Tile tile, TileSource tileSource, string sourceName)
{
var uri = tileSource.GetUri(tile.XIndex, tile.Y, tile.ZoomLevel);