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

Improve MapProjection

Browse source
This commit is contained in:
ClemensFischer 2022-12-08 10:37:56 +01:00
parent d8c416d552
commit 45cda387e4
2 changed files with 8 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
MapControl/Shared/AzimuthalProjection.cs
View file

@ -20,15 +20,9 @@ namespace MapControl
{ {
var center = MapToLocation(mapRect.Center); var center = MapToLocation(mapRect.Center);
if (center == null) return center != null
{ ? new CenteredBoundingBox(center, mapRect.Width / Wgs84MeterPerDegree, mapRect.Height / Wgs84MeterPerDegree)
return null; : null;
}
var width = mapRect.Width / Wgs84MeterPerDegree;
var height = mapRect.Height / Wgs84MeterPerDegree;
return new CenteredBoundingBox(center, width, height);
} }
/// <summary> /// <summary>

8
MapControl/Shared/MapProjection.cs
View file

@ -72,6 +72,8 @@ namespace MapControl
/// </summary> /// </summary>
public virtual MapRect BoundingBoxToMapRect(BoundingBox boundingBox) public virtual MapRect BoundingBoxToMapRect(BoundingBox boundingBox)
{ {
MapRect mapRect = null;
if (!double.IsNaN(boundingBox.South) && !double.IsNaN(boundingBox.West) && if (!double.IsNaN(boundingBox.South) && !double.IsNaN(boundingBox.West) &&
!double.IsNaN(boundingBox.North) && !double.IsNaN(boundingBox.East)) !double.IsNaN(boundingBox.North) && !double.IsNaN(boundingBox.East))
{ {
@ -80,7 +82,7 @@ namespace MapControl
if (p1.HasValue && p2.HasValue) if (p1.HasValue && p2.HasValue)
{ {
return new MapRect(p1.Value, p2.Value); mapRect = new MapRect(p1.Value, p2.Value);
} }
} }
else if (boundingBox.Center != null) else if (boundingBox.Center != null)
@ -94,11 +96,11 @@ namespace MapControl
var x = center.Value.X - width / 2d; var x = center.Value.X - width / 2d;
var y = center.Value.Y - height / 2d; var y = center.Value.Y - height / 2d;
return new MapRect(x, y, x + width, y + height); mapRect = new MapRect(x, y, x + width, y + height);
} }
} }
return null; return mapRect;
} }
/// <summary> /// <summary>