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

Minor cleanup in TileImageLoader

Browse source
This commit is contained in:
ClemensF 2020-09-25 15:02:41 +02:00
parent ee4f049334
commit f5acb5f908
6 changed files with 13 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -15,7 +15,7 @@ namespace MapControl
{
Pending = false;
if (fadeIn && MapBase.ImageFadeDuration > TimeSpan.Zero)
if (image != null && fadeIn && MapBase.ImageFadeDuration > TimeSpan.Zero)
{
if (image is BitmapSource bitmap && !bitmap.IsFrozen && bitmap.IsDownloading)
{

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

@ -44,7 +44,7 @@ namespace MapControl
if (cacheItem == null || cacheItem.Expiration < DateTime.UtcNow)
{
var response = await ImageLoader.GetHttpResponseAsync(uri, false).ConfigureAwait(false);
var response = await ImageLoader.GetHttpResponseAsync(uri).ConfigureAwait(false);
if (response != null) // download succeeded
{
@ -58,7 +58,7 @@ namespace MapControl
{
var image = await ImageLoader.LoadImageAsync(buffer).ConfigureAwait(false);
SetTileImage(tile, image);
await tile.Image.Dispatcher.InvokeAsync(() => tile.SetImage(image));
}
}
@ -66,15 +66,7 @@ namespace MapControl
{
var image = await tileSource.LoadImageAsync(tile.XIndex, tile.Y, tile.ZoomLevel).ConfigureAwait(false);
SetTileImage(tile, image);
}
private static void SetTileImage(Tile tile, ImageSource image)
{
if (image != null)
{
tile.Image.Dispatcher.InvokeAsync(() => tile.SetImage(image));
}
await tile.Image.Dispatcher.InvokeAsync(() => tile.SetImage(image));
}
private static Task<ImageCacheItem> GetCacheAsync(string cacheKey)