ClemensFischer/XAML-Map-Control
1
0
Fork 0
mirror of https://github.com/ClemensFischer/XAML-Map-Control.git synced 2026-04-20 22:05:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed normal cylindrical graticule

Browse source
This commit is contained in:
ClemensFischer 2026-02-07 13:47:33 +01:00
parent 72407246ae
commit 8eb94733cd
2 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

13
MapControl/Shared/MapGraticule.cs
View file

@ -95,8 +95,9 @@ namespace MapControl
{ {
var lineDistance = GetLineDistance(false); var lineDistance = GetLineDistance(false);
var labelFormat = GetLabelFormat(lineDistance); var labelFormat = GetLabelFormat(lineDistance);
var southWest = ParentMap.ViewToLocation(new Point(0d, ParentMap.ActualHeight)); var mapRect = ParentMap.ViewTransform.ViewToMapBounds(new Rect(0d, 0d, ParentMap.ActualWidth, ParentMap.ActualHeight));
var northEast = ParentMap.ViewToLocation(new Point(ParentMap.ActualWidth, 0d)); var southWest = ParentMap.MapProjection.MapToLocation(mapRect.X, mapRect.Y);
var northEast = ParentMap.MapProjection.MapToLocation(mapRect.X + mapRect.Width, mapRect.Y + mapRect.Height);
var latLabelStart = Math.Ceiling(southWest.Latitude / lineDistance) * lineDistance; var latLabelStart = Math.Ceiling(southWest.Latitude / lineDistance) * lineDistance;
var lonLabelStart = Math.Ceiling(southWest.Longitude / lineDistance) * lineDistance; var lonLabelStart = Math.Ceiling(southWest.Longitude / lineDistance) * lineDistance;
@ -115,7 +116,7 @@ namespace MapControl
for (var lat = latLabelStart; lat <= northEast.Latitude; lat += lineDistance) for (var lat = latLabelStart; lat <= northEast.Latitude; lat += lineDistance)
{ {
AddLabel(labels, labelFormat, lat, lon, ParentMap.LocationToView(lat, lon)); AddLabel(labels, labelFormat, lat, lon, ParentMap.LocationToView(lat, lon), 0d);
} }
} }
} }
@ -167,7 +168,7 @@ namespace MapControl
{ {
var p = ParentMap.LocationToView(lat, lon); var p = ParentMap.LocationToView(lat, lon);
points.Add(p); points.Add(p);
AddLabel(labels, labelFormat, lat, lon, p); AddLabel(labels, labelFormat, lat, lon, p, -ParentMap.MapProjection.GridConvergence(lat, lon));
for (int j = 1; j < interpolationCount; j++) for (int j = 1; j < interpolationCount; j++)
{ {
@ -225,11 +226,11 @@ namespace MapControl
return visible; return visible;
} }
private void AddLabel(List<Label> labels, string labelFormat, double lat, double lon, Point position) private void AddLabel(List<Label> labels, string labelFormat, double lat, double lon, Point position, double rotation)
{ {
if (lat > -90d && lat < 90d && ParentMap.InsideViewBounds(position)) if (lat > -90d && lat < 90d && ParentMap.InsideViewBounds(position))
{ {
var rotation = (ParentMap.ViewTransform.Rotation - ParentMap.MapProjection.GridConvergence(lat, lon)) % 360d; rotation = ((rotation + ParentMap.ViewTransform.Rotation) % 360d + 540d) % 360d - 180d;
if (rotation < -90d) if (rotation < -90d)
{ {

2
MapControl/Shared/ViewTransform.cs
View file

@ -59,7 +59,7 @@ namespace MapControl
public void SetTransform(Point mapCenter, Point viewCenter, double scale, double rotation) public void SetTransform(Point mapCenter, Point viewCenter, double scale, double rotation)
{ {
Scale = scale; Scale = scale;
Rotation = ((rotation % 360d) + 360d) % 360d; Rotation = (rotation % 360d + 540d) % 360d - 180d;
var transform = new Matrix(scale, 0d, 0d, -scale, -scale * mapCenter.X, scale * mapCenter.Y); var transform = new Matrix(scale, 0d, 0d, -scale, -scale * mapCenter.X, scale * mapCenter.Y);
transform.Rotate(Rotation); transform.Rotate(Rotation);