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

Replaced ImageCacheItem by Tuple

Browse source
This commit is contained in:
Clemens 2021-07-02 15:57:01 +02:00
parent 2709f90cdc
commit 77c2169999
14 changed files with 60 additions and 122 deletions
Download patch file Download diff file Expand all files Collapse all files

20
MapControl/WPF/TileImageLoader.WPF.cs
View file

@ -6,7 +6,6 @@ using System;
using System.IO;
using System.Runtime.Caching;
using System.Threading.Tasks;
using MapControl.Caching;
namespace MapControl
{
@ -21,7 +20,7 @@ namespace MapControl
}
/// <summary>
/// An ObjectCache instance used to cache tile image data (i.e. ImageCacheItem objects).
/// An ObjectCache instance used to cache tile image data, i.e. (byte[],DateTime) tuples.
/// The default ObjectCache value is MemoryCache.Default.
/// </summary>
public static ObjectCache Cache { get; set; } = MemoryCache.Default;
@ -29,26 +28,23 @@ namespace MapControl
private static async Task LoadCachedTileAsync(Tile tile, Uri uri, string cacheKey)
{
var cacheItem = Cache.Get(cacheKey) as ImageCacheItem;
var buffer = cacheItem?.Buffer;
var cacheItem = Cache.Get(cacheKey) as Tuple<byte[], DateTime>;
var buffer = cacheItem?.Item1;
if (cacheItem == null || cacheItem.Expiration < DateTime.UtcNow)
if (cacheItem == null || cacheItem.Item2 < DateTime.UtcNow)
{
var response = await ImageLoader.GetHttpResponseAsync(uri).ConfigureAwait(false);
if (response != null) // download succeeded
{
buffer = response.Buffer;
buffer = response.Buffer; // may be null or empty when no tile available, but still be cached
cacheItem = new ImageCacheItem
{
Buffer = buffer, // may be null or empty when no tile available, but still be cached
Expiration = GetExpiration(response.MaxAge)
};
cacheItem = Tuple.Create(buffer, GetExpiration(response.MaxAge));
Cache.Set(cacheKey, cacheItem, new CacheItemPolicy { AbsoluteExpiration = cacheItem.Expiration });
Cache.Set(cacheKey, cacheItem, new CacheItemPolicy { AbsoluteExpiration = cacheItem.Item2 });
}
}
else System.Diagnostics.Debug.WriteLine("Cached: " + cacheKey);
if (buffer != null && buffer.Length > 0)
{