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

MapTileLayerBase.TileImageLoader property

Browse source
This commit is contained in:
ClemensFischer 2023-08-22 18:16:24 +02:00
parent ebdbc012f2
commit b32755e29e
7 changed files with 13 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
MapControl/Shared/BingMapsTileLayer.cs
View file

@ -30,12 +30,6 @@ namespace MapControl
} }
public BingMapsTileLayer() public BingMapsTileLayer()
: this(new TileImageLoader())
{
}
public BingMapsTileLayer(ITileImageLoader tileImageLoader)
: base(tileImageLoader)
{ {
MinZoomLevel = 1; MinZoomLevel = 1;
MaxZoomLevel = 21; MaxZoomLevel = 21;

10
MapControl/Shared/MapTileLayer.cs
View file

@ -48,16 +48,6 @@ namespace MapControl
public static readonly DependencyProperty ZoomLevelOffsetProperty = DependencyProperty.Register( public static readonly DependencyProperty ZoomLevelOffsetProperty = DependencyProperty.Register(
nameof(ZoomLevelOffset), typeof(double), typeof(MapTileLayer), new PropertyMetadata(0d)); nameof(ZoomLevelOffset), typeof(double), typeof(MapTileLayer), new PropertyMetadata(0d));
public MapTileLayer()
: this(new TileImageLoader())
{
}
public MapTileLayer(ITileImageLoader tileImageLoader)
: base(tileImageLoader)
{
}
public TileMatrix TileMatrix { get; private set; } public TileMatrix TileMatrix { get; private set; }
public TileCollection Tiles { get; private set; } = new TileCollection(); public TileCollection Tiles { get; private set; } = new TileCollection();

11
MapControl/Shared/MapTileLayerBase.cs
View file

@ -61,14 +61,13 @@ namespace MapControl
private readonly Progress<double> loadingProgress; private readonly Progress<double> loadingProgress;
private readonly DispatcherTimer updateTimer; private readonly DispatcherTimer updateTimer;
private ITileImageLoader tileImageLoader;
private MapBase parentMap; private MapBase parentMap;
protected MapTileLayerBase(ITileImageLoader tileImageLoader) protected MapTileLayerBase()
{ {
RenderTransform = new MatrixTransform(); RenderTransform = new MatrixTransform();
TileImageLoader = tileImageLoader;
loadingProgress = new Progress<double>(p => LoadingProgress = p); loadingProgress = new Progress<double>(p => LoadingProgress = p);
updateTimer = this.CreateTimer(UpdateInterval); updateTimer = this.CreateTimer(UpdateInterval);
@ -79,7 +78,11 @@ namespace MapControl
#endif #endif
} }
public ITileImageLoader TileImageLoader { get; } public ITileImageLoader TileImageLoader
{
get => tileImageLoader ?? (tileImageLoader = new TileImageLoader());
set => tileImageLoader = value;
}
/// <summary> /// <summary>
/// Provides map tile URIs or images. /// Provides map tile URIs or images.

5
MapControl/Shared/Tile.cs
View file

@ -49,13 +49,12 @@ namespace MapControl
public void SetImageSource(ImageSource image) public void SetImageSource(ImageSource image)
{ {
IsPending = false; IsPending = false;
Image.Source = image;
if (image != null && MapBase.ImageFadeDuration > TimeSpan.Zero) if (image != null && MapBase.ImageFadeDuration > TimeSpan.Zero)
{ {
AnimateImageOpacity(image); AnimateImageOpacity();
} }
Image.Source = image;
} }
private void BeginOpacityAnimation() private void BeginOpacityAnimation()

6
MapControl/Shared/WmtsTileLayer.cs
View file

@ -35,12 +35,6 @@ namespace MapControl
nameof(PreferredTileMatrixSets), typeof(string[]), typeof(WmtsTileLayer), new PropertyMetadata(null)); nameof(PreferredTileMatrixSets), typeof(string[]), typeof(WmtsTileLayer), new PropertyMetadata(null));
public WmtsTileLayer() public WmtsTileLayer()
: this(new TileImageLoader())
{
}
public WmtsTileLayer(ITileImageLoader tileImageLoader)
: base(tileImageLoader)
{ {
Loaded += OnLoaded; Loaded += OnLoaded;
} }

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

@ -11,9 +11,9 @@ namespace MapControl
{ {
public partial class Tile public partial class Tile
{ {
private void AnimateImageOpacity(ImageSource image) private void AnimateImageOpacity()
{ {
if (image is BitmapSource bitmap && !bitmap.IsFrozen && bitmap.IsDownloading) if (Image.Source is BitmapSource bitmap && bitmap.IsDownloading && !bitmap.IsFrozen)
{ {
bitmap.DownloadCompleted += BitmapDownloadCompleted; bitmap.DownloadCompleted += BitmapDownloadCompleted;
bitmap.DownloadFailed += BitmapDownloadFailed; bitmap.DownloadFailed += BitmapDownloadFailed;

4
MapControl/WinUI/Tile.WinUI.cs
View file

@ -16,9 +16,9 @@ namespace MapControl
{ {
public partial class Tile public partial class Tile
{ {
private void AnimateImageOpacity(ImageSource image) private void AnimateImageOpacity()
{ {
if (image is BitmapImage bitmap && bitmap.UriSource != null) if (Image.Source is BitmapImage bitmap && bitmap.UriSource != null)
{ {
bitmap.ImageOpened += BitmapImageOpened; bitmap.ImageOpened += BitmapImageOpened;
bitmap.ImageFailed += BitmapImageFailed; bitmap.ImageFailed += BitmapImageFailed;