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

Update MapPanel.cs

Browse source
This commit is contained in:
ClemensFischer 2025-03-24 20:59:11 +01:00
parent e5122fc7ff
commit 0511b439e1
1 changed files with 23 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
MapControl/Shared/MapPanel.cs
View file

@ -202,30 +202,6 @@ namespace MapControl
return position; return position;
} }
private Tuple<Rect, double> GetViewRect(BoundingBox boundingBox)
{
if (boundingBox is LatLonBox latLonBox)
{
var rotatedRect = parentMap.MapProjection.LatLonBoxToMap(latLonBox);
if (rotatedRect != null)
{
return new Tuple<Rect, double>(GetViewRect(rotatedRect.Item1), rotatedRect.Item2);
}
}
else
{
var mapRect = parentMap.MapProjection.BoundingBoxToMap(boundingBox);
if (mapRect.HasValue)
{
return new Tuple<Rect, double>(GetViewRect(mapRect.Value), 0d);
}
}
return null;
}
private Rect GetViewRect(Rect mapRect) private Rect GetViewRect(Rect mapRect)
{ {
var center = new Point(mapRect.X + mapRect.Width / 2d, mapRect.Y + mapRect.Height / 2d); var center = new Point(mapRect.X + mapRect.Width / 2d, mapRect.Y + mapRect.Height / 2d);
@ -295,16 +271,33 @@ namespace MapControl
private void ArrangeElement(FrameworkElement element, BoundingBox boundingBox) private void ArrangeElement(FrameworkElement element, BoundingBox boundingBox)
{ {
var viewRect = GetViewRect(boundingBox); Rect? mapRect = null;
var rotation = 0d;
if (viewRect != null) if (boundingBox is LatLonBox latLonBox)
{ {
element.Width = viewRect.Item1.Width; var rotatedRect = parentMap.MapProjection.LatLonBoxToMap(latLonBox);
element.Height = viewRect.Item1.Height;
element.Arrange(viewRect.Item1); if (rotatedRect != null)
{
mapRect = rotatedRect.Item1;
rotation = -rotatedRect.Item2;
}
}
else
{
mapRect = parentMap.MapProjection.BoundingBoxToMap(boundingBox);
}
var rotation = parentMap.ViewTransform.Rotation - viewRect.Item2; if (mapRect.HasValue)
{
var viewRect = GetViewRect(mapRect.Value);
element.Width = viewRect.Width;
element.Height = viewRect.Height;
element.Arrange(viewRect);
rotation += parentMap.ViewTransform.Rotation;
if (element.RenderTransform is RotateTransform rotateTransform) if (element.RenderTransform is RotateTransform rotateTransform)
{ {