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

Updated DrawingTileMatrixLayer

Browse source
This commit is contained in:
ClemensFischer 2025-12-05 00:50:28 +01:00
parent e6782cbb2d
commit d6de47a2ed
1 changed files with 18 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
MapControl/WPF/DrawingTileMatrixLayer.cs
View file

@ -7,18 +7,19 @@ using System.Windows.Media;
namespace MapControl namespace MapControl
{ {
public class ImageSourceTile(int zoomLevel, int x, int y, int columnCount) public class ImageDrawingTile(int zoomLevel, int x, int y, int columnCount)
: Tile(zoomLevel, x, y, columnCount) : Tile(zoomLevel, x, y, columnCount)
{ {
public event EventHandler Completed; public ImageDrawing Drawing { get; } = new ImageDrawing();
public ImageSource ImageSource { get; set; }
public override async Task LoadImageAsync(Func<Task<ImageSource>> loadImageFunc) public override async Task LoadImageAsync(Func<Task<ImageSource>> loadImageFunc)
{ {
ImageSource = await loadImageFunc().ConfigureAwait(false); var image = await loadImageFunc().ConfigureAwait(false);
Completed?.Invoke(this, EventArgs.Empty); if (image != null)
{
await Drawing.Dispatcher.InvokeAsync(() => Drawing.ImageSource = image);
}
} }
} }
@ -28,7 +29,7 @@ namespace MapControl
public TileMatrix TileMatrix { get; private set; } = new TileMatrix(zoomLevel, 1, 1, 0, 0); public TileMatrix TileMatrix { get; private set; } = new TileMatrix(zoomLevel, 1, 1, 0, 0);
public IEnumerable<ImageSourceTile> Tiles { get; private set; } = []; public IEnumerable<ImageDrawingTile> Tiles { get; private set; } = [];
public DrawingGroup Drawing { get; } = new DrawingGroup { Transform = new MatrixTransform() }; public DrawingGroup Drawing { get; } = new DrawingGroup { Transform = new MatrixTransform() };
@ -83,15 +84,15 @@ namespace MapControl
TileMatrix = new TileMatrix(TileMatrix.ZoomLevel, xMin, yMin, xMax, yMax); TileMatrix = new TileMatrix(TileMatrix.ZoomLevel, xMin, yMin, xMax, yMax);
Drawing.Children.Clear();
CreateTiles(); CreateTiles();
Drawing.Children = [.. Tiles.Select(tile => tile.Drawing)];
return true; return true;
} }
private void CreateTiles() private void CreateTiles()
{ {
var tiles = new List<ImageSourceTile>(); var tiles = new List<ImageDrawingTile>();
for (var y = TileMatrix.YMin; y <= TileMatrix.YMax; y++) for (var y = TileMatrix.YMin; y <= TileMatrix.YMax; y++)
{ {
@ -101,25 +102,22 @@ namespace MapControl
if (tile == null) if (tile == null)
{ {
tile = new ImageSourceTile(TileMatrix.ZoomLevel, x, y, WmtsTileMatrix.MatrixWidth); tile = new ImageDrawingTile(TileMatrix.ZoomLevel, x, y, WmtsTileMatrix.MatrixWidth);
var equivalentTile = Tiles.FirstOrDefault(t => t.ImageSource != null && t.Column == tile.Column && t.Row == tile.Row); var equivalentTile = Tiles.FirstOrDefault(t => t.Drawing.ImageSource != null && t.Column == tile.Column && t.Row == tile.Row);
if (equivalentTile != null) if (equivalentTile != null)
{ {
tile.IsPending = false; tile.IsPending = false;
tile.ImageSource = equivalentTile.ImageSource; tile.Drawing.ImageSource = equivalentTile.Drawing.ImageSource;
}
else
{
tile.Completed += OnTileCompleted;
} }
} }
if (tile.ImageSource != null) tile.Drawing.Rect = new Rect(
{ WmtsTileMatrix.TileWidth * (x - TileMatrix.XMin),
DrawTile(tile); WmtsTileMatrix.TileHeight * (y - TileMatrix.YMin),
} WmtsTileMatrix.TileWidth,
WmtsTileMatrix.TileHeight);
tiles.Add(tile); tiles.Add(tile);
} }
@ -127,29 +125,5 @@ namespace MapControl
Tiles = tiles; Tiles = tiles;
} }
private void DrawTile(ImageSourceTile tile)
{
var width = WmtsTileMatrix.TileWidth;
var height = WmtsTileMatrix.TileHeight;
var x = width * (tile.X - TileMatrix.XMin);
var y = height * (tile.Y - TileMatrix.YMin);
Drawing.Children.Add(new ImageDrawing(tile.ImageSource, new Rect(x, y, width, height)));
}
private void OnTileCompleted(object sender, EventArgs e)
{
var tile = (ImageSourceTile)sender;
tile.Completed -= OnTileCompleted;
if (tile.X >= TileMatrix.XMin && tile.X <= TileMatrix.XMax &&
tile.Y >= TileMatrix.YMin && tile.Y <= TileMatrix.YMax &&
tile.ImageSource != null)
{
_ = Dispatcher.InvokeAsync(() => DrawTile(tile));
}
}
} }
} }