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

2
MapControl/Shared/TileSource.cs
View file

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

2
MapControl/Shared/WmsImageLayer.cs
View file

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

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

@ -35,7 +35,11 @@ namespace MapControl
return imageSource; 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)
{
Tuple<IBuffer, TimeSpan?> result = null;
try
{ {
using (var response = await HttpClient.GetAsync(uri)) using (var response = await HttpClient.GetAsync(uri))
{ {
@ -43,16 +47,28 @@ namespace MapControl
{ {
Debug.WriteLine("ImageLoader: {0}: {1} {2}", uri, (int)response.StatusCode, response.ReasonPhrase); Debug.WriteLine("ImageLoader: {0}: {1} {2}", uri, (int)response.StatusCode, response.ReasonPhrase);
} }
else if (IsTileAvailable(response.Headers)) else
{ {
var buffer = await response.Content.ReadAsBufferAsync(); 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) public static async Task<ImageSource> CreateImageSourceAsync(IRandomAccessStream stream)
{ {
@ -61,12 +77,14 @@ namespace MapControl
return bitmapImage; return bitmapImage;
} }
private static async Task<InMemoryRandomAccessStream> GetResponseStreamAsync(IHttpContent content) private static async Task<ImageSource> CreateImageSourceAsync(IHttpContent content)
{
using (var stream = new InMemoryRandomAccessStream())
{ {
var stream = new InMemoryRandomAccessStream();
await content.WriteToStreamAsync(stream); await content.WriteToStreamAsync(stream);
stream.Seek(0); stream.Seek(0);
return stream; return await CreateImageSourceAsync(stream);
}
} }
private static bool IsTileAvailable(HttpResponseHeaderCollection responseHeaders) 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; var bitmapImage = imageSource as BitmapImage;
if (bitmapImage != null && bitmapImage.UriSource != null) if (bitmapImage?.UriSource != null)
{ {
bitmapImage.ImageOpened += BitmapImageOpened; bitmapImage.ImageOpened += BitmapImageOpened;
bitmapImage.ImageFailed += BitmapImageFailed; bitmapImage.ImageFailed += BitmapImageFailed;

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

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

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

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

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

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