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

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

12
MapControl/Shared/ImageLoader.cs
View file

@ -7,9 +7,11 @@ using System.Diagnostics;
using System.Threading.Tasks;
#if WINDOWS_UWP
using Windows.Web.Http;
using Windows.UI.Xaml.Media;
using Windows.UI.Xaml.Media.Imaging;
#else
using System.Net.Http;
using System.Windows.Media;
using System.Windows.Media.Imaging;
#endif
@ -22,9 +24,9 @@ namespace MapControl
/// </summary>
public static HttpClient HttpClient { get; set; } = new HttpClient();
public static async Task<BitmapSource> LoadImageAsync(Uri uri)
public static async Task<ImageSource> LoadImageAsync(Uri uri)
{
BitmapSource image = null;
ImageSource image = null;
try
{
@ -49,9 +51,9 @@ namespace MapControl
return image;
}
private static async Task<BitmapSource> LoadHttpImageAsync(Uri uri)
private static async Task<ImageSource> LoadHttpImageAsync(Uri uri)
{
BitmapSource image = null;
ImageSource image = null;
using (var response = await HttpClient.GetAsync(uri))
{
@ -59,7 +61,7 @@ namespace MapControl
{
Debug.WriteLine("ImageLoader: {0}: {1} {2}", uri, (int)response.StatusCode, response.ReasonPhrase);
}
else if (IsTileAvailable(response.Headers))
else if (ImageAvailable(response.Headers))
{
image = await LoadImageAsync(response.Content);
}