From 2c64113cc0fcf30dd46ba8cf0d6df6c4e7dc714f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Su=C3=A1rez?= <javiersuarezruiz@hotmail.com>
Date: Fri, 18 Nov 2022 13:18:33 +0100
Subject: [PATCH 1/2] Fix issue clearing MapElements in iOS Map

---
 .../MapsGalleries/PolygonsGallery.xaml        | 402 +++++++++---------
 .../MapsGalleries/PolygonsGallery.xaml.cs     |   8 +-
 .../maps/src/Handlers/Map/MapHandler.iOS.cs   |   1 +
 .../maps/src/Platform/iOS/MauiMKMapView.cs    |  13 +
 4 files changed, 225 insertions(+), 199 deletions(-)

diff --git a/src/Controls/samples/Controls.Sample/Pages/Controls/MapsGalleries/PolygonsGallery.xaml b/src/Controls/samples/Controls.Sample/Pages/Controls/MapsGalleries/PolygonsGallery.xaml
index 3cf5971736ad..3517b157150d 100644
--- a/src/Controls/samples/Controls.Sample/Pages/Controls/MapsGalleries/PolygonsGallery.xaml
+++ b/src/Controls/samples/Controls.Sample/Pages/Controls/MapsGalleries/PolygonsGallery.xaml
@@ -9,208 +9,214 @@
     mc:Ignorable="d"
     x:Class="Maui.Controls.Sample.Pages.MapsGalleries.PolygonsGallery"
     Title="Polygon/Polyline Gallery">
-    <Map>
-        <x:Arguments>
-            <MapSpan>
-                <x:Arguments>
-                    <sensors:Location>
-                        <x:Arguments>
-                            <x:Double>47.640663</x:Double>
-                            <x:Double>-122.1376177</x:Double>
-                        </x:Arguments>
-                    </sensors:Location>
-                    <x:Double>0.1</x:Double>
-                    <x:Double>0.1</x:Double>
-                </x:Arguments>
-            </MapSpan>
-        </x:Arguments>
-        <Map.MapElements>
-            <maps:Polygon 
+    <StackLayout>
+        <Map 
+            x:Name="MapElementsMap">
+            <x:Arguments>
+                <MapSpan>
+                    <x:Arguments>
+                        <sensors:Location>
+                            <x:Arguments>
+                                <x:Double>47.640663</x:Double>
+                                <x:Double>-122.1376177</x:Double>
+                            </x:Arguments>
+                        </sensors:Location>
+                        <x:Double>0.1</x:Double>
+                        <x:Double>0.1</x:Double>
+                    </x:Arguments>
+                </MapSpan>
+            </x:Arguments>
+            <Map.MapElements>
+                <maps:Polygon 
                 StrokeColor="#FF9900"
                 StrokeWidth="8"
                 FillColor="#88FF9900">
