From ee136831e6d0fe7ef208d55d10e56940a13c84de Mon Sep 17 00:00:00 2001
From: ClemensFischer <fischer.clemens@gmail.com>
Date: Tue, 10 Jun 2025 09:13:48 +0200
Subject: [PATCH] Updated MapGraticule

---
 MapControl/Shared/MapGraticule.cs      |  8 ++++----
 MapControl/WinUI/MapGraticule.WinUI.cs | 11 ++++++++---
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/MapControl/Shared/MapGraticule.cs b/MapControl/Shared/MapGraticule.cs
index 6478e767..12c21a89 100644
--- a/MapControl/Shared/MapGraticule.cs
+++ b/MapControl/Shared/MapGraticule.cs
@@ -107,7 +107,7 @@ namespace MapControl
                 labelFormat, hemisphere, seconds / 3600, seconds / 60 % 60, seconds % 60);
         }
 
-        private void AddLabel(ICollection<Label> labels, Location location, Point position, double? rotation = null)
+        private void AddLabel(List<Label> labels, Location location, Point position, double? rotation = null)
         {
             if (position.X >= 0d && position.X <= ParentMap.ActualWidth &&
                 position.Y >= 0d && position.Y <= ParentMap.ActualHeight)
@@ -135,7 +135,7 @@ namespace MapControl
             }
         }
 
-        private ICollection<Label> DrawGraticule(PathFigureCollection figures)
+        private List<Label> DrawGraticule(PathFigureCollection figures)
         {
             var labels = new List<Label>();
 
@@ -155,7 +155,7 @@ namespace MapControl
             return labels;
         }
 
-        private void DrawCylindricalGraticule(PathFigureCollection figures, ICollection<Label> labels)
+        private void DrawCylindricalGraticule(PathFigureCollection figures, List<Label> labels)
         {
             var boundingBox = ParentMap.ViewRectToBoundingBox(new Rect(0, 0, ParentMap.ActualWidth, ParentMap.ActualHeight));
             var latLabelStart = Math.Ceiling(boundingBox.South / lineDistance) * lineDistance;
@@ -195,7 +195,7 @@ namespace MapControl
             }
         }
 
-        private void DrawGraticule(PathFigureCollection figures, ICollection<Label> labels)
+        private void DrawGraticule(PathFigureCollection figures, List<Label> labels)
         {
             var minLat = 0d;
             var maxLat = 0d;
diff --git a/MapControl/WinUI/MapGraticule.WinUI.cs b/MapControl/WinUI/MapGraticule.WinUI.cs
index 539a2697..4282831d 100644
--- a/MapControl/WinUI/MapGraticule.WinUI.cs
+++ b/MapControl/WinUI/MapGraticule.WinUI.cs
@@ -28,8 +28,6 @@ namespace MapControl
         public static readonly DependencyProperty FontSizeProperty =
             DependencyPropertyHelper.Register<MapGraticule, double>(nameof(FontSize), 12d);
 
-        private readonly Path path = new Path { Data = new PathGeometry() };
-
         public Brush Foreground
         {
             get => (Brush)GetValue(ForegroundProperty);
@@ -61,10 +59,12 @@ namespace MapControl
 
         protected override void OnViewportChanged(ViewportChangedEventArgs e)
         {
-            var labels = DrawGraticule(((PathGeometry)path.Data).Figures);
+            Path path;
 
             if (Children.Count == 0)
             {
+                path = new Path { Data = new PathGeometry() };
+
                 path.SetBinding(Shape.StrokeProperty,
                     new Binding { Source = this, Path = new PropertyPath(nameof(Foreground)) });
 
@@ -73,7 +73,12 @@ namespace MapControl
 
                 Children.Add(path);
             }
+            else
+            {
+                path = (Path)Children[0];
+            }
 
+            var labels = DrawGraticule(((PathGeometry)path.Data).Figures);
             var childrenCount = 1;
 
             foreach (var label in labels)