From 2208f6c3daba2cb79d1cb30a4929306b1c0fbdf5 Mon Sep 17 00:00:00 2001 From: ClemensF Date: Fri, 15 Jan 2021 18:00:51 +0100 Subject: [PATCH] Update MapPanel.cs --- MapControl/Shared/MapPanel.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/MapControl/Shared/MapPanel.cs b/MapControl/Shared/MapPanel.cs index bf11106f..89cadfd9 100644 --- a/MapControl/Shared/MapPanel.cs +++ b/MapControl/Shared/MapPanel.cs @@ -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)