ClemensFischer/XAML-Map-Control
1
0
Fork 0
mirror of https://github.com/ClemensFischer/XAML-Map-Control.git synced 2026-04-03 12:00:04 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Updated DrawingTileMatrixLayer and BitmapTileMatrixLayer

Browse source
This commit is contained in:
ClemensFischer 2025-12-09 17:42:54 +01:00
parent d777516e35
commit 5daaf01f6b
2 changed files with 24 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
MapControl/WPF/BitmapTileMatrixLayer.WPF.cs
View file

@ -36,11 +36,9 @@ namespace MapControl
public class BitmapTileMatrixLayer(WmtsTileMatrix wmtsTileMatrix, int zoomLevel) : UIElement public class BitmapTileMatrixLayer(WmtsTileMatrix wmtsTileMatrix, int zoomLevel) : UIElement
{ {
private readonly ImageBrush imageBrush = new ImageBrush private readonly MatrixTransform transform = new MatrixTransform();
{
ViewportUnits = BrushMappingMode.Absolute, private WriteableBitmap bitmap;
Transform = new MatrixTransform()
};
public WmtsTileMatrix WmtsTileMatrix => wmtsTileMatrix; public WmtsTileMatrix WmtsTileMatrix => wmtsTileMatrix;
@ -50,7 +48,8 @@ namespace MapControl
protected override void OnRender(DrawingContext drawingContext) protected override void OnRender(DrawingContext drawingContext)
{ {
drawingContext.DrawRectangle(imageBrush, null, new Rect(RenderSize)); drawingContext.PushTransform(transform);
drawingContext.DrawImage(bitmap, new Rect(0d, 0d, bitmap.PixelWidth, bitmap.PixelHeight));
} }
public void UpdateRenderTransform(ViewTransform viewTransform) public void UpdateRenderTransform(ViewTransform viewTransform)
@ -59,8 +58,7 @@ namespace MapControl
// //
var tileMatrixOrigin = new Point(WmtsTileMatrix.TileWidth * TileMatrix.XMin, WmtsTileMatrix.TileHeight * TileMatrix.YMin); var tileMatrixOrigin = new Point(WmtsTileMatrix.TileWidth * TileMatrix.XMin, WmtsTileMatrix.TileHeight * TileMatrix.YMin);
((MatrixTransform)imageBrush.Transform).Matrix = transform.Matrix = viewTransform.GetTileLayerTransform(WmtsTileMatrix.Scale, WmtsTileMatrix.TopLeft, tileMatrixOrigin);
viewTransform.GetTileLayerTransform(WmtsTileMatrix.Scale, WmtsTileMatrix.TopLeft, tileMatrixOrigin);
} }
public bool UpdateTiles(ViewTransform viewTransform, double viewWidth, double viewHeight) public bool UpdateTiles(ViewTransform viewTransform, double viewWidth, double viewHeight)
@ -99,21 +97,17 @@ namespace MapControl
TileMatrix = new TileMatrix(TileMatrix.ZoomLevel, xMin, yMin, xMax, yMax); TileMatrix = new TileMatrix(TileMatrix.ZoomLevel, xMin, yMin, xMax, yMax);
CreateBitmap(); bitmap = new WriteableBitmap(
WmtsTileMatrix.TileWidth * TileMatrix.Width,
WmtsTileMatrix.TileHeight * TileMatrix.Height,
96, 96, PixelFormats.Pbgra32, null);
CreateTiles(); CreateTiles();
InvalidateVisual();
return true; return true;
} }
private void CreateBitmap()
{
var width = WmtsTileMatrix.TileWidth * TileMatrix.Width;
var height = WmtsTileMatrix.TileHeight * TileMatrix.Height;
imageBrush.ImageSource = new WriteableBitmap(width, height, 96, 96, PixelFormats.Pbgra32, null);
imageBrush.Viewport = new Rect(0, 0, width, height);
}
private void CreateTiles() private void CreateTiles()
{ {
var tiles = new List<BitmapTile>(TileMatrix.Width * TileMatrix.Height); var tiles = new List<BitmapTile>(TileMatrix.Width * TileMatrix.Height);
@ -160,8 +154,7 @@ namespace MapControl
var x = width * (tile.X - TileMatrix.XMin); var x = width * (tile.X - TileMatrix.XMin);
var y = height * (tile.Y - TileMatrix.YMin); var y = height * (tile.Y - TileMatrix.YMin);
((WriteableBitmap)imageBrush.ImageSource).WritePixels( bitmap.WritePixels(new Int32Rect(x, y, width, height), tile.PixelBuffer, 4 * WmtsTileMatrix.TileWidth, 0);
new Int32Rect(x, y, width, height), tile.PixelBuffer, 4 * WmtsTileMatrix.TileWidth, 0);
} }
private void OnTileCompleted(object sender, EventArgs e) private void OnTileCompleted(object sender, EventArgs e)

