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.13.0

Browse source
This commit is contained in:
ClemensF 2019-07-22 01:06:59 +02:00
parent 35582abc13
commit 576dd8e8e7
1 changed files with 22 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
MapControl/Shared/ImageLoader.cs
View file

@ -23,7 +23,7 @@ namespace MapControl
/// <summary> /// <summary>
/// The System.Net.Http.HttpClient instance used to download images via a http or https Uri. /// The System.Net.Http.HttpClient instance used to download images via a http or https Uri.
/// </summary> /// </summary>
public static HttpClient HttpClient { get; set; } = new HttpClient(); public static HttpClient HttpClient { get; set; } = new HttpClient { Timeout = TimeSpan.FromSeconds(10) };
public static async Task<ImageSource> LoadImageAsync(Uri uri) public static async Task<ImageSource> LoadImageAsync(Uri uri)
@ -64,11 +64,25 @@ namespace MapControl
try try
{ {
using (var responseMessage = await HttpClient.GetAsync(uri).ConfigureAwait(continueOnCapturedContext)) using (var responseMessage = await HttpClient
.GetAsync(uri, HttpCompletionOption.ResponseHeadersRead)
.ConfigureAwait(continueOnCapturedContext))
{ {
if (responseMessage.IsSuccessStatusCode) if (responseMessage.IsSuccessStatusCode)
{ {
response = await HttpResponse.Create(responseMessage, continueOnCapturedContext); IEnumerable<string> tileInfo;
if (responseMessage.Headers.TryGetValues("X-VE-Tile-Info", out tileInfo) &&
tileInfo.Contains("no-tile"))
{
response = new HttpResponse(null, null); // no tile image
}
else
{
response = new HttpResponse(
await responseMessage.Content.ReadAsByteArrayAsync().ConfigureAwait(continueOnCapturedContext),
responseMessage.Headers.CacheControl?.MaxAge);
}
} }
else else
{ {
@ -86,21 +100,13 @@ namespace MapControl
internal class HttpResponse internal class HttpResponse
{ {
public byte[] Buffer { get; private set; } public byte[] Buffer { get; }
public TimeSpan? MaxAge { get; private set; } public TimeSpan? MaxAge { get; }
internal static async Task<HttpResponse> Create(HttpResponseMessage message, bool continueOnCapturedContext) public HttpResponse(byte[] buffer, TimeSpan? maxAge)
{ {
var response = new HttpResponse(); Buffer = buffer;
IEnumerable<string> tileInfo; MaxAge = maxAge;
if (!message.Headers.TryGetValues("X-VE-Tile-Info", out tileInfo) || !tileInfo.Contains("no-tile"))
{
response.Buffer = await message.Content.ReadAsByteArrayAsync().ConfigureAwait(continueOnCapturedContext);
response.MaxAge = message.Headers.CacheControl?.MaxAge;
}
return response;
} }
} }
} }