ClemensFischer/XAML-Map-Control
1
0
Fork 0
mirror of https://github.com/ClemensFischer/XAML-Map-Control.git synced 2026-02-06 15:54:14 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

MapGraticule

Browse source
This commit is contained in:
ClemensFischer 2026-01-31 00:07:40 +01:00
parent 5c8d000378
commit 2a45c1165c
2 changed files with 31 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
MapControl/Shared/MapGraticule.cs
View file

@ -193,12 +193,8 @@ namespace MapControl
for (int i = 0; i <= numPoints; i++)
{
var p = ParentMap.LocationToView(startLatitude + i * deltaLatitude, longitude);
visible = visible ||
p.X >= 0d && p.X <= ParentMap.ActualWidth &&
p.Y >= 0d && p.Y <= ParentMap.ActualHeight;
points.Add(p);
visible = visible || ParentMap.InsideViewBounds(p);
}
if (visible && points.Count >= 2)
@ -211,44 +207,42 @@ namespace MapControl
private void GetLatitudeRange(double lineDistance, out double minLatitude, out double maxLatitude)
{
var width = ParentMap.ActualWidth;
var height = ParentMap.ActualHeight;
var locations = new List<Location>
{
ParentMap.ViewToLocation(new Point(0d, 0d)),
ParentMap.ViewToLocation(new Point(width, 0d)),
ParentMap.ViewToLocation(new Point(0d, height)),
ParentMap.ViewToLocation(new Point(width, height)),
ParentMap.ViewToLocation(new Point(width / 2d, 0d)),
ParentMap.ViewToLocation(new Point(width / 2d, height)),
ParentMap.ViewToLocation(new Point(0d, height / 2d)),
ParentMap.ViewToLocation(new Point(width, height / 2d)),
};
var minLat = 90d;
var maxLat = -90d;
var pole = ParentMap.LocationToView(90d, 0d);
if (pole.X >= 0d && pole.X <= width && pole.Y >= 0d && pole.Y <= height)
if (ParentMap.InsideViewBounds(ParentMap.LocationToView(90d, 0d)))
{
locations.Add(new Location(90d, 0d));
maxLat = 90d;
}
pole = ParentMap.LocationToView(-90d, 0d);
if (pole.X >= 0d && pole.X <= width && pole.Y >= 0d && pole.Y <= height)
if (ParentMap.InsideViewBounds(ParentMap.LocationToView(-90d, 0d)))
{
locations.Add(new Location(-90d, 0d));
minLat = -90d;
}
var latitudes = locations.Select(loc => loc.Latitude).Distinct();
var south = -90d;
var north = 90d;
if (latitudes.Any())
if (minLat > -90d || maxLat < 90d)
{
south = latitudes.Min();
north = latitudes.Max();
var width = ParentMap.ActualWidth;
var height = ParentMap.ActualHeight;
var locations = new Location[]
{
ParentMap.ViewToLocation(new Point(0d, 0d)),
ParentMap.ViewToLocation(new Point(width, 0d)),
ParentMap.ViewToLocation(new Point(0d, height)),
ParentMap.ViewToLocation(new Point(width, height)),
ParentMap.ViewToLocation(new Point(width / 2d, 0d)),
ParentMap.ViewToLocation(new Point(width / 2d, height)),
ParentMap.ViewToLocation(new Point(0d, height / 2d)),
ParentMap.ViewToLocation(new Point(width, height / 2d)),
};
var latitudes = locations.Select(loc => loc.Latitude).Distinct();
minLat = Math.Min(minLat, latitudes.Min());
maxLat = Math.Max(maxLat, latitudes.Max());
}
minLatitude = Math.Max(Math.Floor(south / lineDistance - 1d) * lineDistance, -90d);
maxLatitude = Math.Min(Math.Ceiling(north / lineDistance + 1d) * lineDistance, 90d);
minLatitude = Math.Max(Math.Floor(minLat / lineDistance - 1d) * lineDistance, -90d);
maxLatitude = Math.Min(Math.Ceiling(maxLat / lineDistance + 1d) * lineDistance, 90d);
}
private double GetLineDistance()
@ -272,13 +266,12 @@ namespace MapControl
i++;
}
return Math.Min(lineDistances[i] / scale, 60d);
return Math.Min(lineDistances[i] / scale, 30d);
}
private void AddLabel(List<Label> labels, string labelFormat, double latitude, double longitude, Point position, double rotation = 0d)
{
if (position.X >= 0d && position.X <= ParentMap.ActualWidth &&
position.Y >= 0d && position.Y <= ParentMap.ActualHeight)
if (ParentMap.InsideViewBounds(position))
{
rotation = (rotation + ParentMap.ViewTransform.Rotation) % 360d;

5
MapControl/Shared/WmsImageLayer.cs
View file

@ -160,9 +160,8 @@ namespace MapControl
{
string response = null;
if (ServiceUri != null && HasLayer && ParentMap != null &&
position.X >= 0d && position.X <= ParentMap.ActualWidth &&
position.Y >= 0d && position.Y <= ParentMap.ActualHeight)
if (ServiceUri != null && HasLayer &&
ParentMap != null && ParentMap.InsideViewBounds(position))
{
var uri = GetFeatureInfoRequestUri(position, format);