-                <maps:Polygon.Geopath>
-                    <sensors:Location>
-                        <x:Arguments>
-                            <x:Double>47.6458676</x:Double>
-                            <x:Double>-122.1356007</x:Double>
-                        </x:Arguments>
-                    </sensors:Location>
-                    <sensors:Location>
-                        <x:Arguments>
-                            <x:Double>47.6458097</x:Double>
-                            <x:Double>-122.142789</x:Double>
-                        </x:Arguments>
-                    </sensors:Location>
-                    <sensors:Location>
-                        <x:Arguments>
-                            <x:Double>47.6367593</x:Double>
-                            <x:Double>-122.1428104</x:Double>
-                        </x:Arguments>
-                    </sensors:Location>
-                    <sensors:Location>
-                        <x:Arguments>
-                            <x:Double>47.6368027</x:Double>
-                            <x:Double>-122.1398707</x:Double>
-                        </x:Arguments>
-                    </sensors:Location>
-                    <sensors:Location>
-                        <x:Arguments>
-                            <x:Double>47.6380172</x:Double>
-                            <x:Double>-122.1376177</x:Double>
-                        </x:Arguments>
-                    </sensors:Location>
-                    <sensors:Location>
-                        <x:Arguments>
-                            <x:Double>47.640663</x:Double>
-                            <x:Double>-122.1352359</x:Double>
-                        </x:Arguments>
-                    </sensors:Location>
-                    <sensors:Location>
-                        <x:Arguments>
-                            <x:Double>47.6426148</x:Double>
-                            <x:Double>-122.1347209</x:Double>
-                        </x:Arguments>
-                    </sensors:Location>
-                    <sensors:Location>
-                        <x:Arguments>
-                            <x:Double>47.6458676</x:Double>
-                            <x:Double>-122.1356007</x:Double>
-                        </x:Arguments>
-                    </sensors:Location>
-                </maps:Polygon.Geopath>
-            </maps:Polygon>
-            <maps:Polygon StrokeColor="#1BA1E2"
+                    <maps:Polygon.Geopath>
+                        <sensors:Location>
+                            <x:Arguments>
+                                <x:Double>47.6458676</x:Double>
+                                <x:Double>-122.1356007</x:Double>
+                            </x:Arguments>
+                        </sensors:Location>
+                        <sensors:Location>
+                            <x:Arguments>
+                                <x:Double>47.6458097</x:Double>
+                                <x:Double>-122.142789</x:Double>
+                            </x:Arguments>
+                        </sensors:Location>
+                        <sensors:Location>
+                            <x:Arguments>
+                                <x:Double>47.6367593</x:Double>
+                                <x:Double>-122.1428104</x:Double>
+                            </x:Arguments>
+                        </sensors:Location>
+                        <sensors:Location>
+                            <x:Arguments>
+                                <x:Double>47.6368027</x:Double>
+                                <x:Double>-122.1398707</x:Double>
+                            </x:Arguments>
+                        </sensors:Location>
+                        <sensors:Location>
+                            <x:Arguments>
+                                <x:Double>47.6380172</x:Double>
+                                <x:Double>-122.1376177</x:Double>
+                            </x:Arguments>
+                        </sensors:Location>
+                        <sensors:Location>
+                            <x:Arguments>
+                                <x:Double>47.640663</x:Double>
+                                <x:Double>-122.1352359</x:Double>
+                            </x:Arguments>
+                        </sensors:Location>
+                        <sensors:Location>
+                            <x:Arguments>
+                                <x:Double>47.6426148</x:Double>
+                                <x:Double>-122.1347209</x:Double>
+                            </x:Arguments>
+                        </sensors:Location>
+                        <sensors:Location>
+                            <x:Arguments>
+                                <x:Double>47.6458676</x:Double>
+                                <x:Double>-122.1356007</x:Double>
+                            </x:Arguments>
+                        </sensors:Location>
+                    </maps:Polygon.Geopath>
+                </maps:Polygon>
+                <maps:Polygon StrokeColor="#1BA1E2"
                           StrokeWidth="8"
                           FillColor="#881BA1E2">
