diff --git a/MapControl/Shared/MapTileLayer.cs b/MapControl/Shared/MapTileLayer.cs index c386467f..d23cbd7b 100644 --- a/MapControl/Shared/MapTileLayer.cs +++ b/MapControl/Shared/MapTileLayer.cs @@ -235,7 +235,7 @@ namespace MapControl tile = new Tile(z, x, y); var equivalentTile = Tiles.FirstOrDefault( - t => !t.Pending && t.ZoomLevel == z && t.Y == y && t.XIndex == tile.XIndex); + t => t.IsLoaded && t.ZoomLevel == z && t.Y == y && t.XIndex == tile.XIndex); if (equivalentTile != null) { diff --git a/MapControl/Shared/Tile.cs b/MapControl/Shared/Tile.cs index a022c7e8..8c96e845 100644 --- a/MapControl/Shared/Tile.cs +++ b/MapControl/Shared/Tile.cs @@ -51,11 +51,11 @@ namespace MapControl IsHitTestVisible = false // avoid touch capture issues }; - public bool Pending { get; set; } = true; + public bool IsLoaded { get; set; } public void SetImageSource(ImageSource image, bool animateOpacity = true) { - Pending = false; + IsLoaded = true; Image.Source = image; if (image != null && animateOpacity && MapBase.ImageFadeDuration > TimeSpan.Zero) diff --git a/MapControl/Shared/TileImageLoader.cs b/MapControl/Shared/TileImageLoader.cs index d22a361d..dd6b1d05 100644 --- a/MapControl/Shared/TileImageLoader.cs +++ b/MapControl/Shared/TileImageLoader.cs @@ -22,7 +22,7 @@ namespace MapControl private class TileQueue : ConcurrentStack { public TileQueue(IEnumerable tiles) - : base(tiles.Where(tile => tile.Pending).Reverse()) + : base(tiles.Where(tile => !tile.IsLoaded).Reverse()) { } @@ -37,7 +37,7 @@ namespace MapControl return false; } - tile.Pending = false; + tile.IsLoaded = true; return true; } diff --git a/MapControl/WinUI/TileImageLoader.WinUI.cs b/MapControl/WinUI/TileImageLoader.WinUI.cs index 6b7ed20e..e57a5942 100644 --- a/MapControl/WinUI/TileImageLoader.WinUI.cs +++ b/MapControl/WinUI/TileImageLoader.WinUI.cs @@ -82,7 +82,7 @@ namespace MapControl if (!tile.Image.DispatcherQueue.TryEnqueue(DispatcherQueuePriority.Low, callback)) { - tile.Pending = true; + tile.IsLoaded = false; tcs.TrySetResult(); }