21
MapControl/WPF/DrawingTileMatrixLayer.WPF.cs
View file

@ -8,17 +8,22 @@ namespace MapControl
{ {
public class DrawingTileMatrixLayer(WmtsTileMatrix wmtsTileMatrix, int zoomLevel) : UIElement public class DrawingTileMatrixLayer(WmtsTileMatrix wmtsTileMatrix, int zoomLevel) : UIElement
{ {
private readonly MatrixTransform transform = new MatrixTransform();
public WmtsTileMatrix WmtsTileMatrix => wmtsTileMatrix; public WmtsTileMatrix WmtsTileMatrix => wmtsTileMatrix;
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<DrawingTile> Tiles { get; private set; } = []; public IEnumerable<DrawingTile> Tiles { get; private set; } = [];
public DrawingGroup Drawing { get; } = new DrawingGroup { Transform = new MatrixTransform() };
protected override void OnRender(DrawingContext drawingContext) protected override void OnRender(DrawingContext drawingContext)
{ {
drawingContext.DrawDrawing(Drawing); drawingContext.PushTransform(transform);
foreach (var tile in Tiles)
{
drawingContext.DrawDrawing(tile.Drawing);
}
} }
public void UpdateRenderTransform(ViewTransform viewTransform) public void UpdateRenderTransform(ViewTransform viewTransform)
@ -27,8 +32,7 @@ namespace MapControl
// //
var tileMatrixOrigin = new Point(WmtsTileMatrix.TileWidth * TileMatrix.XMin, WmtsTileMatrix.TileHeight * TileMatrix.YMin); var tileMatrixOrigin = new Point(WmtsTileMatrix.TileWidth * TileMatrix.XMin, WmtsTileMatrix.TileHeight * TileMatrix.YMin);
((MatrixTransform)Drawing.Transform).Matrix = transform.Matrix = viewTransform.GetTileLayerTransform(WmtsTileMatrix.Scale, WmtsTileMatrix.TopLeft, tileMatrixOrigin);
viewTransform.GetTileLayerTransform(WmtsTileMatrix.Scale, WmtsTileMatrix.TopLeft, tileMatrixOrigin);
} }
public bool UpdateTiles(ViewTransform viewTransform, double viewWidth, double viewHeight) public bool UpdateTiles(ViewTransform viewTransform, double viewWidth, double viewHeight)
@ -68,15 +72,14 @@ namespace MapControl
TileMatrix = new TileMatrix(TileMatrix.ZoomLevel, xMin, yMin, xMax, yMax); TileMatrix = new TileMatrix(TileMatrix.ZoomLevel, xMin, yMin, xMax, yMax);
CreateTiles(); CreateTiles();
InvalidateVisual();
return true; return true;
} }
private void CreateTiles() private void CreateTiles()
{ {
var tileCount = TileMatrix.Width * TileMatrix.Height; var tiles = new List<DrawingTile>(TileMatrix.Width * TileMatrix.Height);
var tiles = new List<DrawingTile>(tileCount);
var drawings = new DrawingCollection(tileCount);
for (var y = TileMatrix.YMin; y <= TileMatrix.YMax; y++) for (var y = TileMatrix.YMin; y <= TileMatrix.YMax; y++)
{ {
@ -104,12 +107,10 @@ namespace MapControl
WmtsTileMatrix.TileHeight); WmtsTileMatrix.TileHeight);
tiles.Add(tile); tiles.Add(tile);
drawings.Add(tile.Drawing);
} }
} }
Tiles = tiles; Tiles = tiles;
Drawing.Children = drawings;
} }
} }
} }