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

Version 4.16.0. Improved MapProjection.

Browse source
This commit is contained in:
ClemensF 2019-12-16 18:35:04 +01:00
parent 1f66a9f878
commit 0dbdd4c810
5 changed files with 24 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
MapControl/Shared/AzimuthalEquidistantProjection.cs
View file

@ -36,7 +36,7 @@ namespace MapControl
{ {
if (point.X == 0d && point.Y == 0d) if (point.X == 0d && point.Y == 0d)
{ {
return ProjectionCenter; return new Location(ProjectionCenter.Latitude, ProjectionCenter.Longitude);
} }
var azimuth = Math.Atan2(point.X, point.Y); var azimuth = Math.Atan2(point.X, point.Y);

31
MapControl/Shared/AzimuthalProjection.cs
View file

@ -71,18 +71,27 @@ namespace MapControl
/// </summary> /// </summary>
public static Location GetLocation(Location location, double azimuth, double distance) public static Location GetLocation(Location location, double azimuth, double distance)
{ {
var lat1 = location.Latitude * Math.PI / 180d; var lat = location.Latitude;
var sinDistance = Math.Sin(distance); var lon = location.Longitude;
var cosDistance = Math.Cos(distance);
var cosAzimuth = Math.Cos(azimuth);
var sinAzimuth = Math.Sin(azimuth);
var cosLat1 = Math.Cos(lat1);
var sinLat1 = Math.Sin(lat1);
var sinLat2 = sinLat1 * cosDistance + cosLat1 * sinDistance * cosAzimuth;
var lat2 = Math.Asin(Math.Min(Math.Max(sinLat2, -1d), 1d));
var dLon = Math.Atan2(sinDistance * sinAzimuth, cosLat1 * cosDistance - sinLat1 * sinDistance * cosAzimuth);
return new Location(lat2 * 180d / Math.PI, location.Longitude + dLon * 180d / Math.PI); if (distance > 0d)
{
var lat1 = lat * Math.PI / 180d;
var sinDistance = Math.Sin(distance);
var cosDistance = Math.Cos(distance);
var cosAzimuth = Math.Cos(azimuth);
var sinAzimuth = Math.Sin(azimuth);
var cosLat1 = Math.Cos(lat1);
var sinLat1 = Math.Sin(lat1);
var sinLat2 = sinLat1 * cosDistance + cosLat1 * sinDistance * cosAzimuth;
var lat2 = Math.Asin(Math.Min(Math.Max(sinLat2, -1d), 1d));
var dLon = Math.Atan2(sinDistance * sinAzimuth, cosLat1 * cosDistance - sinLat1 * sinDistance * cosAzimuth);
lat = lat2 * 180d / Math.PI;
lon += dLon * 180d / Math.PI;
}
return new Location(lat, lon);
} }
} }
} }

2
MapControl/Shared/GnomonicProjection.cs
View file

@ -41,7 +41,7 @@ namespace MapControl
{ {
if (point.X == 0d && point.Y == 0d) if (point.X == 0d && point.Y == 0d)
{ {
return ProjectionCenter; return new Location(ProjectionCenter.Latitude, ProjectionCenter.Longitude);
} }
var azimuth = Math.Atan2(point.X, point.Y); var azimuth = Math.Atan2(point.X, point.Y);

2
MapControl/Shared/OrthographicProjection.cs
View file

@ -40,7 +40,7 @@ namespace MapControl
{ {
if (point.X == 0d && point.Y == 0d) if (point.X == 0d && point.Y == 0d)
{ {
return ProjectionCenter; return new Location(ProjectionCenter.Latitude, ProjectionCenter.Longitude);
} }
var s = TrueScale * 180d / Math.PI; var s = TrueScale * 180d / Math.PI;

2
MapControl/Shared/StereographicProjection.cs
View file

@ -39,7 +39,7 @@ namespace MapControl
{ {
if (point.X == 0d && point.Y == 0d) if (point.X == 0d && point.Y == 0d)
{ {
return ProjectionCenter; return new Location(ProjectionCenter.Latitude, ProjectionCenter.Longitude);
} }
var azimuth = Math.Atan2(point.X, point.Y); var azimuth = Math.Atan2(point.X, point.Y);