Version 4.10.0: Updated target framework versions. Cleanup of TypeConverters, ImageLoader, MBTileSource.

This commit is contained in:
ClemensF 2018-08-08 23:31:52 +02:00
parent 63a4c1f0a7
commit 6a1653056f
36 changed files with 272 additions and 292 deletions

View file

@ -15,67 +15,25 @@ using System.Windows.Media.Imaging;
namespace MapControl
{
public static class ImageLoader
public static partial class ImageLoader
{
/// <summary>
/// The HttpClient instance used when image data is downloaded from a web resource.
/// </summary>
public static HttpClient HttpClient { get; set; } = new HttpClient();
public static async Task<ImageSource> LoadImageAsync(Uri uri, bool isTileImage)
{
if (!uri.IsAbsoluteUri || uri.Scheme == "file")
{
return await LoadLocalImageAsync(uri);
}
if (uri.Scheme == "http")
{
return await LoadHttpImageAsync(uri, isTileImage);
}
return new BitmapImage(uri);
}
public static Task<ImageSource> LoadLocalImageAsync(Uri uri)
{
return Task.Run(() =>
{
ImageSource imageSource = null;
var path = uri.IsAbsoluteUri ? uri.LocalPath : uri.OriginalString;
if (!File.Exists(path))
if (File.Exists(path))
{
return null;
}
using (var stream = new FileStream(path, FileMode.Open, FileAccess.Read))
{
return (ImageSource)BitmapFrame.Create(stream, BitmapCreateOptions.None, BitmapCacheOption.OnLoad);
}
});
}
public static async Task<ImageSource> LoadHttpImageAsync(Uri uri, bool isTileImage)
{
using (var response = await HttpClient.GetAsync(uri))
{
if (!response.IsSuccessStatusCode)
{
Debug.WriteLine("ImageLoader: {0}: {1} {2}", uri, (int)response.StatusCode, response.ReasonPhrase);
}
else if (!isTileImage || IsTileAvailable(response.Headers))
{
using (var stream = new MemoryStream())
using (var stream = File.OpenRead(path))
{
await response.Content.CopyToAsync(stream);
stream.Seek(0, SeekOrigin.Begin);
return BitmapFrame.Create(stream, BitmapCreateOptions.None, BitmapCacheOption.OnLoad);
imageSource = CreateImageSource(stream);
}
}
return null;
}
return imageSource;
});
}
public static async Task<bool> LoadHttpTileImageAsync(Uri uri, Func<MemoryStream, TimeSpan?, Task> tileCallback)
@ -88,22 +46,46 @@ namespace MapControl
}
else if (IsTileAvailable(response.Headers))
{
var stream = new MemoryStream();
using (var stream = new MemoryStream())
{
await response.Content.CopyToAsync(stream);
stream.Seek(0, SeekOrigin.Begin);
await response.Content.CopyToAsync(stream);
stream.Seek(0, SeekOrigin.Begin);
await tileCallback(stream, response.Headers.CacheControl?.MaxAge);
await tileCallback(stream, response.Headers.CacheControl?.MaxAge);
}
}
return response.IsSuccessStatusCode;
}
}
public static ImageSource CreateImageSource(Stream stream)
{
var bitmapImage = new BitmapImage();
bitmapImage.BeginInit();
bitmapImage.CacheOption = BitmapCacheOption.OnLoad;
bitmapImage.StreamSource = stream;
bitmapImage.EndInit();
bitmapImage.Freeze();
return bitmapImage;
}
public static Task<ImageSource> CreateImageSourceAsync(Stream stream)
{
return Task.Run(() => CreateImageSource(stream));
}
private static async Task<Stream> GetResponseStreamAsync(HttpContent content)
{
var stream = new MemoryStream();
await content.CopyToAsync(stream);
stream.Seek(0, SeekOrigin.Begin);
return stream;
}
private static bool IsTileAvailable(HttpResponseHeaders responseHeaders)
{
IEnumerable<string> tileInfo;
return !responseHeaders.TryGetValues("X-VE-Tile-Info", out tileInfo) || !tileInfo.Contains("no-tile");
}
}