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

Update MapPanel.cs

Browse source
This commit is contained in:
ClemensF 2021-01-15 18:00:51 +01:00
parent bcc033e5cd
commit 2208f6c3da
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
MapControl/Shared/MapPanel.cs
View file

@ -116,7 +116,7 @@ namespace MapControl
var position = parentMap.LocationToView(location);
if (parentMap.MapProjection.IsNormalCylindrical && !IsInsideViewport(position))
if (parentMap.MapProjection.IsNormalCylindrical && IsOutsideViewport(position))
{
location = new Location(location.Latitude, parentMap.ConstrainedLongitude(location.Longitude));
@ -142,7 +142,7 @@ namespace MapControl
var center = new Point(rect.X + rect.Width / 2d, rect.Y + rect.Height / 2d);
var position = parentMap.ViewTransform.MapToView(center);
if (parentMap.MapProjection.IsNormalCylindrical && !IsInsideViewport(position))
if (parentMap.MapProjection.IsNormalCylindrical && IsOutsideViewport(position))
{
var location = parentMap.MapProjection.MapToLocation(center);
location.Longitude = parentMap.ConstrainedLongitude(location.Longitude);
@ -209,7 +209,7 @@ namespace MapControl
if (GetAutoCollapse(element))
{
if (position.HasValue && !IsInsideViewport(position.Value))
if (position.HasValue && IsOutsideViewport(position.Value))
{
element.SetValue(VisibilityProperty, Visibility.Collapsed);
}
@ -242,10 +242,10 @@ namespace MapControl
return finalSize;
}
private bool IsInsideViewport(Point point)
private bool IsOutsideViewport(Point point)
{
return point.X >= 0d && point.X <= parentMap.RenderSize.Width
&& point.Y >= 0d && point.Y <= parentMap.RenderSize.Height;
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)