ClemensFischer/XAML-Map-Control
1
0
Fork 0
mirror of https://github.com/ClemensFischer/XAML-Map-Control.git synced 2025-12-06 07:12:04 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
ClemensF 2018-08-09 18:21:16 +02:00
parent 6a1653056f
commit acf43d70ea
8 changed files with 109 additions and 81 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
MapControl/Shared/ImageLoader.cs
View file

@ -24,7 +24,7 @@ namespace MapControl
/// </summary>
public static HttpClient HttpClient { get; set; } = new HttpClient();
public static async Task<ImageSource> LoadImageAsync(Uri uri, bool isTileImage)
public static async Task<ImageSource> LoadImageAsync(Uri uri)
{
ImageSource imageSource = null;
@ -34,7 +34,7 @@ namespace MapControl
}
else if (uri.Scheme == "http")
{
imageSource = await LoadHttpImageAsync(uri, isTileImage);
imageSource = await LoadHttpImageAsync(uri);
}
else
{
@ -44,7 +44,7 @@ namespace MapControl
return imageSource;
}
public static async Task<ImageSource> LoadHttpImageAsync(Uri uri, bool isTileImage)
public static async Task<ImageSource> LoadHttpImageAsync(Uri uri)
{
ImageSource imageSource = null;
@ -54,12 +54,9 @@ namespace MapControl
{
Debug.WriteLine("ImageLoader: {0}: {1} {2}", uri, (int)response.StatusCode, response.ReasonPhrase);
}
else if (!isTileImage || IsTileAvailable(response.Headers))
else if (IsTileAvailable(response.Headers))
{
using (var stream = await GetResponseStreamAsync(response.Content))
{
imageSource = await CreateImageSourceAsync(stream);
}
imageSource = await CreateImageSourceAsync(response.Content);
}
return imageSource;

2
MapControl/Shared/TileSource.cs
View file

@ -119,7 +119,7 @@ namespace MapControl
{
try
{
imageSource = await ImageLoader.LoadImageAsync(uri, true);
imageSource = await ImageLoader.LoadImageAsync(uri);
}
catch (Exception ex)
{

2
MapControl/Shared/WmsImageLayer.cs
View file

@ -126,7 +126,7 @@ namespace MapControl
try
{
imageSource = await ImageLoader.LoadImageAsync(new Uri(uri.Replace(" ", "%20")), false);
imageSource = await ImageLoader.LoadImageAsync(new Uri(uri.Replace(" ", "%20")));
}
catch (Exception ex)
{

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

@ -35,23 +35,39 @@ namespace MapControl
return imageSource;
}
public static async Task<bool> LoadHttpTileImageAsync(Uri uri, Func<IBuffer, TimeSpan?, Task> tileCallback)
public static async Task<Tuple<IBuffer, TimeSpan?>> LoadHttpBufferAsync(Uri uri)
{
using (var response = await HttpClient.GetAsync(uri))
Tuple<IBuffer, TimeSpan?> result = null;
try
{
if (!response.IsSuccessStatusCode)
using (var response = await HttpClient.GetAsync(uri))
{
Debug.WriteLine("ImageLoader: {0}: {1} {2}", uri, (int)response.StatusCode, response.ReasonPhrase);
}
else if (IsTileAvailable(response.Headers))
{
var buffer = await response.Content.ReadAsBufferAsync();
if (!response.IsSuccessStatusCode)
{
Debug.WriteLine("ImageLoader: {0}: {1} {2}", uri, (int)response.StatusCode, response.ReasonPhrase);
}
else
{
IBuffer buffer = null;
TimeSpan? maxAge = null;
await tileCallback(buffer, response.Headers.CacheControl?.MaxAge);
}
if (IsTileAvailable(response.Headers))
{
buffer = await response.Content.ReadAsBufferAsync();
maxAge = response.Headers.CacheControl?.MaxAge;
}
return response.IsSuccessStatusCode;
result = new Tuple<IBuffer, TimeSpan?>(buffer, maxAge);
}
}
}
catch (Exception ex)
{
Debug.WriteLine("ImageLoader: {0}: {1}", uri, ex.Message);
}
return result;
}
public static async Task<ImageSource> CreateImageSourceAsync(IRandomAccessStream stream)
@ -61,12 +77,14 @@ namespace MapControl
return bitmapImage;
}
private static async Task<InMemoryRandomAccessStream> GetResponseStreamAsync(IHttpContent content)
private static async Task<ImageSource> CreateImageSourceAsync(IHttpContent content)
{
var stream = new InMemoryRandomAccessStream();
await content.WriteToStreamAsync(stream);
stream.Seek(0);
return stream;
using (var stream = new InMemoryRandomAccessStream())
{
await content.WriteToStreamAsync(stream);
stream.Seek(0);
return await CreateImageSourceAsync(stream);
}
}
private static bool IsTileAvailable(HttpResponseHeaderCollection responseHeaders)

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

@ -21,7 +21,7 @@ namespace MapControl
{
var bitmapImage = imageSource as BitmapImage;
if (bitmapImage != null && bitmapImage.UriSource != null)
if (bitmapImage?.UriSource != null)
{
bitmapImage.ImageOpened += BitmapImageOpened;
bitmapImage.ImageFailed += BitmapImageFailed;

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

@ -3,7 +3,6 @@
// Licensed under the Microsoft Public License (Ms-PL)
using System;
using System.Diagnostics;
using System.Threading.Tasks;
using Windows.Storage;
using Windows.Storage.Streams;
@ -36,26 +35,24 @@ namespace MapControl
{
var cacheItem = await Cache.GetAsync(cacheKey);
var cacheBuffer = cacheItem?.Buffer;
var loaded = false;
if (cacheBuffer == null || cacheItem.Expiration < DateTime.UtcNow)
{
try
var result = await ImageLoader.LoadHttpBufferAsync(uri);
if (result != null) // download succeeded
{
loaded = await ImageLoader.LoadHttpTileImageAsync(uri,
async (buffer, maxAge) =>
{
await SetTileImageAsync(tile, buffer); // create BitmapImage before caching
await Cache.SetAsync(cacheKey, buffer, GetExpiration(maxAge));
});
}
catch (Exception ex)
{
Debug.WriteLine("TileImageLoader: {0}: {1}", uri, ex.Message);
cacheBuffer = null; // discard cached image
if (result.Item1 != null) // tile image available
{
await SetTileImageAsync(tile, result.Item1); // show before caching
await Cache.SetAsync(cacheKey, result.Item1, GetExpiration(result.Item2));
}
}
}
if (!loaded && cacheBuffer != null) // keep expired image if download failed
if (cacheBuffer != null)
{
await SetTileImageAsync(tile, cacheBuffer);
}

58
MapControl/WPF/ImageLoader.WPF.cs
View file

@ -36,27 +36,41 @@ namespace MapControl
});
}
public static async Task<bool> LoadHttpTileImageAsync(Uri uri, Func<MemoryStream, TimeSpan?, Task> tileCallback)
public static async Task<Tuple<MemoryStream, TimeSpan?>> LoadHttpStreamAsync(Uri uri)
{
using (var response = await HttpClient.GetAsync(uri))
{
if (!response.IsSuccessStatusCode)
{
Debug.WriteLine("ImageLoader: {0}: {1} {2}", uri, (int)response.StatusCode, response.ReasonPhrase);
}
else if (IsTileAvailable(response.Headers))
{
using (var stream = new MemoryStream())
{
await response.Content.CopyToAsync(stream);
stream.Seek(0, SeekOrigin.Begin);
Tuple<MemoryStream, TimeSpan?> result = null;
await tileCallback(stream, response.Headers.CacheControl?.MaxAge);
try
{
using (var response = await HttpClient.GetAsync(uri))
{
if (!response.IsSuccessStatusCode)
{
Debug.WriteLine("ImageLoader: {0}: {1} {2}", uri, (int)response.StatusCode, response.ReasonPhrase);
}
else
{
MemoryStream stream = null;
TimeSpan? maxAge = null;
if (IsTileAvailable(response.Headers))
{
stream = new MemoryStream();
await response.Content.CopyToAsync(stream);
stream.Seek(0, SeekOrigin.Begin);
maxAge = response.Headers.CacheControl?.MaxAge;
}
result = new Tuple<MemoryStream, TimeSpan?>(stream, maxAge);
}
}
return response.IsSuccessStatusCode;
}
catch (Exception ex)
{
Debug.WriteLine("ImageLoader: {0}: {1}", uri, ex.Message);
}
return result;
}
public static ImageSource CreateImageSource(Stream stream)
@ -75,12 +89,14 @@ namespace MapControl
return Task.Run(() => CreateImageSource(stream));
}
private static async Task<Stream> GetResponseStreamAsync(HttpContent content)
private static async Task<ImageSource> CreateImageSourceAsync(HttpContent content)
{
var stream = new MemoryStream();
await content.CopyToAsync(stream);
stream.Seek(0, SeekOrigin.Begin);
return stream;
using (var stream = new MemoryStream())
{
await content.CopyToAsync(stream);
stream.Seek(0, SeekOrigin.Begin);
return await CreateImageSourceAsync(stream);
}
}
private static bool IsTileAvailable(HttpResponseHeaders responseHeaders)

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

@ -3,7 +3,6 @@
// Licensed under the Microsoft Public License (Ms-PL)
using System;
using System.Diagnostics;
using System.IO;
using System.Net;
using System.Runtime.Caching;
@ -36,40 +35,41 @@ namespace MapControl
private async Task LoadTileImageAsync(Tile tile, Uri uri, string cacheKey)
{
DateTime expiration;
var buffer = GetCachedImage(cacheKey, out expiration);
var loaded = false;
var cacheBuffer = GetCachedImage(cacheKey, out expiration);
if (buffer == null || expiration < DateTime.UtcNow)
if (cacheBuffer == null || expiration < DateTime.UtcNow)
{
try
var result = await ImageLoader.LoadHttpStreamAsync(uri);
if (result != null) // download succeeded
{
loaded = await ImageLoader.LoadHttpTileImageAsync(uri,
async (stream, maxAge) =>
cacheBuffer = null; // discard cached image
if (result.Item1 != null) // tile image available
{
using (var stream = result.Item1)
{
await SetTileImageAsync(tile, stream); // create BitmapImage before caching
SetCachedImage(cacheKey, stream, GetExpiration(maxAge));
});
}
catch (Exception ex)
{
Debug.WriteLine("TileImageLoader: {0}: {1}", uri, ex.Message);
SetTileImage(tile, stream); // show before caching
SetCachedImage(cacheKey, stream, GetExpiration(result.Item2));
}
}
}
}
if (!loaded && buffer != null) // keep expired image if download failed
if (cacheBuffer != null)
{
using (var stream = new MemoryStream(buffer))
using (var stream = new MemoryStream(cacheBuffer))
{
await SetTileImageAsync(tile, stream);
SetTileImage(tile, stream);
}
}
}
private async Task SetTileImageAsync(Tile tile, MemoryStream stream)
private void SetTileImage(Tile tile, Stream stream)
{
var imageSource = ImageLoader.CreateImageSource(stream);
await tile.Image.Dispatcher.InvokeAsync(() => tile.SetImage(imageSource));
tile.Image.Dispatcher.InvokeAsync(() => tile.SetImage(imageSource));
}
private static byte[] GetCachedImage(string cacheKey, out DateTime expiration)