From 3afbdadf0c920eb067d23151b5f7952122715e0d Mon Sep 17 00:00:00 2001 From: ClemensFischer Date: Sat, 4 Jan 2025 15:18:27 +0100 Subject: [PATCH] Discard map rectangle coercion --- MapControl/Shared/MapImageLayer.cs | 6 +++--- MapControl/Shared/MapPanel.cs | 18 ------------------ 2 files changed, 3 insertions(+), 21 deletions(-) diff --git a/MapControl/Shared/MapImageLayer.cs b/MapControl/Shared/MapImageLayer.cs index 2d83dae1..4a4db6c6 100644 --- a/MapControl/Shared/MapImageLayer.cs +++ b/MapControl/Shared/MapImageLayer.cs @@ -50,7 +50,7 @@ namespace MapControl DependencyPropertyHelper.Register(nameof(MapForeground)); public static readonly DependencyProperty LoadingProgressProperty = - DependencyPropertyHelper.Register( nameof(LoadingProgress), 1d); + DependencyPropertyHelper.Register(nameof(LoadingProgress), 1d); private readonly Progress loadingProgress; private readonly DispatcherTimer updateTimer; @@ -181,8 +181,8 @@ namespace MapControl } else { - updateTimer.Stop(); updateInProgress = true; + updateTimer.Stop(); ImageSource image = null; var boundingBox = GetImageBoundingBox(); @@ -205,7 +205,7 @@ namespace MapControl } } - protected BoundingBox GetImageBoundingBox() + private BoundingBox GetImageBoundingBox() { BoundingBox boundingBox = null; diff --git a/MapControl/Shared/MapPanel.cs b/MapControl/Shared/MapPanel.cs index 5d7d418b..dd572a0f 100644 --- a/MapControl/Shared/MapPanel.cs +++ b/MapControl/Shared/MapPanel.cs @@ -234,24 +234,6 @@ namespace MapControl { var center = new Point(mapRect.X + mapRect.Width / 2d, mapRect.Y + mapRect.Height / 2d); var position = parentMap.ViewTransform.MapToView(center); - - if (parentMap.MapProjection.Type <= MapProjectionType.NormalCylindrical && - !parentMap.InsideViewBounds(position)) - { - var location = parentMap.MapProjection.MapToLocation(center); - - if (location != null) - { - var coercedPosition = parentMap.LocationToView( - new Location(location.Latitude, parentMap.CoerceLongitude(location.Longitude))); - - if (coercedPosition.HasValue) - { - position = coercedPosition.Value; - } - } - } - var width = mapRect.Width * parentMap.ViewTransform.Scale; var height = mapRect.Height * parentMap.ViewTransform.Scale; var x = position.X - width / 2d;