-                <maps:Polygon.Geopath>
-                    <sensors:Location>
-                        <x:Arguments>
-                            <x:Double>47.6368678</x:Double>
-                            <x:Double>-122.137305</x:Double>
-                        </x:Arguments>
-                    </sensors:Location>
-                    <sensors:Location>
-                        <x:Arguments>
-                            <x:Double>47.6368894</x:Double>
-                            <x:Double>-122.134655</x:Double>
-                        </x:Arguments>
-                    </sensors:Location>
-                    <sensors:Location>
-                        <x:Arguments>
-                            <x:Double>47.6359424</x:Double>
-                            <x:Double>-122.134655</x:Double>
-                        </x:Arguments>
-                    </sensors:Location>
-                    <sensors:Location>
-                        <x:Arguments>
-                            <x:Double>47.6359496</x:Double>
-                            <x:Double>-122.1325521</x:Double>
-                        </x:Arguments>
-                    </sensors:Location>
-                    <sensors:Location>
-                        <x:Arguments>
-                            <x:Double>47.6424124</x:Double>
-                            <x:Double>-122.1325199</x:Double>
-                        </x:Arguments>
-                    </sensors:Location>
-                    <sensors:Location>
-                        <x:Arguments>
-                            <x:Double>47.642463</x:Double>
-                            <x:Double>-122.1338932</x:Double>
-                        </x:Arguments>
-                    </sensors:Location>
-                    <sensors:Location>
-                        <x:Arguments>
-                            <x:Double>47.6406414</x:Double>
-                            <x:Double>-122.1344833</x:Double>
-                        </x:Arguments>
-                    </sensors:Location>
-                    <sensors:Location>
-                        <x:Arguments>
-                            <x:Double>47.6384943</x:Double>
-                            <x:Double>-122.1361248</x:Double>
-                        </x:Arguments>
-                    </sensors:Location>
-                    <sensors:Location>
-                        <x:Arguments>
-                            <x:Double>47.6372943</x:Double>
-                            <x:Double>-122.1376912</x:Double>
-                        </x:Arguments>
-                    </sensors:Location>
-                    <sensors:Location>
-                        <x:Arguments>
-                            <x:Double>47.6368678</x:Double>
-                            <x:Double>-122.137305</x:Double>
-                        </x:Arguments>
-                    </sensors:Location>
-                </maps:Polygon.Geopath>
-            </maps:Polygon>
-            <maps:Polyline StrokeColor="Black"
+                    <maps:Polygon.Geopath>
+                        <sensors:Location>
+                            <x:Arguments>
+                                <x:Double>47.6368678</x:Double>
+                                <x:Double>-122.137305</x:Double>
+                            </x:Arguments>
+                        </sensors:Location>
+                        <sensors:Location>
+                            <x:Arguments>
+                                <x:Double>47.6368894</x:Double>
+                                <x:Double>-122.134655</x:Double>
+                            </x:Arguments>
+                        </sensors:Location>
+                        <sensors:Location>
+                            <x:Arguments>
+                                <x:Double>47.6359424</x:Double>
+                                <x:Double>-122.134655</x:Double>
+                            </x:Arguments>
+                        </sensors:Location>
+                        <sensors:Location>
+                            <x:Arguments>
+                                <x:Double>47.6359496</x:Double>
+                                <x:Double>-122.1325521</x:Double>
+                            </x:Arguments>
+                        </sensors:Location>
+                        <sensors:Location>
+                            <x:Arguments>
+                                <x:Double>47.6424124</x:Double>
+                                <x:Double>-122.1325199</x:Double>
+                            </x:Arguments>
+                        </sensors:Location>
+                        <sensors:Location>
+                            <x:Arguments>
+                                <x:Double>47.642463</x:Double>
+                                <x:Double>-122.1338932</x:Double>
+                            </x:Arguments>
+                        </sensors:Location>
+                        <sensors:Location>
+                            <x:Arguments>
+                                <x:Double>47.6406414</x:Double>
+                                <x:Double>-122.1344833</x:Double>
+                            </x:Arguments>
+                        </sensors:Location>
+                        <sensors:Location>
+                            <x:Arguments>
+                                <x:Double>47.6384943</x:Double>
+                                <x:Double>-122.1361248</x:Double>
+                            </x:Arguments>
+                        </sensors:Location>
+                        <sensors:Location>
+                            <x:Arguments>
+                                <x:Double>47.6372943</x:Double>
+                                <x:Double>-122.1376912</x:Double>
+                            </x:Arguments>
+                        </sensors:Location>
+                        <sensors:Location>
+                            <x:Arguments>
+                                <x:Double>47.6368678</x:Double>
+                                <x:Double>-122.137305</x:Double>
+                            </x:Arguments>
+                        </sensors:Location>
+                    </maps:Polygon.Geopath>
+                </maps:Polygon>
+                <maps:Polyline StrokeColor="Black"
                             StrokeWidth="12">
