Merge pull request #122 from arnaudleclerc/features/resolve-merge-conflicts

Releases/1.17.1 (#119)

Author: arnaudleclerc

src/AzureMapsControl.Components/Drawing/DrawingManager.cs

@@ -20,11 +20,6 @@ public sealed class DrawingManager
         internal ILogger Logger { get; set; }
         public bool Disposed { get; private set; }
 
-        /// <summary>
-        /// List of shapes added to the data source
-        /// </summary>
-        private List<Shape> _sourceShapes;
-
         /// <summary>
         /// Add shapes to the drawing manager data source
         /// </summary>
@@ -42,11 +37,6 @@ public async ValueTask AddShapesAsync(IEnumerable<Shape> shapes)
             EnsureJsRuntimeExists();
             EnsureNotDisposed();
 
-            if (_sourceShapes == null)
-            {
-                _sourceShapes = new List<Shape>();
-            }
-
             var lineStrings = shapes.OfType<Shape<LineString>>();
             if (lineStrings.Any())
             {
@@ -95,8 +85,6 @@ public async ValueTask AddShapesAsync(IEnumerable<Shape> shapes)
                 Logger?.LogAzureMapsControlDebug(AzureMapLogEvent.Source_AddAsync, $"{routePoints.Count()} route points will be added");
                 await JSRuntime.InvokeVoidAsync(Constants.JsConstants.Methods.Source.AddShapes.ToDrawingNamespace(), routePoints);
             }
-
-            _sourceShapes.AddRange(shapes);
         }
 
         /// <summary>
@@ -112,7 +100,6 @@ public async ValueTask ClearAsync()
             EnsureJsRuntimeExists();
             EnsureNotDisposed();
 
-            _sourceShapes = null;
             await JSRuntime.InvokeVoidAsync(Constants.JsConstants.Methods.Source.Clear.ToDrawingNamespace());
         }
 

tests/AzureMapsControl.Components.Tests/Drawing/DrawingManager.cs

@@ -2,7 +2,6 @@
 {
     using System.Collections.Generic;
     using System.Linq;
-    using System.Reflection;
     using System.Threading.Tasks;
 
     using AzureMapsControl.Components.Atlas;
@@ -176,13 +175,6 @@ public async Task Should_AccumulateShapes_InInternalState_Async()
             await drawingManager.AddShapesAsync(secondBatch);
             await drawingManager.AddShapesAsync(thirdBatch);
 
-            // Verify internal state accumulates all shapes
-            var sourceShapes = GetInternalSourceShapes(drawingManager);
-            Assert.Equal(3, sourceShapes.Count);
-            Assert.Contains(firstBatch[0], sourceShapes);
-            Assert.Contains(secondBatch[0], sourceShapes);
-            Assert.Contains(thirdBatch[0], sourceShapes);
-
             // Verify correct number of JS calls
             _jsRuntimeMock.Verify(runtime => runtime.InvokeVoidAsync(
                 Constants.JsConstants.Methods.Source.AddShapes.ToDrawingNamespace(),
@@ -195,22 +187,12 @@ public async Task Should_ClearInternalState_WhenCleared_Async()
             var drawingManager = CreateInitializedDrawingManager();
             var shapes = new List<Shape> { new Shape<Point>(new Point()) };
 
-            // Add shapes to initialize and populate internal state
+            // Add shapes then clear
             await drawingManager.AddShapesAsync(shapes);
-            var sourceShapes = GetInternalSourceShapes(drawingManager);
-            Assert.NotNull(sourceShapes);
-            Assert.Single(sourceShapes);
-
-            // Clear should reset internal state
             await drawingManager.ClearAsync();
-            sourceShapes = GetInternalSourceShapes(drawingManager);
-            Assert.Null(sourceShapes);
 
-            // Adding again should reinitialize state
+            // Adding again should work without errors
             await drawingManager.AddShapesAsync(shapes);
-            sourceShapes = GetInternalSourceShapes(drawingManager);
-            Assert.NotNull(sourceShapes);
-            Assert.Single(sourceShapes);
 
             _jsRuntimeMock.Verify(runtime => runtime.InvokeVoidAsync(Constants.JsConstants.Methods.Source.AddShapes.ToDrawingNamespace(), It.IsAny<object[]>()), Times.Exactly(2));
             _jsRuntimeMock.Verify(runtime => runtime.InvokeVoidAsync(Constants.JsConstants.Methods.Source.Clear.ToDrawingNamespace()), Times.Once);
@@ -299,15 +281,5 @@ private DrawingManager CreateInitializedDrawingManager()
                 Logger = _loggerMock.Object
             };
         }
-
-        /// <summary>
-        /// Uses reflection to access the private _sourceShapes field for testing internal state
-        /// </summary>
-        private List<Shape> GetInternalSourceShapes(DrawingManager drawingManager)
-        {
-            var field = typeof(DrawingManager).GetField("_sourceShapes",
-                BindingFlags.NonPublic | BindingFlags.Instance);
-            return field?.GetValue(drawingManager) as List<Shape>;
-        }
     }
 }