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

Version 4.12.2 Improved TileImageLoader.

Browse source
This commit is contained in:
ClemensF 2019-06-13 21:38:01 +02:00
parent 4531e620ca
commit 26bf0b5005
11 changed files with 162 additions and 140 deletions
Download patch file Download diff file Expand all files Collapse all files

2
MapControl/UWP/ImageFileCache.UWP.cs
View file

@ -69,7 +69,7 @@ namespace MapControl.Caching
public virtual async Task SetAsync(string key, IBuffer buffer, DateTime expiration)
{
var paths = key.Split('\\', '/', ':', ';');
var paths = key.Split('\\', '/', ',', ':', ';');
try
{

51
MapControl/UWP/ImageLoader.UWP.cs
View file

@ -9,6 +9,7 @@ using System.Runtime.InteropServices.WindowsRuntime;
using System.Threading.Tasks;
using Windows.Storage;
using Windows.Storage.Streams;
using Windows.UI.Xaml.Media;
using Windows.UI.Xaml.Media.Imaging;
using Windows.Web.Http;
using Windows.Web.Http.Headers;
@ -17,14 +18,14 @@ namespace MapControl
{
public static partial class ImageLoader
{
public static async Task<BitmapSource> LoadImageAsync(IRandomAccessStream stream)
public static async Task<ImageSource> LoadImageAsync(IRandomAccessStream stream)
{
var image = new BitmapImage();
await image.SetSourceAsync(stream);
return image;
}
public static async Task<BitmapSource> LoadImageAsync(byte[] buffer)
public static async Task<ImageSource> LoadImageAsync(byte[] buffer)
{
using (var stream = new InMemoryRandomAccessStream())
{
@ -34,7 +35,7 @@ namespace MapControl
}
}
private static async Task<BitmapSource> LoadImageAsync(IHttpContent content)
private static async Task<ImageSource> LoadImageAsync(IHttpContent content)
{
using (var stream = new InMemoryRandomAccessStream())
{
@ -44,9 +45,9 @@ namespace MapControl
}
}
private static async Task<BitmapSource> LoadLocalImageAsync(Uri uri)
private static async Task<ImageSource> LoadLocalImageAsync(Uri uri)
{
BitmapSource image = null;
ImageSource image = null;
var path = uri.IsAbsoluteUri ? uri.LocalPath : uri.OriginalString;
if (File.Exists(path))
@ -62,30 +63,42 @@ namespace MapControl
return image;
}
internal static async Task<Tuple<IBuffer, TimeSpan?>> LoadHttpBufferAsync(Uri uri)
internal class HttpBufferResponse
{
Tuple<IBuffer, TimeSpan?> result = null;
public readonly IBuffer Buffer;
public readonly TimeSpan? MaxAge;
public HttpBufferResponse(IBuffer buffer, TimeSpan? maxAge)
{
Buffer = buffer;
MaxAge = maxAge;
}
}
internal static async Task<HttpBufferResponse> LoadHttpBufferAsync(Uri uri)
{
HttpBufferResponse response = null;
try
{
using (var response = await HttpClient.GetAsync(uri))
using (var responseMessage = await HttpClient.GetAsync(uri))
{
if (!response.IsSuccessStatusCode)
{
Debug.WriteLine("ImageLoader: {0}: {1} {2}", uri, (int)response.StatusCode, response.ReasonPhrase);
}
else
if (responseMessage.IsSuccessStatusCode)
{
IBuffer buffer = null;
TimeSpan? maxAge = null;
if (IsTileAvailable(response.Headers))
if (ImageAvailable(responseMessage.Headers))
{
buffer = await response.Content.ReadAsBufferAsync();
maxAge = response.Headers.CacheControl?.MaxAge;
buffer = await responseMessage.Content.ReadAsBufferAsync();
maxAge = responseMessage.Headers.CacheControl?.MaxAge;
}
result = new Tuple<IBuffer, TimeSpan?>(buffer, maxAge);
response = new HttpBufferResponse(buffer, maxAge);
}
else
{
Debug.WriteLine("ImageLoader: {0}: {1} {2}", uri, (int)responseMessage.StatusCode, responseMessage.ReasonPhrase);
}
}
}
@ -94,10 +107,10 @@ namespace MapControl
Debug.WriteLine("ImageLoader: {0}: {1}", uri, ex.Message);
}
return result;
return response;
}
private static bool IsTileAvailable(HttpResponseHeaderCollection responseHeaders)
private static bool ImageAvailable(HttpResponseHeaderCollection responseHeaders)
{
return !responseHeaders.TryGetValue("X-VE-Tile-Info", out string tileInfo) || tileInfo != "no-tile";
}

43
MapControl/UWP/TileImageLoader.UWP.cs
View file

@ -7,6 +7,7 @@ using System.Threading.Tasks;
using Windows.Storage;
using Windows.Storage.Streams;
using Windows.UI.Core;
using Windows.UI.Xaml.Media;
namespace MapControl
{
@ -28,58 +29,48 @@ namespace MapControl
private async Task LoadCachedTileImageAsync(Tile tile, Uri uri, string cacheKey)
{
var cacheItem = await Cache.GetAsync(cacheKey);
var cacheItem = await Cache.GetAsync(cacheKey).ConfigureAwait(false);
var cacheBuffer = cacheItem?.Buffer;
if (cacheBuffer == null || cacheItem.Expiration < DateTime.UtcNow)
{
var result = await ImageLoader.LoadHttpBufferAsync(uri);
var response = await ImageLoader.LoadHttpBufferAsync(uri).ConfigureAwait(false);
if (result != null) // download succeeded
if (response != null) // download succeeded
{
cacheBuffer = null; // discard cached image
if (result.Item1 != null) // tile image available
if (response.Buffer != null) // tile image available
{
await LoadTileImageAsync(tile, result.Item1);
await Cache.SetAsync(cacheKey, result.Item1, GetExpiration(result.Item2));
await LoadTileImageAsync(tile, response.Buffer).ConfigureAwait(false);
await Cache.SetAsync(cacheKey, response.Buffer, GetExpiration(response.MaxAge)).ConfigureAwait(false);
}
}
}
if (cacheBuffer != null) // cached image not expired or download failed
{
await LoadTileImageAsync(tile, cacheBuffer);
await LoadTileImageAsync(tile, cacheBuffer).ConfigureAwait(false);
}
}
private async Task LoadTileImageAsync(Tile tile, IBuffer buffer)
{
var tcs = new TaskCompletionSource<object>();
using (var stream = new InMemoryRandomAccessStream())
{
await stream.WriteAsync(buffer);
stream.Seek(0);
await tile.Image.Dispatcher.RunAsync(CoreDispatcherPriority.Low, async () =>
{
try
{
tile.SetImage(await ImageLoader.LoadImageAsync(stream));
tcs.SetResult(null);
}
catch (Exception ex)
{
tcs.SetException(ex);
}
});
await SetTileImageAsync(tile, () => ImageLoader.LoadImageAsync(stream)).ConfigureAwait(false);
}
await tcs.Task;
}
private async Task LoadTileImageAsync(Tile tile, TileSource tileSource)
private Task LoadTileImageAsync(Tile tile, TileSource tileSource)
{
return SetTileImageAsync(tile, () => tileSource.LoadImageAsync(tile.XIndex, tile.Y, tile.ZoomLevel));
}
private async Task SetTileImageAsync(Tile tile, Func<Task<ImageSource>> loadImageFunc)
{
var tcs = new TaskCompletionSource<object>();
@ -87,7 +78,7 @@ namespace MapControl
{
try
{
tile.SetImage(await tileSource.LoadImageAsync(tile.XIndex, tile.Y, tile.ZoomLevel));
tile.SetImage(await loadImageFunc());
tcs.SetResult(null);
}
catch (Exception ex)
@ -96,7 +87,7 @@ namespace MapControl
}
});
await tcs.Task;
await tcs.Task.ConfigureAwait(false);
}
}
}