-                <maps:Polyline.Geopath>
-                    <sensors:Location>
-                        <x:Arguments>
-                            <x:Double>47.6381401</x:Double>
-                            <x:Double>-122.1317367</x:Double>
-                        </x:Arguments>
-                    </sensors:Location>
-                    <sensors:Location>
-                        <x:Arguments>
-                            <x:Double>47.6381473</x:Double>
-                            <x:Double>-122.1350841</x:Double>
-                        </x:Arguments>
-                    </sensors:Location>
-                    <sensors:Location>
-                        <x:Arguments>
-                            <x:Double>47.6382847</x:Double>
-                            <x:Double>-122.1353094</x:Double>
-                        </x:Arguments>
-                    </sensors:Location>
-                    <sensors:Location>
-                        <x:Arguments>
-                            <x:Double>47.6384582</x:Double>
-                            <x:Double>-122.1354703</x:Double>
-                        </x:Arguments>
-                    </sensors:Location>
-                    <sensors:Location>
-                        <x:Arguments>
-                            <x:Double>47.6401136</x:Double>
-                            <x:Double>-122.1360819</x:Double>
-                        </x:Arguments>
-                    </sensors:Location>
-                    <sensors:Location>
-                        <x:Arguments>
-                            <x:Double>47.6403883</x:Double>
-                            <x:Double>-122.1364681</x:Double>
-                        </x:Arguments>
-                    </sensors:Location>
-                    <sensors:Location>
-                        <x:Arguments>
-                            <x:Double>47.6407426</x:Double>
-                            <x:Double>-122.1377019</x:Double>
-                        </x:Arguments>
-                    </sensors:Location>
-                    <sensors:Location>
-                        <x:Arguments>
-                            <x:Double>47.6412558</x:Double>
-                            <x:Double>-122.1404056</x:Double>
-                        </x:Arguments>
-                    </sensors:Location>
-                    <sensors:Location>
-                        <x:Arguments>
-                            <x:Double>47.6414148</x:Double>
-                            <x:Double>-122.1418647</x:Double>
-                        </x:Arguments>
-                    </sensors:Location>
-                    <sensors:Location>
-                        <x:Arguments>
-                            <x:Double>47.6414654</x:Double>
-                            <x:Double>-122.1432702</x:Double>
-                        </x:Arguments>
-                    </sensors:Location>
-                </maps:Polyline.Geopath>
-            </maps:Polyline>
-        </Map.MapElements>
-    </Map>
+                    <maps:Polyline.Geopath>
+                        <sensors:Location>
+                            <x:Arguments>
+                                <x:Double>47.6381401</x:Double>
+                                <x:Double>-122.1317367</x:Double>
+                            </x:Arguments>
+                        </sensors:Location>
+                        <sensors:Location>
+                            <x:Arguments>
+                                <x:Double>47.6381473</x:Double>
+                                <x:Double>-122.1350841</x:Double>
+                            </x:Arguments>
+                        </sensors:Location>
+                        <sensors:Location>
+                            <x:Arguments>
+                                <x:Double>47.6382847</x:Double>
+                                <x:Double>-122.1353094</x:Double>
+                            </x:Arguments>
+                        </sensors:Location>
+                        <sensors:Location>
+                            <x:Arguments>
+                                <x:Double>47.6384582</x:Double>
+                                <x:Double>-122.1354703</x:Double>
+                            </x:Arguments>
+                        </sensors:Location>
+                        <sensors:Location>
+                            <x:Arguments>
+                                <x:Double>47.6401136</x:Double>
+                                <x:Double>-122.1360819</x:Double>
+                            </x:Arguments>
+                        </sensors:Location>
+                        <sensors:Location>
+                            <x:Arguments>
+                                <x:Double>47.6403883</x:Double>
+                                <x:Double>-122.1364681</x:Double>
+                            </x:Arguments>
+                        </sensors:Location>
+                        <sensors:Location>
+                            <x:Arguments>
+                                <x:Double>47.6407426</x:Double>
+                                <x:Double>-122.1377019</x:Double>
+                            </x:Arguments>
+                        </sensors:Location>
+                        <sensors:Location>
+                            <x:Arguments>
+                                <x:Double>47.6412558</x:Double>
+                                <x:Double>-122.1404056</x:Double>
+                            </x:Arguments>
+                        </sensors:Location>
+                        <sensors:Location>
+                            <x:Arguments>
+                                <x:Double>47.6414148</x:Double>
+                                <x:Double>-122.1418647</x:Double>
+                            </x:Arguments>
+                        </sensors:Location>
+                        <sensors:Location>
+                            <x:Arguments>
+                                <x:Double>47.6414654</x:Double>
+                                <x:Double>-122.1432702</x:Double>
+                            </x:Arguments>
+                        </sensors:Location>
+                    </maps:Polyline.Geopath>
+                </maps:Polyline>
+            </Map.MapElements>
+        </Map>
+        <Button 
+            Text="Clear MapElements"
+            Clicked="OnClearMapElementsClicked"/>
+    </StackLayout>
 </ContentPage>
