Minor cleanup.

Author: mtech-rherpio

src/AzureMapsControl.Components/Map/IMapAdderService.cs

@@ -4,8 +4,8 @@
 
     internal interface IMapAdderService : IMapService
     {
-        ValueTask AddMapAsync(Map map);
+        public ValueTask AddMapAsync(Map map);
 
-        ValueTask RemoveMapAsync(string mapId);
+        public ValueTask RemoveMapAsync(string mapId);
     }
 }

src/AzureMapsControl.Components/Map/MapService.cs

@@ -23,12 +23,12 @@ public Map Map
         { 
             get
             {
-                if (!string.IsNullOrEmpty(_latestMapId) && _maps.ContainsKey(_latestMapId))
+                if (!string.IsNullOrEmpty(_latestMapId) && _maps.TryGetValue(_latestMapId, out var map))
                 {
-                    return _maps[_latestMapId];
+                    return map;
                 }
 
-                if (_maps.Count > 0)
+                if (!_maps.IsEmpty)
                 {
                     return _maps.Values.First();
                 }
@@ -41,10 +41,7 @@ public Map Map
 
         public event MapReadyEvent OnMapReadyAsync;
 
-        public Map GetMap(string mapId)
-        {
-            return _maps.TryGetValue(mapId, out var map) ? map : null;
-        }
+        public Map GetMap(string mapId) => _maps.TryGetValue(mapId, out var map) ? map : null;
 
         public async ValueTask AddMapAsync(Map map)
         {
@@ -66,7 +63,7 @@ public async ValueTask RemoveMapAsync(string mapId)
             _logger?.LogAzureMapsControlInfo(AzureMapLogEvent.MapService_AddMapAsync, "Removing map instance");
             _logger?.LogAzureMapsControlDebug(AzureMapLogEvent.MapService_AddMapAsync, $"Map ID: {mapId}");
 
-            if (_maps.TryRemove(mapId, out var removedMap))
+            if (_maps.TryRemove(mapId, out _))
             {
                 // If we're removing the latest map, update the latest map ID
                 if (_latestMapId == mapId)

tests/AzureMapsControl.Components.Tests/Map/MapServiceMultipleMaps.cs

@@ -175,7 +175,7 @@ public void Should_ReturnNull_WhenNoMapsExist()
         }
 
         [Fact]
-        public async Task Should_ReturnNull_ForNonExistentMapId()
+        public async Task Should_ReturnNull_ForNonExistentMapId_Async()
         {
             var service = new MapService(null);
             await service.AddMapAsync(new Map("map1"));
@@ -190,7 +190,7 @@ public async Task Should_HandleRapidAddRemoveSequence_Async()
         {
             var service = new MapService(null);
 
-            for (int i = 0; i < 5; i++)
+            for (var i = 0; i < 5; i++)
             {
                 var map = new Map($"map{i}");
                 await service.AddMapAsync(map);