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

Version 4.10.0: Simplified TileImageLoader.

Browse source
This commit is contained in:
ClemensF 2018-08-21 23:56:54 +02:00
parent f6135d2bfb
commit be3a247064
6 changed files with 113 additions and 101 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -21,7 +21,7 @@ namespace MapControl
get { return Data; }
}
bool IWeakEventListener.ReceiveWeakEvent(Type managerType, object sender, EventArgs e)
public bool ReceiveWeakEvent(Type managerType, object sender, EventArgs e)
{
UpdateData();
return true;

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

@ -4,10 +4,11 @@
using System;
using System.IO;
using System.Net;
using System.Runtime.Caching;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Media;
using System.Windows.Threading;
namespace MapControl
{
@ -27,12 +28,7 @@ namespace MapControl
/// </summary>
public static ObjectCache Cache { get; set; } = MemoryCache.Default;
private static int DefaultConnectionLimit
{
get { return ServicePointManager.DefaultConnectionLimit; }
}
private async Task LoadTileImageAsync(Tile tile, Uri uri, string cacheKey)
private async Task LoadCachedTileImageAsync(Tile tile, Uri uri, string cacheKey)
{
DateTime expiration;
var cacheBuffer = GetCachedImage(cacheKey, out expiration);
@ -49,7 +45,7 @@ namespace MapControl
{
using (var stream = result.Item1)
{
SetTileImage(tile, stream); // show before caching
LoadTileImage(tile, stream);
SetCachedImage(cacheKey, stream, GetExpiration(result.Item2));
}
}
@ -60,15 +56,23 @@ namespace MapControl
{
using (var stream = new MemoryStream(cacheBuffer))
{
SetTileImage(tile, stream);
LoadTileImage(tile, stream);
}
}
}
private void SetTileImage(Tile tile, Stream stream)
private async Task LoadTileImageAsync(Tile tile, TileSource tileSource)
{
var imageSource = ImageLoader.LoadImage(stream);
SetTileImage(tile, await tileSource.LoadImageAsync(tile.XIndex, tile.Y, tile.ZoomLevel));
}
private void LoadTileImage(Tile tile, Stream stream)
{
SetTileImage(tile, ImageLoader.LoadImage(stream));
}
private void SetTileImage(Tile tile, ImageSource imageSource)
{
tile.Image.Dispatcher.InvokeAsync(() => tile.SetImage(imageSource));
}