\ No newline at end of file
diff --git a/src/Controls/samples/Controls.Sample/Pages/Controls/MapsGalleries/PolygonsGallery.xaml.cs b/src/Controls/samples/Controls.Sample/Pages/Controls/MapsGalleries/PolygonsGallery.xaml.cs
index 9c3376fce23a..6884973a5fac 100644
--- a/src/Controls/samples/Controls.Sample/Pages/Controls/MapsGalleries/PolygonsGallery.xaml.cs
+++ b/src/Controls/samples/Controls.Sample/Pages/Controls/MapsGalleries/PolygonsGallery.xaml.cs
@@ -1,4 +1,5 @@
-using Microsoft.Maui.Controls;
+using System;
+using Microsoft.Maui.Controls;
 
 namespace Maui.Controls.Sample.Pages.MapsGalleries
 {
@@ -8,5 +9,10 @@ public PolygonsGallery()
 		{
 			InitializeComponent();
 		}
+
+		void OnClearMapElementsClicked(object sender, EventArgs args)
+		{
+			MapElementsMap.MapElements.Clear();
+		}
 	}
 }
\ No newline at end of file
diff --git a/src/Core/maps/src/Handlers/Map/MapHandler.iOS.cs b/src/Core/maps/src/Handlers/Map/MapHandler.iOS.cs
index 96235552c7e6..7fa40cfc68b0 100644
--- a/src/Core/maps/src/Handlers/Map/MapHandler.iOS.cs
+++ b/src/Core/maps/src/Handlers/Map/MapHandler.iOS.cs
@@ -81,6 +81,7 @@ public static void MapPins(IMapHandler handler, IMap map)
 
 		public static void MapElements(IMapHandler handler, IMap map)
 		{
+			handler.PlatformView.ClearMapElements();
 			handler.PlatformView.AddElements((IList)map.Elements);
 		}
 
diff --git a/src/Core/maps/src/Platform/iOS/MauiMKMapView.cs b/src/Core/maps/src/Platform/iOS/MauiMKMapView.cs
index 1d09d3227125..ed2fbeab7306 100644
--- a/src/Core/maps/src/Platform/iOS/MauiMKMapView.cs
+++ b/src/Core/maps/src/Platform/iOS/MauiMKMapView.cs
@@ -114,6 +114,19 @@ internal void AddPins(IList pins)
 			}
 		}
 
+		internal void ClearMapElements()
+		{
+			var elements = Overlays;
+
+			if (elements == null)
+				return;
+
+			foreach (IMKOverlay overlay in elements)
+			{
+				RemoveOverlay(overlay);
+			}
+		}
+
 		internal void AddElements(IList elements)
 		{
 			foreach (IMapElement element in elements)

From 87585c7289ff1183b8e6d6d2be7631cb1c414bdf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Su=C3=A1rez?= <javiersuarezruiz@hotmail.com>
Date: Fri, 18 Nov 2022 13:33:28 +0100
Subject: [PATCH 2/2] Fix XAML formatting

---
 .../Pages/Controls/MapsGalleries/PolygonsGallery.xaml       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Controls/samples/Controls.Sample/Pages/Controls/MapsGalleries/PolygonsGallery.xaml b/src/Controls/samples/Controls.Sample/Pages/Controls/MapsGalleries/PolygonsGallery.xaml
index 3517b157150d..e4de80c53b32 100644
--- a/src/Controls/samples/Controls.Sample/Pages/Controls/MapsGalleries/PolygonsGallery.xaml
+++ b/src/Controls/samples/Controls.Sample/Pages/Controls/MapsGalleries/PolygonsGallery.xaml
@@ -28,9 +28,9 @@
             </x:Arguments>
             <Map.MapElements>
                 <maps:Polygon 
-                StrokeColor="#FF9900"
-                StrokeWidth="8"
-                FillColor="#88FF9900">
+                    StrokeColor="#FF9900"
+                    StrokeWidth="8"
+                    FillColor="#88FF9900">
                     <maps:Polygon.Geopath>
                         <sensors:Location>
                             <x:Arguments>