ClemensFischer/XAML-Map-Control
1
0
Fork 0
mirror of https://github.com/ClemensFischer/XAML-Map-Control.git synced 2026-01-11 11:10:19 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Updated MapProjection

Browse source
This commit is contained in:
ClemensFischer 2025-12-30 08:27:52 +01:00
parent 5d8f1b5ff0
commit 612a4048c0
2 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
MapControl/Shared/MapPanel.cs
View file

@ -286,18 +286,12 @@ namespace MapControl
private void ArrangeElement(FrameworkElement element, BoundingBox boundingBox)
{
Rect? mapRect = null;
Rect? mapRect;
var rotation = 0d;
if (boundingBox is LatLonBox latLonBox)
{
var rotatedRect = parentMap.MapProjection.LatLonBoxToMap(latLonBox);
if (rotatedRect.HasValue)
{
mapRect = rotatedRect.Value.Item1;
rotation = -rotatedRect.Value.Item2;
}
(mapRect, rotation) = parentMap.MapProjection.LatLonBoxToMap(latLonBox);
}
else
{

12
MapControl/Shared/MapProjection.cs
View file

@ -114,12 +114,13 @@ namespace MapControl
/// Transforms a LatLonBox in geographic coordinates to a rotated Rect in projected map coordinates.
/// Returns null when the LatLonBox can not be transformed.
/// </summary>
public virtual (Rect, double)? LatLonBoxToMap(LatLonBox latLonBox)
public virtual (Rect?, double) LatLonBoxToMap(LatLonBox latLonBox)
{
(Rect, double)? rotatedRect = null;
Point? center, north, south, west, east;
Rect? rect = null;
var rotation = 0d;
var centerLatitude = latLonBox.Center.Latitude;
var centerLongitude = latLonBox.Center.Longitude;
Point? center, north, south, west, east;
if ((center = LocationToMap(centerLatitude, centerLongitude)).HasValue &&
(north = LocationToMap(latLonBox.North, centerLongitude)).HasValue &&
@ -142,10 +143,11 @@ namespace MapControl
var r1 = (Math.Atan2(dy1, dx1) * 180d / Math.PI + 180d) % 360d - 180d;
var r2 = (Math.Atan2(-dx2, dy2) * 180d / Math.PI + 180d) % 360d - 180d;
rotatedRect = (new Rect(x, y, width, height), latLonBox.Rotation + (r1 + r2) / 2d);
rect = new Rect(x, y, width, height);
rotation = latLonBox.Rotation + (r1 + r2) / 2d;
}
return rotatedRect;
return (rect, rotation);
}
public override string ToString()