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

16
MapControl/Shared/MapTileLayer.cs
View file

@ -5,7 +5,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
#if WINDOWS_UWP
using Windows.Foundation;
using Windows.UI.Xaml;
@ -22,7 +21,7 @@ namespace MapControl
{
public interface ITileImageLoader
{
Task LoadTilesAsync(MapTileLayer tileLayer);
void LoadTilesAsync(MapTileLayer tileLayer);
}
/// <summary>
@ -93,7 +92,6 @@ namespace MapControl
IsHitTestVisible = false;
RenderTransform = new MatrixTransform();
TileImageLoader = tileImageLoader;
Tiles = new List<Tile>();
updateTimer = new DispatcherTimer { Interval = UpdateInterval };
updateTimer.Tick += (s, e) => UpdateTileGrid();
@ -102,9 +100,11 @@ namespace MapControl
}
public ITileImageLoader TileImageLoader { get; private set; }
public ICollection<Tile> Tiles { get; private set; }
public TileGrid TileGrid { get; private set; }
public IReadOnlyCollection<Tile> Tiles { get; private set; } = new List<Tile>();
/// <summary>
/// Provides map tile URIs or images.
/// </summary>
@ -273,7 +273,7 @@ namespace MapControl
{
if (TileGrid != null)
{
Tiles.Clear();
Tiles = new List<Tile>();
UpdateTiles();
}
}
@ -344,9 +344,7 @@ namespace MapControl
var maxZoomLevel = Math.Min(TileGrid.ZoomLevel, MaxZoomLevel);
var minZoomLevel = MinZoomLevel;
if (minZoomLevel < maxZoomLevel &&
parentMap.MapLayer != this &&
parentMap.Children.Cast<UIElement>().FirstOrDefault() != this)
if (minZoomLevel < maxZoomLevel && parentMap.MapLayer != this)
{
minZoomLevel = maxZoomLevel; // do not load lower level tiles if this is note a "base" layer
}
@ -393,7 +391,7 @@ namespace MapControl
Children.Add(tile.Image);
}
var task = TileImageLoader.LoadTilesAsync(this);
TileImageLoader.LoadTilesAsync(this);
}
}
}