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

Update MapPanel.cs

Browse source
This commit is contained in:
ClemensF 2021-01-13 21:46:23 +01:00
parent 7a9cd455b2
commit e1cd5a64b7
1 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
MapControl/Shared/MapPanel.cs
View file

@ -114,18 +114,16 @@ namespace MapControl
return null;
}
var pos = parentMap.LocationToView(location);
var position = parentMap.LocationToView(location);
if (parentMap.MapProjection.IsNormalCylindrical &&
(pos.X < 0d || pos.X > parentMap.RenderSize.Width ||
pos.Y < 0d || pos.Y > parentMap.RenderSize.Height))
if (parentMap.MapProjection.IsNormalCylindrical && !IsVisible(position))
{
location = new Location(location.Latitude, parentMap.ConstrainedLongitude(location.Longitude));
pos = parentMap.LocationToView(location);
position = parentMap.LocationToView(location);
}
return pos;
return position;
}
/// <summary>
@ -142,22 +140,20 @@ namespace MapControl
public ViewRect GetViewRect(Rect rect)
{
var center = new Point(rect.X + rect.Width / 2d, rect.Y + rect.Height / 2d);
var pos = parentMap.ViewTransform.MapToView(center);
var position = parentMap.ViewTransform.MapToView(center);
if (parentMap.MapProjection.IsNormalCylindrical &&
(pos.X < 0d || pos.X > parentMap.RenderSize.Width ||
pos.Y < 0d || pos.Y > parentMap.RenderSize.Height))
if (parentMap.MapProjection.IsNormalCylindrical && !IsVisible(position))
{
var location = parentMap.MapProjection.MapToLocation(center);
location.Longitude = parentMap.ConstrainedLongitude(location.Longitude);
pos = parentMap.LocationToView(location);
position = parentMap.LocationToView(location);
}
var width = rect.Width * parentMap.ViewTransform.Scale;
var height = rect.Height * parentMap.ViewTransform.Scale;
var x = pos.X - width / 2d;
var y = pos.Y - height / 2d;
var x = position.X - width / 2d;
var y = position.Y - height / 2d;
return new ViewRect(x, y, width, height, parentMap.ViewTransform.Rotation);
}
@ -213,9 +209,7 @@ namespace MapControl
if (GetAutoCollapse(element))
{
if (position.HasValue &&
(position.Value.X < 0d || position.Value.X > parentMap.RenderSize.Width ||
position.Value.Y < 0d || position.Value.Y > parentMap.RenderSize.Height))
if (position.HasValue && !IsVisible(position.Value))
{
element.SetValue(VisibilityProperty, Visibility.Collapsed);
}
@ -248,6 +242,12 @@ namespace MapControl
return finalSize;
}
private bool IsVisible(Point point)
{
return point.X >= 0d && point.X <= parentMap.RenderSize.Width
&& point.Y >= 0d && point.Y <= parentMap.RenderSize.Height;
}
private static void ArrangeElement(FrameworkElement element, ViewRect rect)
{
element.Width = rect.Width;