diff --git a/MapControl/Shared/MapBase.cs b/MapControl/Shared/MapBase.cs index cbd1ffb8..c5cddb4a 100644 --- a/MapControl/Shared/MapBase.cs +++ b/MapControl/Shared/MapBase.cs @@ -374,7 +374,7 @@ namespace MapControl } } - internal bool InsideViewport(Point point) + internal bool InsideViewBounds(Point point) => point.X >= 0d && point.Y >= 0d && point.X <= ActualWidth && point.Y <= ActualHeight; internal double CoerceLongitude(double longitude) diff --git a/MapControl/Shared/MapPanel.cs b/MapControl/Shared/MapPanel.cs index ae8c56c2..8cd67b0c 100644 --- a/MapControl/Shared/MapPanel.cs +++ b/MapControl/Shared/MapPanel.cs @@ -192,7 +192,7 @@ namespace MapControl var position = parentMap.LocationToView(location); if (parentMap.MapProjection.Type <= MapProjectionType.NormalCylindrical && - position.HasValue && !parentMap.InsideViewport(position.Value)) + position.HasValue && !parentMap.InsideViewBounds(position.Value)) { var coercedPosition = parentMap.LocationToView( new Location(location.Latitude, parentMap.CoerceLongitude(location.Longitude))); @@ -225,7 +225,7 @@ namespace MapControl var projection = parentMap.MapProjection; if (projection.Type <= MapProjectionType.NormalCylindrical && - !parentMap.InsideViewport(position)) + !parentMap.InsideViewBounds(position)) { var location = projection.MapToLocation(center); @@ -261,7 +261,7 @@ namespace MapControl if (GetAutoCollapse(element)) { - SetVisible(element, position.HasValue && parentMap.InsideViewport(position.Value)); + SetVisible(element, position.HasValue && parentMap.InsideViewBounds(position.Value)); } if (position.HasValue) diff --git a/MapControl/Shared/MapPath.cs b/MapControl/Shared/MapPath.cs index 309df5f8..ad65d4be 100644 --- a/MapControl/Shared/MapPath.cs +++ b/MapControl/Shared/MapPath.cs @@ -84,7 +84,7 @@ namespace MapControl { var position = parentMap.LocationToView(location); - if (position.HasValue && !parentMap.InsideViewport(position.Value)) + if (position.HasValue && !parentMap.InsideViewBounds(position.Value)) { longitudeOffset = parentMap.CoerceLongitude(location.Longitude) - location.Longitude; }