diff --git a/Microsoft.Maui.Packages-mac.slnf b/Microsoft.Maui.Packages-mac.slnf
index 2662f1c3517c..00da180d62d0 100644
--- a/Microsoft.Maui.Packages-mac.slnf
+++ b/Microsoft.Maui.Packages-mac.slnf
@@ -13,6 +13,7 @@
"src\\Controls\\src\\Xaml.Design\\Controls.Xaml.Design.csproj",
"src\\Controls\\src\\Xaml\\Controls.Xaml.csproj",
"src\\Core\\src\\Core.csproj",
+ "src\\Core\\maps\\src\\Maps.csproj",
"src\\Essentials\\src\\Essentials.csproj",
"src\\Graphics\\src\\Graphics\\Graphics.csproj",
"src\\Graphics\\src\\Graphics.Skia\\Graphics.Skia.csproj",
diff --git a/Microsoft.Maui.Packages.slnf b/Microsoft.Maui.Packages.slnf
index 1a51d3861ea8..68e1736d0a39 100644
--- a/Microsoft.Maui.Packages.slnf
+++ b/Microsoft.Maui.Packages.slnf
@@ -15,6 +15,7 @@
"src\\Controls\\src\\Xaml.Design\\Controls.Xaml.Design.csproj",
"src\\Controls\\src\\Xaml\\Controls.Xaml.csproj",
"src\\Core\\src\\Core.csproj",
+ "src\\Core\\maps\\src\\Maps.csproj",
"src\\Graphics\\src\\Graphics\\Graphics.csproj",
"src\\Graphics\\src\\Graphics.Skia\\Graphics.Skia.csproj",
"src\\Graphics\\src\\Graphics.Win2D\\Graphics.Win2D.csproj",
diff --git a/Microsoft.Maui.sln b/Microsoft.Maui.sln
index 9b9b8c813d01..302b9785b694 100644
--- a/Microsoft.Maui.sln
+++ b/Microsoft.Maui.sln
@@ -204,6 +204,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SharedSource", "SharedSourc
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Benchmarks.Droid", "src\Core\tests\Benchmarks.Droid\Benchmarks.Droid.csproj", "{5B56A734-D53C-4635-A53E-F889FCFCDD66}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Maps", "src\Core\maps\src\Maps.csproj", "{E8728693-3537-4007-A4DB-9F9634548755}"
+EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Graphics", "Graphics", "{E4884871-4A1B-43BC-814F-E3D6E52B1673}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{42AB9AE1-631D-4AD4-85B7-910FF0940BDB}"
@@ -544,6 +546,10 @@ Global
{5B56A734-D53C-4635-A53E-F889FCFCDD66}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5B56A734-D53C-4635-A53E-F889FCFCDD66}.Release|Any CPU.Build.0 = Release|Any CPU
{5B56A734-D53C-4635-A53E-F889FCFCDD66}.Release|Any CPU.Deploy.0 = Release|Any CPU
+ {E8728693-3537-4007-A4DB-9F9634548755}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {E8728693-3537-4007-A4DB-9F9634548755}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {E8728693-3537-4007-A4DB-9F9634548755}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {E8728693-3537-4007-A4DB-9F9634548755}.Release|Any CPU.Build.0 = Release|Any CPU
{CF056C95-51C4-4366-9D06-41D2B15EFEE4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CF056C95-51C4-4366-9D06-41D2B15EFEE4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CF056C95-51C4-4366-9D06-41D2B15EFEE4}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -724,6 +730,7 @@ Global
{5FEA7500-0ACE-4C26-9A7B-2EB3958CBBC6} = {A9C514B9-1EE2-4A12-8E8A-CE16D87545C3}
{4F2926C8-43AB-4328-A735-D9EAD699F81D} = {ED7F28E0-D0AF-417D-983D-3D874EEE8554}
{5B56A734-D53C-4635-A53E-F889FCFCDD66} = {C564DDD6-DE79-45CD-88EA-3F690481572A}
+ {E8728693-3537-4007-A4DB-9F9634548755} = {E8AD265B-3C67-4640-AC58-A522F9FB3361}
{42AB9AE1-631D-4AD4-85B7-910FF0940BDB} = {E4884871-4A1B-43BC-814F-E3D6E52B1673}
{1BA0121E-0B83-4C8F-81BE-C293E7E35DCE} = {E4884871-4A1B-43BC-814F-E3D6E52B1673}
{936C47A9-A7EA-4FBD-8733-CED1D4100E69} = {E4884871-4A1B-43BC-814F-E3D6E52B1673}
diff --git a/_omnisharp.sln b/_omnisharp.sln
index 5bdf0919dad6..945ac66ae337 100644
--- a/_omnisharp.sln
+++ b/_omnisharp.sln
@@ -12,7 +12,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Controls", "Controls", "{45
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{E1082E26-D700-4127-9329-66D673FD2D55}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Maui.Controls.Sample", "src\Controls\samples\Controls.Sample\Maui.Controls.Sample.csproj", "{B8DC1324-977C-46F1-B697-9064ADE6099A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Maui.Controls.Sample", "src\Controls\samples\Controls.Sample\Maui.Controls.Sample.csproj", "{B8DC1324-977C-46F1-B697-9064ADE6099A}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Compatibility", "Compatibility", "{123AA89E-1638-4E0E-B828-B8F9F9F906A2}"
EndProject
@@ -92,6 +92,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core.DeviceTests", "src\Cor
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Controls.Foldable", "src\Controls\Foldable\src\Controls.Foldable.csproj", "{F0A48792-ACD7-4B72-83EB-C56A70FA5A3A}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Maps", "src\Core\maps\src\Maps.csproj", "{1C9F9D5A-2CF7-4ADB-A9F5-672ACC05B035}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -205,6 +207,10 @@ Global
{F0A48792-ACD7-4B72-83EB-C56A70FA5A3A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F0A48792-ACD7-4B72-83EB-C56A70FA5A3A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F0A48792-ACD7-4B72-83EB-C56A70FA5A3A}.Release|Any CPU.Build.0 = Release|Any CPU
+ {1C9F9D5A-2CF7-4ADB-A9F5-672ACC05B035}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {1C9F9D5A-2CF7-4ADB-A9F5-672ACC05B035}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {1C9F9D5A-2CF7-4ADB-A9F5-672ACC05B035}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {1C9F9D5A-2CF7-4ADB-A9F5-672ACC05B035}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -247,6 +253,7 @@ Global
{7BEF8AD2-3A1D-4920-9036-473B9A6D5B0D} = {FBA6A516-2B6A-48A9-B64F-B012114B9501}
{50BCB5CD-DC2A-42AA-B921-D99B19625CE1} = {C564DDD6-DE79-45CD-88EA-3F690481572A}
{F0A48792-ACD7-4B72-83EB-C56A70FA5A3A} = {50C758FE-4E10-409A-94F5-A75480960864}
+ {1C9F9D5A-2CF7-4ADB-A9F5-672ACC05B035} = {E8AD265B-3C67-4640-AC58-A522F9FB3361}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {0B8ABEAD-D2B5-4370-A187-62B5ABE4EE50}
diff --git a/eng/Versions.props b/eng/Versions.props
index c00b85d11002..c1da03b00efc 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -48,6 +48,8 @@
<_XamarinAndroidGlideVersion>4.13.2.1
<_XamarinAndroidXSecurityVersion>1.1.0-alpha03
<_XamarinGoogleCryptoTinkAndroidVersion>1.6.1.7
+
+ 117.0.0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Controls/samples/Controls.Sample/Maui.Controls.Sample.csproj b/src/Controls/samples/Controls.Sample/Maui.Controls.Sample.csproj
index 2de00769fdff..05ad55b47484 100644
--- a/src/Controls/samples/Controls.Sample/Maui.Controls.Sample.csproj
+++ b/src/Controls/samples/Controls.Sample/Maui.Controls.Sample.csproj
@@ -56,11 +56,13 @@
-
+
+
+
diff --git a/src/Controls/samples/Controls.Sample/MauiProgram.cs b/src/Controls/samples/Controls.Sample/MauiProgram.cs
index f759d00e285e..fc4884c7c174 100644
--- a/src/Controls/samples/Controls.Sample/MauiProgram.cs
+++ b/src/Controls/samples/Controls.Sample/MauiProgram.cs
@@ -19,10 +19,16 @@
using Microsoft.Maui.Controls.Compatibility;
using Microsoft.Maui.Controls.Compatibility.Hosting;
+
#if NET6_0_OR_GREATER
using Microsoft.AspNetCore.Components.WebView.Maui;
#endif
+#if ANDROID
+using Android.Gms.Common;
+using Android.Gms.Maps;
+#endif
+
namespace Maui.Controls.Sample
{
public class CustomButton : Button { }
@@ -37,7 +43,9 @@ enum PageType { Main, Blazor, Shell, Template, FlyoutPage, TabbedPage }
public static MauiApp CreateMauiApp()
{
var appBuilder = MauiApp.CreateBuilder();
-
+#if __ANDROID__ || __IOS__
+ appBuilder.UseMauiMaps();
+#endif
appBuilder.UseMauiApp();
#if TIZEN
appBuilder.UseMauiCompatibility();
diff --git a/src/Controls/samples/Controls.Sample/Pages/Controls/MapsGalleries/BasicMapGallery.xaml b/src/Controls/samples/Controls.Sample/Pages/Controls/MapsGalleries/BasicMapGallery.xaml
new file mode 100644
index 000000000000..ead809e229e1
--- /dev/null
+++ b/src/Controls/samples/Controls.Sample/Pages/Controls/MapsGalleries/BasicMapGallery.xaml
@@ -0,0 +1,29 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Controls/samples/Controls.Sample/Pages/Controls/MapsGalleries/BasicMapGallery.xaml.cs b/src/Controls/samples/Controls.Sample/Pages/Controls/MapsGalleries/BasicMapGallery.xaml.cs
new file mode 100644
index 000000000000..aab008f7a7c7
--- /dev/null
+++ b/src/Controls/samples/Controls.Sample/Pages/Controls/MapsGalleries/BasicMapGallery.xaml.cs
@@ -0,0 +1,13 @@
+using Microsoft.Maui.Controls.Xaml;
+
+namespace Maui.Controls.Sample.Pages.MapsGalleries
+{
+ [XamlCompilation(XamlCompilationOptions.Compile)]
+ public partial class BasicMapGallery
+ {
+ public BasicMapGallery()
+ {
+ InitializeComponent();
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/Controls/samples/Controls.Sample/Pages/Controls/MapsGalleries/CircleGallery.xaml b/src/Controls/samples/Controls.Sample/Pages/Controls/MapsGalleries/CircleGallery.xaml
new file mode 100644
index 000000000000..7fef7c051984
--- /dev/null
+++ b/src/Controls/samples/Controls.Sample/Pages/Controls/MapsGalleries/CircleGallery.xaml
@@ -0,0 +1,45 @@
+
+
+
+
diff --git a/src/Controls/samples/Controls.Sample/Pages/Controls/MapsGalleries/CircleGallery.xaml.cs b/src/Controls/samples/Controls.Sample/Pages/Controls/MapsGalleries/CircleGallery.xaml.cs
new file mode 100644
index 000000000000..402978a05d71
--- /dev/null
+++ b/src/Controls/samples/Controls.Sample/Pages/Controls/MapsGalleries/CircleGallery.xaml.cs
@@ -0,0 +1,12 @@
+using Microsoft.Maui.Controls;
+
+namespace Maui.Controls.Sample.Pages.MapsGalleries
+{
+ public partial class CircleGallery : ContentPage
+ {
+ public CircleGallery()
+ {
+ InitializeComponent();
+ }
+ }
+}
diff --git a/src/Controls/samples/Controls.Sample/Pages/Controls/MapsGalleries/MapPinsGallery.xaml b/src/Controls/samples/Controls.Sample/Pages/Controls/MapsGalleries/MapPinsGallery.xaml
new file mode 100644
index 000000000000..5769bfd19634
--- /dev/null
+++ b/src/Controls/samples/Controls.Sample/Pages/Controls/MapsGalleries/MapPinsGallery.xaml
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Controls/samples/Controls.Sample/Pages/Controls/MapsGalleries/MapPinsGallery.xaml.cs b/src/Controls/samples/Controls.Sample/Pages/Controls/MapsGalleries/MapPinsGallery.xaml.cs
new file mode 100644
index 000000000000..216189c02fd2
--- /dev/null
+++ b/src/Controls/samples/Controls.Sample/Pages/Controls/MapsGalleries/MapPinsGallery.xaml.cs
@@ -0,0 +1,110 @@
+using System;
+using Microsoft.Maui.Controls.Maps;
+using Microsoft.Maui.Controls.Xaml;
+using Position = Microsoft.Maui.Devices.Sensors.Location;
+
+namespace Maui.Controls.Sample.Pages.MapsGalleries
+{
+ [XamlCompilation(XamlCompilationOptions.Compile)]
+ public partial class MapPinsGallery
+ {
+ private readonly Random _locationRandomSeed = new();
+ private int _locationIncrement = 0;
+
+ // TODO generate actual random pins
+ private readonly Position[] _randomLocations =
+ {
+ new Position(51.8833333333333, 176.65),
+ new Position(21.3166666666667, 157.833333333333),
+ new Position(71.3, 156.766666666667),
+ new Position(19.7, 155.083333333333),
+ new Position(61.2166666666667, 149.9),
+ new Position(70.2, 148.516666666667),
+ new Position(64.85, 147.716666666667),
+ new Position(57.05, 135.333333333333),
+ new Position(60.7166666666667, 135.05),
+ new Position(58.3, 134.416666666667),
+ new Position(69.45, 133.033333333333),
+ new Position(48.4333333333333, 123.366666666667),
+ new Position(49.25, 123.1),
+ new Position(45.5166666666667, 122.683333333333),
+ new Position(37.7833333333333, 122.416666666667),
+ new Position(47.6166666666667, 122.333333333333),
+ new Position(38.55, 121.466666666667),
+ new Position(50.6833333333333, 120.333333333333),
+ new Position(39.5333333333333, 119.816666666667),
+ new Position(34.4333333333333, 119.716666666667),
+ new Position(49.8833333333333, 119.5),
+ new Position(55.1666666666667, 118.8),
+ new Position(34.05, 118.25),
+ new Position(33.95, 117.4),
+ new Position(32.7166666666667, 117.166666666667),
+ new Position(32.5333333333333, 117.033333333333),
+ new Position(31.85, 116.6),
+ new Position(43.6166666666667, 116.2),
+ new Position(32.6666666666667, 115.466666666667),
+ new Position(36.1833333333333, 115.133333333333),
+ new Position(62.45, 114.4),
+ new Position(51.05, 114.066666666667),
+ new Position(53.5333333333333, 113.5),
+ new Position(33.45, 112.066666666667),
+ new Position(46.6, 112.033333333333),
+ };
+
+ public MapPinsGallery()
+ {
+ InitializeComponent();
+
+ var microsoftPin = new Pin()
+ {
+ Address = "One Microsoft Way, Redmond, USA",
+ Label = "Microsoft Visitors Center",
+ Location = new Position(47.64232, -122.13684),
+ };
+
+ microsoftPin.MarkerClicked += (s, a) =>
+ {
+ DisplayAlert("Marker", "OK", "OK");
+ };
+
+ // TODO this doesn't seem to work on iOS?
+ microsoftPin.InfoWindowClicked += (s, a) =>
+ {
+ DisplayAlert("Info", "OK", "OK");
+ };
+
+ pinsMap.Pins.Add(microsoftPin);
+ }
+
+ private void AddPin_Clicked(object sender, EventArgs e)
+ {
+ AddPin();
+ }
+
+ private void RemovePin_Clicked(object sender, EventArgs e)
+ {
+ if (pinsMap.Pins.Count > 0)
+ {
+ pinsMap.Pins.RemoveAt(pinsMap.Pins.Count - 1);
+ _locationIncrement--;
+ }
+ }
+
+ private void Add10Pins_Clicked(object sender, EventArgs e)
+ {
+ for (int i = 0; i <= 10; i++)
+ {
+ AddPin();
+ }
+ }
+
+ private void AddPin()
+ {
+ pinsMap.Pins.Add(new Pin()
+ {
+ Label = $"Location {_locationIncrement++}",
+ Location = _randomLocations[_locationRandomSeed.Next(0, _randomLocations.Length)],
+ });
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/Controls/samples/Controls.Sample/Pages/Controls/MapsGalleries/MapTypeGallery.xaml b/src/Controls/samples/Controls.Sample/Pages/Controls/MapsGalleries/MapTypeGallery.xaml
new file mode 100644
index 000000000000..95ef0683584c
--- /dev/null
+++ b/src/Controls/samples/Controls.Sample/Pages/Controls/MapsGalleries/MapTypeGallery.xaml
@@ -0,0 +1,37 @@
+
+
+
+
+
+
+
+ Street
+ Satellite
+ Hybrid
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Controls/samples/Controls.Sample/Pages/Controls/MapsGalleries/MapTypeGallery.xaml.cs b/src/Controls/samples/Controls.Sample/Pages/Controls/MapsGalleries/MapTypeGallery.xaml.cs
new file mode 100644
index 000000000000..ddaa0c248211
--- /dev/null
+++ b/src/Controls/samples/Controls.Sample/Pages/Controls/MapsGalleries/MapTypeGallery.xaml.cs
@@ -0,0 +1,46 @@
+using System;
+using Microsoft.Maui.Controls;
+using Microsoft.Maui.Controls.Xaml;
+using Microsoft.Maui.Maps;
+
+namespace Maui.Controls.Sample.Pages.MapsGalleries
+{
+ [XamlCompilation(XamlCompilationOptions.Compile)]
+ public partial class MapTypeGallery
+ {
+ public MapTypeGallery()
+ {
+ InitializeComponent();
+ }
+
+ void MapTypePicker_SelectedIndexChanged(object sender, System.EventArgs e)
+ {
+ var picker = (Picker)sender;
+
+ switch (picker.SelectedItem.ToString())
+ {
+ default:
+ case "Street":
+ mapTypeMap.MapType = MapType.Street;
+ break;
+ case "Satellite":
+ mapTypeMap.MapType = MapType.Satellite;
+ break;
+ case "Hybrid":
+ mapTypeMap.MapType = MapType.Hybrid;
+ break;
+ }
+ }
+
+ void OnSliderValueChanged(object sender, ValueChangedEventArgs e)
+ {
+ double zoomLevel = e.NewValue;
+ double latlongDegrees = 360 / (Math.Pow(2, zoomLevel));
+
+ if (mapTypeMap.VisibleRegion != null)
+ {
+ mapTypeMap.MoveToRegion(new Microsoft.Maui.Maps.MapSpan(mapTypeMap.VisibleRegion.Center, latlongDegrees, latlongDegrees));
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/Controls/samples/Controls.Sample/Pages/Controls/MapsGalleries/MapsGallery.cs b/src/Controls/samples/Controls.Sample/Pages/Controls/MapsGalleries/MapsGallery.cs
new file mode 100644
index 000000000000..ee6bfdf593e1
--- /dev/null
+++ b/src/Controls/samples/Controls.Sample/Pages/Controls/MapsGalleries/MapsGallery.cs
@@ -0,0 +1,27 @@
+using Microsoft.Maui.Controls;
+
+namespace Maui.Controls.Sample.Pages.MapsGalleries
+{
+ public class MapsGallery : ContentPage
+ {
+ public MapsGallery()
+ {
+ Content = new ScrollView
+ {
+ Content = new StackLayout
+ {
+ Spacing = 5,
+ Children =
+ {
+ GalleryBuilder.NavButton("Basic Map", () => new BasicMapGallery(), Navigation),
+ GalleryBuilder.NavButton("Map Type", () => new MapTypeGallery(), Navigation),
+ GalleryBuilder.NavButton("Map Pins", () => new MapPinsGallery(), Navigation),
+ GalleryBuilder.NavButton("Pins ItemsSource", () => new PinItemsSourceGallery(), Navigation),
+ GalleryBuilder.NavButton("Circle", () => new CircleGallery(), Navigation),
+ GalleryBuilder.NavButton("Polygon", () => new PolygonsGallery(), Navigation),
+ }
+ }
+ };
+ }
+ }
+}
diff --git a/src/Controls/samples/Controls.Sample/Pages/Controls/MapsGalleries/PinItemsSourceGallery.xaml b/src/Controls/samples/Controls.Sample/Pages/Controls/MapsGalleries/PinItemsSourceGallery.xaml
new file mode 100644
index 000000000000..cb17416bad60
--- /dev/null
+++ b/src/Controls/samples/Controls.Sample/Pages/Controls/MapsGalleries/PinItemsSourceGallery.xaml
@@ -0,0 +1,43 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Controls/samples/Controls.Sample/Pages/Controls/MapsGalleries/PinItemsSourceGallery.xaml.cs b/src/Controls/samples/Controls.Sample/Pages/Controls/MapsGalleries/PinItemsSourceGallery.xaml.cs
new file mode 100644
index 000000000000..0cf383c42213
--- /dev/null
+++ b/src/Controls/samples/Controls.Sample/Pages/Controls/MapsGalleries/PinItemsSourceGallery.xaml.cs
@@ -0,0 +1,147 @@
+using System;
+using Microsoft.Maui.Controls;
+using Microsoft.Maui.Maps;
+using Microsoft.Maui.Controls.Maps;
+using System.Windows.Input;
+using System.Collections;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.ComponentModel;
+using Position = Microsoft.Maui.Devices.Sensors.Location;
+
+namespace Maui.Controls.Sample.Pages.MapsGalleries
+{
+ public partial class PinItemsSourceGallery : ContentPage
+ {
+ public PinItemsSourceGallery()
+ {
+ InitializeComponent();
+ BindingContext = new PinItemsSourcePageViewModel();
+ map.MoveToRegion(MapSpan.FromCenterAndRadius(new Position(39.8283459, -98.5794797), Distance.FromMiles(1500)));
+ }
+
+ void OnMapClicked(object sender, MapClickedEventArgs e)
+ {
+ System.Diagnostics.Debug.WriteLine($"MapClick: {e.Location.Latitude}, {e.Location.Longitude}");
+ }
+ }
+
+ public class PinItemsSourcePageViewModel
+ {
+ int _pinCreatedCount = 0;
+ readonly ObservableCollection _locations;
+
+ public IEnumerable Locations => _locations;
+
+ public ICommand AddLocationCommand { get; }
+ public ICommand RemoveLocationCommand { get; }
+ public ICommand ClearLocationsCommand { get; }
+ public ICommand UpdateLocationsCommand { get; }
+ public ICommand ReplaceLocationCommand { get; }
+
+ public PinItemsSourcePageViewModel()
+ {
+ _locations = new ObservableCollection()
+ {
+ new Location("New York, USA", "The City That Never Sleeps", new Position(40.67, -73.94)),
+ new Location("Los Angeles, USA", "City of Angels", new Position(34.11, -118.41)),
+ new Location("San Francisco, USA", "Bay City", new Position(37.77, -122.45))
+ };
+
+ AddLocationCommand = new Command(AddLocation);
+ RemoveLocationCommand = new Command(RemoveLocation);
+ ClearLocationsCommand = new Command(() => _locations.Clear());
+ UpdateLocationsCommand = new Command(UpdateLocations);
+ ReplaceLocationCommand = new Command(ReplaceLocation);
+ }
+
+ void AddLocation()
+ {
+ _locations.Add(NewLocation());
+ }
+
+ void RemoveLocation()
+ {
+ if (_locations.Any())
+ {
+ _locations.Remove(_locations.First());
+ }
+ }
+
+ void UpdateLocations()
+ {
+ if (!_locations.Any())
+ {
+ return;
+ }
+
+ double lastLatitude = _locations.Last().Position.Latitude;
+ foreach (Location location in Locations)
+ {
+ location.Position = new Position(lastLatitude, location.Position.Longitude);
+ }
+ }
+
+ void ReplaceLocation()
+ {
+ if (!_locations.Any())
+ {
+ return;
+ }
+
+ _locations[_locations.Count - 1] = NewLocation();
+ }
+
+ Location NewLocation()
+ {
+ _pinCreatedCount++;
+ return new Location(
+ $"Pin {_pinCreatedCount}",
+ $"Desc {_pinCreatedCount}",
+ RandomPosition.Next(new Position(39.8283459, -98.5794797), 8, 19));
+ }
+ }
+
+ public class Location : INotifyPropertyChanged
+ {
+ Position _position;
+
+ public string Address { get; }
+ public string Description { get; }
+
+ public Position Position
+ {
+ get => _position;
+ set
+ {
+ _position = value;
+ PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(Position)));
+ }
+ }
+
+ public Location(string address, string description, Position position)
+ {
+ Address = address;
+ Description = description;
+ Position = position;
+ }
+
+ #region INotifyPropertyChanged
+
+ public event PropertyChangedEventHandler PropertyChanged;
+
+ #endregion
+ }
+
+ static class RandomPosition
+ {
+ static readonly Random Random = new Random(Environment.TickCount);
+
+ public static Position Next(Position position, double latitudeRange, double longitudeRange)
+ {
+ return new Position(
+ position.Latitude + (Random.NextDouble() * 2 - 1) * latitudeRange,
+ position.Longitude + (Random.NextDouble() * 2 - 1) * longitudeRange);
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/Controls/samples/Controls.Sample/Pages/Controls/MapsGalleries/PolygonsGallery.xaml b/src/Controls/samples/Controls.Sample/Pages/Controls/MapsGalleries/PolygonsGallery.xaml
new file mode 100644
index 000000000000..3cf5971736ad
--- /dev/null
+++ b/src/Controls/samples/Controls.Sample/Pages/Controls/MapsGalleries/PolygonsGallery.xaml
@@ -0,0 +1,216 @@
+
+
+
+
\ 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
new file mode 100644
index 000000000000..78b2e0bd06ca
--- /dev/null
+++ b/src/Controls/samples/Controls.Sample/Pages/Controls/MapsGalleries/PolygonsGallery.xaml.cs
@@ -0,0 +1,12 @@
+using Microsoft.Maui.Controls;
+
+namespace Maui.Controls.Sample.Pages.MapsGalleries
+{
+ public partial class PolygonsGallery : ContentPage
+ {
+ public PolygonsGallery()
+ {
+ InitializeComponent();
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/Controls/samples/Controls.Sample/Platforms/Android/AndroidManifest.xml b/src/Controls/samples/Controls.Sample/Platforms/Android/AndroidManifest.xml
index 7ac0aea76e0b..b9a6c3ba7db5 100644
--- a/src/Controls/samples/Controls.Sample/Platforms/Android/AndroidManifest.xml
+++ b/src/Controls/samples/Controls.Sample/Platforms/Android/AndroidManifest.xml
@@ -1,6 +1,30 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Controls/samples/Controls.Sample/ViewModels/ControlsViewModel.cs b/src/Controls/samples/Controls.Sample/ViewModels/ControlsViewModel.cs
index 16991e982b54..20a807cf1b9a 100644
--- a/src/Controls/samples/Controls.Sample/ViewModels/ControlsViewModel.cs
+++ b/src/Controls/samples/Controls.Sample/ViewModels/ControlsViewModel.cs
@@ -51,6 +51,9 @@ protected override IEnumerable CreateItems() => new[]
new SectionModel(typeof(LabelPage), "Label",
"The Label view is used for displaying text, both single and multi-line."),
+ new SectionModel(typeof(Pages.MapsGalleries.MapsGallery), "Maps",
+ "The Maps controls is used for showing a map including pins, traffic information, etc."),
+
new SectionModel(typeof(PickerPage), "Picker",
"The Picker view is a control for selecting a text item from a list of data."),
diff --git a/src/Controls/tests/Core.UnitTests/Controls.Core.UnitTests.csproj b/src/Controls/tests/Core.UnitTests/Controls.Core.UnitTests.csproj
index 669cd658c315..8da61893ca49 100644
--- a/src/Controls/tests/Core.UnitTests/Controls.Core.UnitTests.csproj
+++ b/src/Controls/tests/Core.UnitTests/Controls.Core.UnitTests.csproj
@@ -33,6 +33,7 @@
+
diff --git a/src/Controls/tests/Core.UnitTests/DistanceTests.cs b/src/Controls/tests/Core.UnitTests/DistanceTests.cs
index b68c8e58368c..0cba9b59e397 100644
--- a/src/Controls/tests/Core.UnitTests/DistanceTests.cs
+++ b/src/Controls/tests/Core.UnitTests/DistanceTests.cs
@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using Microsoft.Maui.Controls.Maps;
+using Microsoft.Maui.Maps;
using Xunit;
@@ -64,10 +65,10 @@ public void ConstructFromPositions()
{
const double EPSILON = 0.001;
- Position position1 = new Position(37.403992, -122.034988);
- Position position2 = new Position(37.776691, -122.416534);
+ var position1 = new Devices.Sensors.Location(37.403992, -122.034988);
+ var position2 = new Devices.Sensors.Location(37.776691, -122.416534);
- Distance distance = Distance.BetweenPositions(position1, position2);
+ var distance = Distance.BetweenPositions(position1, position2);
Assert.True(Math.Abs(distance.Meters - 53363.08) < EPSILON);
Assert.True(Math.Abs(distance.Kilometers - 53.36308) < EPSILON);
diff --git a/src/Controls/tests/Core.UnitTests/GeocoderUnitTests.cs b/src/Controls/tests/Core.UnitTests/GeocoderUnitTests.cs
deleted file mode 100644
index db44c620d3ee..000000000000
--- a/src/Controls/tests/Core.UnitTests/GeocoderUnitTests.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Microsoft.Maui.Controls.Maps;
-using Xunit;
-
-
-namespace Microsoft.Maui.Controls.Core.UnitTests
-{
-
- public class GeocoderUnitTests : BaseTestFixture
- {
- [Fact]
- public async Task AddressesForPosition()
- {
- Geocoder.GetAddressesForPositionFuncAsync = GetAddressesForPositionFuncAsync;
- var geocoder = new Geocoder();
- var result = await geocoder.GetAddressesForPositionAsync(new Position(1, 2));
- Assert.Equal(new String[] { "abc", "def" }, result);
- }
-
- async Task> GetAddressesForPositionFuncAsync(Position position)
- {
- Assert.Equal(new Position(1, 2), position);
- return new string[] { "abc", "def" };
- }
-
- [Fact]
- public async Task PositionsForAddress()
- {
- Geocoder.GetPositionsForAddressAsyncFunc = GetPositionsForAddressAsyncFunc;
- var geocoder = new Geocoder();
- var result = await geocoder.GetPositionsForAddressAsync("quux");
- Assert.Equal(new Position[] { new Position(1, 2), new Position(3, 4) }, result);
- }
-
- async Task> GetPositionsForAddressAsyncFunc(string address)
- {
- Assert.Equal("quux", address);
- return new Position[] { new Position(1, 2), new Position(3, 4) };
- }
- }
-}
diff --git a/src/Controls/tests/Core.UnitTests/MapSpanTests.cs b/src/Controls/tests/Core.UnitTests/MapSpanTests.cs
index 7e3dc9722d74..ee772164085b 100644
--- a/src/Controls/tests/Core.UnitTests/MapSpanTests.cs
+++ b/src/Controls/tests/Core.UnitTests/MapSpanTests.cs
@@ -1,4 +1,6 @@
using Microsoft.Maui.Controls.Maps;
+using Microsoft.Maui.Devices.Sensors;
+using Microsoft.Maui.Maps;
using Xunit;
namespace Microsoft.Maui.Controls.Core.UnitTests
@@ -9,9 +11,9 @@ public class MapSpanTests : BaseTestFixture
[Fact]
public void Constructor()
{
- var span = new MapSpan(new Position(0, 0), 1, 1);
+ var span = new MapSpan(new Location(0, 0), 1, 1);
- Assert.Equal(new Position(0, 0), span.Center);
+ Assert.Equal(new Location(0, 0), span.Center);
Assert.Equal(1, span.LatitudeDegrees);
Assert.Equal(1, span.LongitudeDegrees);
Assert.True(span.Radius.Kilometers > 54 && span.Radius.Kilometers < 56);
@@ -20,23 +22,23 @@ public void Constructor()
[Fact]
public void EqualsTest()
{
- Assert.True(new MapSpan(new Position(1, 2), 3, 4) == new MapSpan(new Position(1, 2), 3, 4));
- Assert.True(new MapSpan(new Position(1, 2), 3, 4) != new MapSpan(new Position(2, 3), 4, 5));
- Assert.True(new MapSpan(new Position(1, 2), 3, 4).Equals(new MapSpan(new Position(1, 2), 3, 4)));
- Assert.False(new MapSpan(new Position(1, 2), 3, 4).Equals("MapSpan"));
- Assert.False(new MapSpan(new Position(1, 2), 3, 4).Equals(null));
+ Assert.True(new MapSpan(new Location(1, 2), 3, 4) == new MapSpan(new Location(1, 2), 3, 4));
+ Assert.True(new MapSpan(new Location(1, 2), 3, 4) != new MapSpan(new Location(2, 3), 4, 5));
+ Assert.True(new MapSpan(new Location(1, 2), 3, 4).Equals(new MapSpan(new Location(1, 2), 3, 4)));
+ Assert.False(new MapSpan(new Location(1, 2), 3, 4).Equals("MapSpan"));
+ Assert.False(new MapSpan(new Location(1, 2), 3, 4).Equals(null));
}
[Fact]
public void HashCode()
{
- Assert.Equal(new MapSpan(new Position(1, 2), 3, 4).GetHashCode(), new MapSpan(new Position(1, 2), 3, 4).GetHashCode());
+ Assert.Equal(new MapSpan(new Location(1, 2), 3, 4).GetHashCode(), new MapSpan(new Location(1, 2), 3, 4).GetHashCode());
}
[Fact]
public void RangeClamping()
{
- var span = new MapSpan(new Position(0, 0), -1, -2);
+ var span = new MapSpan(new Location(0, 0), -1, -2);
Assert.True(span.LatitudeDegrees > 0);
Assert.True(span.LongitudeDegrees > 0);
}
diff --git a/src/Controls/tests/Core.UnitTests/MapTests.cs b/src/Controls/tests/Core.UnitTests/MapTests.cs
index ff5eec391c69..aec4b9f225a8 100644
--- a/src/Controls/tests/Core.UnitTests/MapTests.cs
+++ b/src/Controls/tests/Core.UnitTests/MapTests.cs
@@ -3,6 +3,8 @@
using System.Collections.ObjectModel;
using System.Linq;
using Microsoft.Maui.Controls.Maps;
+using Microsoft.Maui.Devices.Sensors;
+using Microsoft.Maui.Maps;
using Xunit;
namespace Microsoft.Maui.Controls.Core.UnitTests
@@ -18,7 +20,7 @@ public void AddPin()
var home = new Pin
{
Label = "Home",
- Position = new Position(88, 2),
+ Location = new Location(88, 2),
Type = PinType.Place,
Address = "123 My Place"
};
@@ -30,7 +32,7 @@ public void AddPin()
var mall = new Pin
{
Label = "Mall",
- Position = new Position(-12, -67),
+ Location = new Location(-12, -67),
Type = PinType.Place,
Address = "123 Fun"
};
@@ -38,7 +40,7 @@ public void AddPin()
map.Pins.Add(mall);
Assert.Equal(2, map.Pins.Count);
- Assert.Equal(map.Pins[1].Position.Latitude, -12);
+ Assert.Equal(map.Pins[1].Location.Latitude, -12);
}
[Fact]
@@ -47,7 +49,7 @@ public void AddPinWithoutName()
var map = new Map();
var noNamePin = new Pin
{
- Position = new Position(50, 50),
+ Location = new Location(50, 50),
Type = PinType.Generic,
Address = "123 Fun"
};
@@ -62,7 +64,7 @@ public void AddPinWithoutAddress()
var map = new Map();
var noAddressPin = new Pin
{
- Position = new Position(37.9, -20.87),
+ Location = new Location(37.9, -20.87),
Label = "I have no address",
Type = PinType.SearchResult
};
@@ -73,19 +75,6 @@ public void AddPinWithoutAddress()
Assert.Null(map.Pins[0].Address);
}
- [Fact]
- public void Constructor()
- {
- var center = new Position(15.5, 176);
- var span = new MapSpan(center, 1, 2);
- var map = new Map(span);
-
- Assert.Equal(1, map.LastMoveToRegion.LatitudeDegrees);
- Assert.Equal(2, map.LastMoveToRegion.LongitudeDegrees);
- var position = new Position(15.5, 176);
- Assert.Equal(position, map.LastMoveToRegion.Center);
- }
-
[Fact]
public void RemovePin()
{
@@ -93,7 +82,7 @@ public void RemovePin()
var genericPlace = new Pin
{
Label = "Generic",
- Position = new Position(-12, -67),
+ Location = new Location(-12, -67),
Type = PinType.Generic,
Address = "XXX"
};
@@ -101,7 +90,7 @@ public void RemovePin()
var mall = new Pin
{
Label = "Mall",
- Position = new Position(-29, -87),
+ Location = new Location(-29, -87),
Type = PinType.Place,
Address = "123 Fun"
};
@@ -120,29 +109,10 @@ public void RemovePin()
}
[Fact]
- public void VisibleRegion()
- {
- var map = new Map(new MapSpan(new Position(), 0, 0));
- map.MoveToRegion(new MapSpan(new Position(1, 2), 3, 4));
- Assert.Null(map.VisibleRegion);
-
- bool signaled = false;
- MessagingCenter.Subscribe(this, "MapMoveToRegion", (s, a) =>
- {
- signaled = true;
- map.SetVisibleRegion(a);
- }, map);
-
- map.MoveToRegion(new MapSpan(new Position(1, 2), 3, 4));
- Assert.Equal(new MapSpan(new Position(1, 2), 3, 4), map.LastMoveToRegion);
- Assert.True(signaled);
- }
-
- [Fact]
- public void VisibleRegionDoubleSet()
+ public void VisibleRegionDoubleSetShouldntTriggerChange()
{
var map = new Map();
-
+ ((IMap)map).VisibleRegion = MapSpan.FromCenterAndRadius(new Location(1, 1), Distance.FromKilometers(1));
bool signaled = false;
map.PropertyChanged += (sender, args) =>
{
@@ -150,7 +120,7 @@ public void VisibleRegionDoubleSet()
signaled = true;
};
- map.SetVisibleRegion(map.VisibleRegion);
+ ((IMap)map).VisibleRegion = MapSpan.FromCenterAndRadius(new Location(1, 1), Distance.FromKilometers(1));
Assert.False(signaled);
}
@@ -293,14 +263,14 @@ public void TracksItemTemplate()
var itemsSource = new ObservableCollection(Enumerable.Range(0, 3));
map.ItemsSource = itemsSource;
Assert.True(IsMapWithItemsSource(itemsSource, map));
- foreach (Pin pin in map.Pins)
+ foreach (IMapPin pin in map.Pins)
{
Assert.True(pin.Address == "Address");
}
map.ItemTemplate = GetItemTemplate("Address 2");
Assert.True(IsMapWithItemsSource(itemsSource, map));
- foreach (Pin pin in map.Pins)
+ foreach (IMapPin pin in map.Pins)
{
Assert.True(pin.Address == "Address 2");
}
@@ -316,7 +286,7 @@ public void ItemTemplateSelectorIsSet()
map.ItemTemplateSelector = new TestDataTemplateSelector("Address 2");
Assert.True(IsMapWithItemsSource(itemsSource, map));
- foreach (Pin pin in map.Pins)
+ foreach (IMapPin pin in map.Pins)
{
Assert.True(pin.Address == "Address 2");
}
@@ -333,7 +303,7 @@ public void ItemTemplateTakesPrecendenceOverItemTemplateSelector()
map.ItemTemplateSelector = new TestDataTemplateSelector("Address 2");
Assert.True(IsMapWithItemsSource(itemsSource, map));
- foreach (Pin pin in map.Pins)
+ foreach (IMapPin pin in map.Pins)
{
Assert.Equal("Address 1", pin.Address);
}
@@ -446,7 +416,7 @@ static bool IsMapWithItemsSource(IEnumerable itemsSource, Map map)
foreach (object item in itemsSource)
{
// Pins collection order is not tracked, so just make sure a Pin for item exists
- if (!map.Pins.Any(p => Equals(item, p.BindingContext)))
+ if (!map.Pins.Any(p => Equals(item, (p as Pin).BindingContext)))
{
return false;
}
@@ -463,7 +433,7 @@ static DataTemplate GetItemTemplate(string address = null)
{
Address = address ?? "Address",
Label = "Label",
- Position = new Position()
+ Location = new Location()
});
}
diff --git a/src/Controls/tests/Core.UnitTests/NotifiedPropertiesTests.cs b/src/Controls/tests/Core.UnitTests/NotifiedPropertiesTests.cs
index d72ed536ff7f..02adc4d0ca2f 100644
--- a/src/Controls/tests/Core.UnitTests/NotifiedPropertiesTests.cs
+++ b/src/Controls/tests/Core.UnitTests/NotifiedPropertiesTests.cs
@@ -4,6 +4,7 @@
using System.Windows.Input;
using Microsoft.Maui.Controls.Maps;
using Microsoft.Maui.Graphics;
+using Microsoft.Maui.Maps;
using Xunit;
namespace Microsoft.Maui.Controls.Core.UnitTests
@@ -114,8 +115,8 @@ public override string DebugName
new PropertyTestCase ("FormattedText", v => v.FormattedText, (v, o) => v.FormattedText = o, () => default (FormattedString), new FormattedString()),
new PropertyTestCase ("MapType", v => v.MapType, (v, o) => v.MapType = o, () => MapType.Street, MapType.Satellite),
new PropertyTestCase ("IsShowingUser", v => v.IsShowingUser, (v, o) => v.IsShowingUser = o, () => false, true),
- new PropertyTestCase ("HasScrollEnabled", v => v.HasScrollEnabled, (v, o) => v.HasScrollEnabled = o, () => true, false),
- new PropertyTestCase ("HasZoomEnabled", v => v.HasZoomEnabled, (v, o) => v.HasZoomEnabled = o, () => true, false),
+ new PropertyTestCase ("IsScrollEnabled", v => v.IsScrollEnabled, (v, o) => v.IsScrollEnabled = o, () => true, false),
+ new PropertyTestCase ("IsZoomEnabled", v => v.IsZoomEnabled, (v, o) => v.IsZoomEnabled = o, () => true, false),
new PropertyTestCase ("HasRenderLoop", v => v.HasRenderLoop, (v, o) => v.HasRenderLoop = o, () => false, true),
new PropertyTestCase ("BackgroundImageSource", v => v.BackgroundImageSource, (v, o) => v.BackgroundImageSource = o, () => null, "Foo"),
new PropertyTestCase ("BackgroundColor", v => v.BackgroundColor, (v, o) => v.BackgroundColor = o, () => default(Color), new Color (0, 1, 0)),
diff --git a/src/Controls/tests/Core.UnitTests/PinTests.cs b/src/Controls/tests/Core.UnitTests/PinTests.cs
index da7eae0d19f8..9d721baf5a53 100644
--- a/src/Controls/tests/Core.UnitTests/PinTests.cs
+++ b/src/Controls/tests/Core.UnitTests/PinTests.cs
@@ -1,4 +1,5 @@
using Microsoft.Maui.Controls.Maps;
+using Microsoft.Maui.Devices.Sensors;
using Xunit;
namespace Microsoft.Maui.Controls.Core.UnitTests
@@ -12,13 +13,14 @@ public void Constructor()
Pin pin = new Pin
{
Type = PinType.SavedPin,
- Position = new Position(-92, 178),
+ Location = new Location(-90, 178),
Label = "My Desktop",
Address = "123 Hello World Street"
};
Assert.Equal(PinType.SavedPin, pin.Type);
- Assert.Equal(pin.Position.Latitude, -90);
+ Assert.Equal(-90, pin.Location.Latitude);
+ Assert.Equal(178, pin.Location.Longitude);
Assert.Equal("My Desktop", pin.Label);
Assert.Equal("123 Hello World Street", pin.Address);
}
@@ -31,7 +33,7 @@ public void EqualsTest()
Pin pin3 = new Pin
{
Type = PinType.Place,
- Position = new Position(12, -24),
+ Location = new Location(12, -24),
Label = "Test",
Address = "123 Test street"
};
@@ -39,7 +41,7 @@ public void EqualsTest()
Pin pin4 = new Pin
{
Type = PinType.Place,
- Position = new Position(12, -24),
+ Location = new Location(12, -24),
Label = "Test",
Address = "123 Test street"
};
@@ -55,7 +57,7 @@ public void EqualsOp()
var pin1 = new Pin
{
Type = PinType.Place,
- Position = new Position(12, -24),
+ Location = new Location(12, -24),
Label = "Test",
Address = "123 Test street"
};
@@ -63,7 +65,7 @@ public void EqualsOp()
var pin2 = new Pin
{
Type = PinType.Place,
- Position = new Position(12, -24),
+ Location = new Location(12, -24),
Label = "Test",
Address = "123 Test street"
};
@@ -77,7 +79,7 @@ public void InEqualsOp()
var pin1 = new Pin
{
Type = PinType.Place,
- Position = new Position(11.9, -24),
+ Location = new Location(11.9, -24),
Label = "Test",
Address = "123 Test street"
};
@@ -85,7 +87,7 @@ public void InEqualsOp()
var pin2 = new Pin
{
Type = PinType.Place,
- Position = new Position(12, -24),
+ Location = new Location(12, -24),
Label = "Test",
Address = "123 Test street"
};
diff --git a/src/Controls/tests/Core.UnitTests/PositionTests.cs b/src/Controls/tests/Core.UnitTests/PositionTests.cs
deleted file mode 100644
index eb95855f8fa5..000000000000
--- a/src/Controls/tests/Core.UnitTests/PositionTests.cs
+++ /dev/null
@@ -1,91 +0,0 @@
-using System;
-using Microsoft.Maui.Controls.Maps;
-using Xunit;
-
-
-namespace Microsoft.Maui.Controls.Core.UnitTests
-{
-
- public class PositionTests : BaseTestFixture
- {
- [Fact]
- public void Construction()
- {
- Position position = new Position();
- Assert.Equal(0, position.Latitude);
- Assert.Equal(0, position.Longitude);
- }
-
- [Fact]
- public void CopyConstructor()
- {
- var position = new Position(12, 13);
- var copy = position;
-
- Assert.Equal(12, copy.Latitude);
- Assert.Equal(13, copy.Longitude);
- }
-
- [Fact]
- public void EqualityOp()
- {
- var position1 = new Position(-28, 180);
- var position2 = new Position(-28, 180);
- Assert.True(position1 == position2);
- }
-
- [Fact]
- public void InEqualityOp()
- {
- var position1 = new Position(-8, 180);
- var position2 = new Position(-28, 180);
- Assert.True(position1 != position2);
- }
-
-
- [Fact]
- public void EqualsTest()
- {
- var position1 = new Position(78, 167);
- var position2 = new Position(78, 167);
- Assert.True(position1.Equals(position2));
- Assert.False(position2.Equals(null));
- Assert.True(position2.Equals(position2));
- Assert.False(position2.Equals("position2"));
- }
-
- [Fact]
- public void LatitudeClamping()
- {
- var position = new Position(-90.1, 0);
- Assert.Equal(position.Latitude, -90);
-
- position = new Position(165, 0);
- Assert.Equal(90, position.Latitude);
-
- position = new Position(15.0, 0);
- Assert.Equal(15.0, position.Latitude);
- }
-
- [Fact]
- public void LongitudeClamping()
- {
- var position = new Position(0, -180.001);
- Assert.Equal(position.Longitude, -180.0);
-
- position = new Position(0, 1000);
- Assert.Equal(180, position.Longitude);
-
- position = new Position(0, 0);
- Assert.Equal(0, position.Longitude);
- }
-
- [Fact]
- public void Hashcode()
- {
- var position = new Position(20, 25);
- var position2 = new Position(25, 20);
- Assert.NotEqual(position.GetHashCode(), position2.GetHashCode());
- }
- }
-}
diff --git a/src/Controls/tests/Xaml.UnitTests/Issues/Unreported003.xaml b/src/Controls/tests/Xaml.UnitTests/Issues/Unreported003.xaml
index 3d93f0f3af38..ae6dd9bac671 100644
--- a/src/Controls/tests/Xaml.UnitTests/Issues/Unreported003.xaml
+++ b/src/Controls/tests/Xaml.UnitTests/Issues/Unreported003.xaml
@@ -1,26 +1,28 @@
-
+
-
+
52.325
-113.9
-
+
.8
.8
-
+
\ No newline at end of file
diff --git a/src/Core/maps/src/Core/ICircleMapElement.cs b/src/Core/maps/src/Core/ICircleMapElement.cs
new file mode 100644
index 000000000000..10eb38514823
--- /dev/null
+++ b/src/Core/maps/src/Core/ICircleMapElement.cs
@@ -0,0 +1,10 @@
+using Microsoft.Maui.Devices.Sensors;
+
+namespace Microsoft.Maui.Maps
+{
+ public interface ICircleMapElement : IMapElement, IFilledMapElement
+ {
+ Location Center { get; }
+ Distance Radius { get; }
+ }
+}
diff --git a/src/Core/maps/src/Core/IFilledMapElement.cs b/src/Core/maps/src/Core/IFilledMapElement.cs
new file mode 100644
index 000000000000..25c64296cdc8
--- /dev/null
+++ b/src/Core/maps/src/Core/IFilledMapElement.cs
@@ -0,0 +1,9 @@
+using Microsoft.Maui.Graphics;
+
+namespace Microsoft.Maui.Maps
+{
+ public interface IFilledMapElement : IMapElement
+ {
+ Paint? Fill { get; }
+ }
+}
diff --git a/src/Core/maps/src/Core/IGeoPathMapElement.cs b/src/Core/maps/src/Core/IGeoPathMapElement.cs
new file mode 100644
index 000000000000..b3665752fe7c
--- /dev/null
+++ b/src/Core/maps/src/Core/IGeoPathMapElement.cs
@@ -0,0 +1,9 @@
+using System.Collections.Generic;
+using Microsoft.Maui.Devices.Sensors;
+
+namespace Microsoft.Maui.Maps
+{
+ public interface IGeoPathMapElement : IMapElement, IList
+ {
+ }
+}
diff --git a/src/Core/maps/src/Core/IMap.cs b/src/Core/maps/src/Core/IMap.cs
new file mode 100644
index 000000000000..e4330fd356bf
--- /dev/null
+++ b/src/Core/maps/src/Core/IMap.cs
@@ -0,0 +1,61 @@
+using System.Collections.Generic;
+using Microsoft.Maui.Devices.Sensors;
+
+namespace Microsoft.Maui.Maps
+{
+ ///
+ /// Represents a that displays a map.
+ ///
+ public interface IMap : IView
+ {
+ ///
+ /// The currently visible MapSpan of this Map.
+ ///
+ MapSpan? VisibleRegion { get; set; }
+
+ ///
+ /// Gets the display type of map that can be shown.
+ ///
+ MapType MapType { get; }
+
+ ///
+ /// Get whether the Map is showing the user's current location.
+ ///
+ bool IsShowingUser { get; }
+
+ ///
+ /// Get whether the Map is allowed to scroll.
+ ///
+ bool IsScrollEnabled { get; }
+
+ ///
+ /// Get whether this Map is allowed to zoom.
+ ///
+ bool IsZoomEnabled { get; }
+
+ ///
+ /// Get whether this Map is showing traffic information.
+ ///
+ bool IsTrafficEnabled { get; }
+
+ ///
+ /// The pins that are to be shown on this Map.
+ ///
+ IList Pins { get; }
+
+ ///
+ /// The pins that are to be shown on this Map.
+ ///
+ IList Elements { get; }
+
+ ///
+ /// Method called by the handler when user clicks on the Map.
+ ///
+ void Clicked(Location position);
+
+ ///
+ /// Moves the map so that it displays the specified MapSpan region.
+ ///
+ void MoveToRegion(MapSpan region);
+ }
+}
diff --git a/src/Core/maps/src/Core/IMapElement.cs b/src/Core/maps/src/Core/IMapElement.cs
new file mode 100644
index 000000000000..3acaad1dcbc1
--- /dev/null
+++ b/src/Core/maps/src/Core/IMapElement.cs
@@ -0,0 +1,7 @@
+namespace Microsoft.Maui.Maps
+{
+ public interface IMapElement : IElement, IStroke
+ {
+ object? MapElementId { get; set; }
+ }
+}
diff --git a/src/Core/maps/src/Core/IMapPin.cs b/src/Core/maps/src/Core/IMapPin.cs
new file mode 100644
index 000000000000..4198f169fbb1
--- /dev/null
+++ b/src/Core/maps/src/Core/IMapPin.cs
@@ -0,0 +1,32 @@
+using System.ComponentModel;
+using Microsoft.Maui.Devices.Sensors;
+
+namespace Microsoft.Maui.Maps
+{
+ ///
+ /// Represents a Pin that displays a map.
+ ///
+ public interface IMapPin : IElement
+ {
+ ///
+ /// The physical address that is associated with this pin.
+ ///
+ string Address { get; }
+
+ ///
+ /// The label that is shown for this pin.
+ ///
+ string Label { get; }
+
+ ///
+ /// The geographical location of this pin.
+ ///
+ Location Location { get; }
+
+ object? MarkerId { get; set; }
+
+ bool SendMarkerClick();
+
+ bool SendInfoWindowClick();
+ }
+}
diff --git a/src/Core/maps/src/Handlers/Map/IMapHandler.cs b/src/Core/maps/src/Handlers/Map/IMapHandler.cs
new file mode 100644
index 000000000000..81404345f4e0
--- /dev/null
+++ b/src/Core/maps/src/Handlers/Map/IMapHandler.cs
@@ -0,0 +1,25 @@
+#if __IOS__ || MACCATALYST
+using PlatformView = Microsoft.Maui.Maps.Platform.MauiMKMapView;
+#elif MONOANDROID
+using Android.Gms.Maps;
+using PlatformView = Android.Gms.Maps.MapView;
+#elif WINDOWS
+using PlatformView = Microsoft.UI.Xaml.FrameworkElement;
+#elif TIZEN
+using PlatformView = ElmSharp.EvasObject;
+#elif (NETSTANDARD || !PLATFORM) || (NET6_0 && !IOS && !ANDROID && !TIZEN)
+using PlatformView = System.Object;
+#endif
+
+namespace Microsoft.Maui.Maps.Handlers
+{
+ public interface IMapHandler : IViewHandler
+ {
+ new IMap VirtualView { get; }
+ new PlatformView PlatformView { get; }
+#if MONOANDROID
+ GoogleMap? Map { get; set; }
+#endif
+ void UpdateMapElement(IMapElement element);
+ }
+}
diff --git a/src/Core/maps/src/Handlers/Map/MapHandler.Android.cs b/src/Core/maps/src/Handlers/Map/MapHandler.Android.cs
new file mode 100644
index 000000000000..f10060730c08
--- /dev/null
+++ b/src/Core/maps/src/Handlers/Map/MapHandler.Android.cs
@@ -0,0 +1,632 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.ComponentModel;
+using System.Linq;
+using Android;
+using Android.Content.PM;
+using Android.Gms.Maps;
+using Android.Gms.Maps.Model;
+using Android.OS;
+using AndroidX.Core.Content;
+using Java.Lang;
+using Java.Util.Logging;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Microsoft.Maui.Graphics;
+using Microsoft.Maui.Graphics.Platform;
+using Microsoft.Maui.Handlers;
+using Microsoft.Maui.Platform;
+using ACircle = Android.Gms.Maps.Model.Circle;
+using APolygon = Android.Gms.Maps.Model.Polygon;
+using APolyline = Android.Gms.Maps.Model.Polyline;
+using Math = System.Math;
+
+namespace Microsoft.Maui.Maps.Handlers
+{
+ public partial class MapHandler : ViewHandler
+ {
+ bool _init = true;
+
+ MapCallbackHandler? _mapReady;
+ MapSpan? _lastMoveToRegion;
+ List? _markers;
+ IList? _pins;
+ IList? _elements;
+ List? _polylines;
+ List? _polygons;
+ List? _circles;
+
+ public GoogleMap? Map { get; set; }
+
+ static Bundle? s_bundle;
+
+ public static Bundle? Bundle
+ {
+ set { s_bundle = value; }
+ }
+
+ protected override void ConnectHandler(MapView platformView)
+ {
+ base.ConnectHandler(platformView);
+ _mapReady = new MapCallbackHandler(this);
+ platformView.GetMapAsync(_mapReady);
+ platformView.LayoutChange += MapViewLayoutChange;
+ }
+
+ protected override void DisconnectHandler(MapView platformView)
+ {
+ base.DisconnectHandler(platformView);
+ platformView.LayoutChange -= MapViewLayoutChange;
+
+ if (Map != null)
+ {
+ Map.SetOnCameraMoveListener(null);
+ Map.MarkerClick -= OnMarkerClick;
+ Map.InfoWindowClick -= OnInfoWindowClick;
+ Map.MapClick -= OnMapClick;
+ }
+
+ _mapReady = null;
+ }
+
+ protected override MapView CreatePlatformView()
+ {
+ MapView mapView = new MapView(Context);
+ mapView.OnCreate(s_bundle);
+ mapView.OnResume();
+ return mapView;
+ }
+
+ public static void MapMapType(IMapHandler handler, IMap map)
+ {
+ GoogleMap? googleMap = handler?.Map;
+ if (googleMap == null)
+ return;
+
+ googleMap.MapType = map.MapType switch
+ {
+ MapType.Street => GoogleMap.MapTypeNormal,
+ MapType.Satellite => GoogleMap.MapTypeSatellite,
+ MapType.Hybrid => GoogleMap.MapTypeHybrid,
+ _ => throw new ArgumentOutOfRangeException(),
+ };
+ }
+
+ public static void MapIsShowingUser(IMapHandler handler, IMap map)
+ {
+ GoogleMap? googleMap = handler?.Map;
+ if (googleMap == null)
+ return;
+
+ if (handler?.MauiContext?.Context == null)
+ return;
+
+ if (map.IsShowingUser)
+ {
+ var coarseLocationPermission = ContextCompat.CheckSelfPermission(handler.MauiContext.Context, Manifest.Permission.AccessCoarseLocation);
+ var fineLocationPermission = ContextCompat.CheckSelfPermission(handler.MauiContext.Context, Manifest.Permission.AccessFineLocation);
+
+ if (coarseLocationPermission == Permission.Granted || fineLocationPermission == Permission.Granted)
+ {
+ googleMap.MyLocationEnabled = googleMap.UiSettings.MyLocationButtonEnabled = true;
+ }
+ else
+ {
+ handler.MauiContext?.Services.GetService>()?.LogWarning("Missing location permissions for IsShowingUser");
+ googleMap.MyLocationEnabled = googleMap.UiSettings.MyLocationButtonEnabled = false;
+ }
+ }
+ else
+ {
+ googleMap.MyLocationEnabled = googleMap.UiSettings.MyLocationButtonEnabled = false;
+ }
+ }
+
+ public static void MapIsScrollEnabled(IMapHandler handler, IMap map)
+ {
+ GoogleMap? googleMap = handler?.Map;
+ if (googleMap == null)
+ return;
+
+ googleMap.UiSettings.ScrollGesturesEnabled = map.IsScrollEnabled;
+ }
+
+ public static void MapIsTrafficEnabled(IMapHandler handler, IMap map)
+ {
+ GoogleMap? googleMap = handler?.Map;
+ if (googleMap == null)
+ return;
+
+ googleMap.TrafficEnabled = map.IsTrafficEnabled;
+ }
+
+ public static void MapIsZoomEnabled(IMapHandler handler, IMap map)
+ {
+ GoogleMap? googleMap = handler?.Map;
+ if (googleMap == null)
+ return;
+
+ googleMap.UiSettings.ZoomControlsEnabled = map.IsZoomEnabled;
+ googleMap.UiSettings.ZoomGesturesEnabled = map.IsZoomEnabled;
+ }
+
+ public static void MapMoveToRegion(IMapHandler handler, IMap map, object? arg)
+ {
+ MapSpan? newRegion = arg as MapSpan;
+ if (newRegion != null)
+ (handler as MapHandler)?.MoveToRegion(newRegion, true);
+ }
+
+ public void UpdateMapElement(IMapElement element)
+ {
+ switch (element)
+ {
+ case IGeoPathMapElement polyline:
+ {
+ if (element is IFilledMapElement polygon)
+ {
+ PolygonOnPropertyChanged(polyline);
+ }
+ else
+ {
+ PolylineOnPropertyChanged(polyline);
+ }
+ break;
+ }
+ case ICircleMapElement circle:
+ {
+ CircleOnPropertyChanged(circle);
+ break;
+ }
+ }
+ }
+
+ void PolygonOnPropertyChanged(IGeoPathMapElement mauiPolygon)
+ {
+ var nativePolygon = GetNativePolygon(mauiPolygon);
+
+ if (nativePolygon == null)
+ return;
+
+ if (mauiPolygon.Stroke is SolidPaint solidPaint)
+ nativePolygon.StrokeColor = solidPaint.Color.AsColor();
+
+ if ((mauiPolygon as IFilledMapElement)?.Fill is SolidPaint solidFillPaint)
+ nativePolygon.FillColor = solidFillPaint.Color.AsColor();
+
+ nativePolygon.StrokeWidth = (float)mauiPolygon.StrokeThickness;
+ nativePolygon.Points = mauiPolygon.Select(position => new LatLng(position.Latitude, position.Longitude)).ToList();
+ }
+
+ void PolylineOnPropertyChanged(IGeoPathMapElement mauiPolyline)
+ {
+ var nativePolyline = GetNativePolyline(mauiPolyline);
+
+ if (nativePolyline == null)
+ return;
+
+ if (mauiPolyline.Stroke is SolidPaint solidPaint)
+ nativePolyline.Color = solidPaint.Color.AsColor();
+
+ nativePolyline.Width = (float)mauiPolyline.StrokeThickness;
+ nativePolyline.Points = mauiPolyline.Select(position => new LatLng(position.Latitude, position.Longitude)).ToList();
+ }
+
+
+ void CircleOnPropertyChanged(ICircleMapElement mauiCircle)
+ {
+ var nativeCircle = GetNativeCircle(mauiCircle);
+
+ if (nativeCircle == null)
+ return;
+
+
+ if (mauiCircle.Stroke is SolidPaint solidPaint)
+ nativeCircle.FillColor = solidPaint.Color.AsColor();
+
+ if (mauiCircle.Fill is SolidPaint solidFillPaint)
+ nativeCircle.FillColor = solidFillPaint.Color.AsColor();
+
+ nativeCircle.Center = new LatLng(mauiCircle.Center.Latitude, mauiCircle.Center.Longitude);
+ nativeCircle.Radius = mauiCircle.Radius.Meters;
+ nativeCircle.StrokeWidth = (float)mauiCircle.StrokeThickness;
+
+ }
+
+ protected APolyline? GetNativePolyline(IGeoPathMapElement polyline)
+ {
+ APolyline? targetPolyline = null;
+
+ if (_polylines != null && polyline.MapElementId is string)
+ {
+ for (int i = 0; i < _polylines.Count; i++)
+ {
+ var native = _polylines[i];
+ if (native.Id == (string)polyline.MapElementId)
+ {
+ targetPolyline = native;
+ break;
+ }
+ }
+ }
+
+ return targetPolyline;
+ }
+
+ protected ACircle? GetNativeCircle(ICircleMapElement circle)
+ {
+ ACircle? targetCircle = null;
+
+ if (_circles != null && circle.MapElementId is string)
+ {
+ for (int i = 0; i < _circles.Count; i++)
+ {
+ var native = _circles[i];
+ if (native.Id == (string)circle.MapElementId)
+ {
+ targetCircle = native;
+ break;
+ }
+ }
+ }
+
+ return targetCircle;
+ }
+
+ protected APolygon? GetNativePolygon(IGeoPathMapElement polygon)
+ {
+ APolygon? targetPolygon = null;
+
+ if (_polygons != null && polygon.MapElementId is string)
+ {
+ for (int i = 0; i < _polygons.Count; i++)
+ {
+ var native = _polygons[i];
+ if (native.Id == (string)polygon.MapElementId)
+ {
+ targetPolygon = native;
+ break;
+ }
+ }
+ }
+
+ return targetPolygon;
+ }
+
+ public static void MapPins(IMapHandler handler, IMap map)
+ {
+ if (handler is MapHandler mapHandler)
+ {
+ if (mapHandler._markers != null)
+ {
+ for (int i = 0; i < mapHandler._markers.Count; i++)
+ mapHandler._markers[i].Remove();
+
+ mapHandler._markers = null;
+ }
+
+ mapHandler.AddPins((IList)map.Pins);
+ }
+ }
+
+ public static void MapElements(IMapHandler handler, IMap map)
+ {
+ (handler as MapHandler)?.ClearMapElements();
+ (handler as MapHandler)?.AddMapElements((IList)map.Elements);
+ }
+
+ internal void OnMapReady(GoogleMap map)
+ {
+ if (map == null)
+ {
+ return;
+ }
+
+ Map = map;
+
+ map.SetOnCameraMoveListener(_mapReady);
+ map.MarkerClick += OnMarkerClick;
+ map.InfoWindowClick += OnInfoWindowClick;
+ map.MapClick += OnMapClick;
+ }
+
+ internal void UpdateVisibleRegion(LatLng pos)
+ {
+ if (Map == null)
+ return;
+
+ Projection projection = Map.Projection;
+ int width = PlatformView.Width;
+ int height = PlatformView.Height;
+ LatLng ul = projection.FromScreenLocation(new global::Android.Graphics.Point(0, 0));
+ LatLng ur = projection.FromScreenLocation(new global::Android.Graphics.Point(width, 0));
+ LatLng ll = projection.FromScreenLocation(new global::Android.Graphics.Point(0, height));
+ LatLng lr = projection.FromScreenLocation(new global::Android.Graphics.Point(width, height));
+ double dlat = Math.Max(Math.Abs(ul.Latitude - lr.Latitude), Math.Abs(ur.Latitude - ll.Latitude));
+ double dlong = Math.Max(Math.Abs(ul.Longitude - lr.Longitude), Math.Abs(ur.Longitude - ll.Longitude));
+ VirtualView.VisibleRegion = new MapSpan(new Devices.Sensors.Location(pos.Latitude, pos.Longitude), dlat, dlong);
+ }
+
+ void MapViewLayoutChange(object? sender, Android.Views.View.LayoutChangeEventArgs e)
+ {
+ if (_init && _lastMoveToRegion != null)
+ {
+ MoveToRegion(_lastMoveToRegion, false);
+ if (_pins != null)
+ AddPins(_pins);
+ if (_elements != null)
+ AddMapElements(_elements);
+ _init = false;
+ }
+
+ if (Map != null)
+ {
+ UpdateVisibleRegion(Map.CameraPosition.Target);
+ }
+ }
+
+ void MoveToRegion(MapSpan span, bool animate)
+ {
+ _lastMoveToRegion = span;
+ if (Map == null)
+ return;
+
+ var ne = new LatLng(span.Center.Latitude + span.LatitudeDegrees / 2,
+ span.Center.Longitude + span.LongitudeDegrees / 2);
+ var sw = new LatLng(span.Center.Latitude - span.LatitudeDegrees / 2,
+ span.Center.Longitude - span.LongitudeDegrees / 2);
+ CameraUpdate update = CameraUpdateFactory.NewLatLngBounds(new LatLngBounds(sw, ne), 0);
+
+ try
+ {
+ if (animate)
+ {
+ Map.AnimateCamera(update);
+ }
+ else
+ {
+ Map.MoveCamera(update);
+ }
+ }
+ catch (IllegalStateException exc)
+ {
+ MauiContext?.Services.GetService>()?.LogWarning(exc, $"MoveToRegion exception");
+ }
+ }
+
+ void OnMarkerClick(object? sender, GoogleMap.MarkerClickEventArgs e)
+ {
+ var pin = GetPinForMarker(e.Marker);
+
+ if (pin == null)
+ {
+ return;
+ }
+
+ // Setting e.Handled = true will prevent the info window from being presented
+ // SendMarkerClick() returns the value of PinClickedEventArgs.HideInfoWindow
+ bool handled = pin.SendMarkerClick();
+ e.Handled = handled;
+ }
+
+ void OnInfoWindowClick(object? sender, GoogleMap.InfoWindowClickEventArgs e)
+ {
+ var marker = e.Marker;
+ var pin = GetPinForMarker(marker);
+
+ if (pin == null)
+ {
+ return;
+ }
+
+ pin.SendMarkerClick();
+
+ // SendInfoWindowClick() returns the value of PinClickedEventArgs.HideInfoWindow
+ bool hideInfoWindow = pin.SendInfoWindowClick();
+ if (hideInfoWindow)
+ {
+ marker.HideInfoWindow();
+ }
+ }
+
+ void OnMapClick(object? sender, GoogleMap.MapClickEventArgs e) =>
+ VirtualView.Clicked(new Devices.Sensors.Location(e.Point.Latitude, e.Point.Longitude));
+
+ void AddPins(IList pins)
+ {
+ //Mapper could be called before we have a Map ready
+ _pins = pins;
+ if (Map == null || MauiContext == null)
+ return;
+
+ if (_markers == null)
+ _markers = new List();
+
+ foreach (var p in pins)
+ {
+ IMapPin pin = (IMapPin)p;
+ Marker marker;
+
+ var pinHandler = pin.ToHandler(MauiContext);
+ if (pinHandler is IMapPinHandler iMapPinHandler)
+ {
+ marker = Map.AddMarker(iMapPinHandler.PlatformView);
+ // associate pin with marker for later lookup in event handlers
+ pin.MarkerId = marker.Id;
+ _markers.Add(marker);
+ }
+
+ }
+ _pins = null;
+ }
+
+ protected IMapPin? GetPinForMarker(Marker marker)
+ {
+ IMapPin? targetPin = null;
+
+ for (int i = 0; i < VirtualView.Pins.Count; i++)
+ {
+ var pin = VirtualView.Pins[i];
+ if (pin?.MarkerId is string markerId)
+ {
+ if (markerId == marker.Id)
+ {
+ targetPin = pin;
+ break;
+ }
+ }
+ }
+
+ return targetPin;
+ }
+
+ void ClearMapElements()
+ {
+ if (_polylines != null)
+ {
+ for (int i = 0; i < _polylines.Count; i++)
+ _polylines[i].Remove();
+
+ _polylines = null;
+ }
+
+ if (_polygons != null)
+ {
+ for (int i = 0; i < _polygons.Count; i++)
+ _polygons[i].Remove();
+
+ _polygons = null;
+ }
+
+ if (_circles != null)
+ {
+ for (int i = 0; i < _circles.Count; i++)
+ _circles[i].Remove();
+
+ _circles = null;
+ }
+ }
+
+ void AddMapElements(IList mapElements)
+ {
+ _elements = mapElements;
+
+ if (Map == null || MauiContext == null)
+ return;
+
+ foreach (var element in mapElements)
+ {
+ if (element is IGeoPathMapElement geoPath)
+ {
+ if (element is IFilledMapElement)
+ {
+ AddPolygon(geoPath);
+ }
+ else
+ {
+ AddPolyline(geoPath);
+ }
+ }
+ if (element is ICircleMapElement circle)
+ {
+ AddCircle(circle);
+ }
+ }
+ _elements = null;
+ }
+
+ void AddPolyline(IGeoPathMapElement polyline)
+ {
+ var map = Map;
+ if (map == null)
+ return;
+
+ if (_polylines == null)
+ _polylines = new List();
+
+ var options = polyline.ToHandler(MauiContext!)?.PlatformView as PolylineOptions;
+ if (options != null)
+ {
+ var nativePolyline = map.AddPolyline(options);
+
+ polyline.MapElementId = nativePolyline.Id;
+
+ _polylines.Add(nativePolyline);
+ }
+ }
+
+ void AddPolygon(IGeoPathMapElement polygon)
+ {
+ var map = Map;
+ if (map == null)
+ return;
+
+ if (_polygons == null)
+ _polygons = new List();
+
+ var options = polygon.ToHandler(MauiContext!)?.PlatformView as PolygonOptions;
+ var nativePolygon = map.AddPolygon(options);
+
+ polygon.MapElementId = nativePolygon.Id;
+
+ _polygons.Add(nativePolygon);
+ }
+
+ void AddCircle(ICircleMapElement circle)
+ {
+ var map = Map;
+ if (map == null)
+ return;
+
+ if (_circles == null)
+ _circles = new List();
+
+ var options = circle.ToHandler(MauiContext!)?.PlatformView as CircleOptions;
+ var nativeCircle = map.AddCircle(options);
+
+ circle.MapElementId = nativeCircle.Id;
+
+ _circles.Add(nativeCircle);
+ }
+
+ }
+
+ class MapCallbackHandler : Java.Lang.Object, GoogleMap.IOnCameraMoveListener, IOnMapReadyCallback
+ {
+ MapHandler? _handler;
+ GoogleMap? _googleMap;
+
+ public MapCallbackHandler(MapHandler mapHandler)
+ {
+ _handler = mapHandler;
+ }
+
+ public void OnMapReady(GoogleMap googleMap)
+ {
+ _googleMap = googleMap;
+ _handler?.OnMapReady(googleMap);
+ }
+
+ void GoogleMap.IOnCameraMoveListener.OnCameraMove()
+ {
+ if (_googleMap == null)
+ return;
+
+ _handler?.UpdateVisibleRegion(_googleMap.CameraPosition.Target);
+ }
+
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && _handler != null)
+ {
+ _handler = null;
+ _googleMap = null;
+ }
+
+ base.Dispose(disposing);
+ }
+ }
+
+}
diff --git a/src/Core/maps/src/Handlers/Map/MapHandler.Standard.cs b/src/Core/maps/src/Handlers/Map/MapHandler.Standard.cs
new file mode 100644
index 000000000000..297e4a87990a
--- /dev/null
+++ b/src/Core/maps/src/Handlers/Map/MapHandler.Standard.cs
@@ -0,0 +1,29 @@
+using System;
+using Microsoft.Maui.Handlers;
+
+namespace Microsoft.Maui.Maps.Handlers
+{
+ public partial class MapHandler : ViewHandler
+ {
+
+ protected override object CreatePlatformView() => throw new NotImplementedException();
+
+ public static void MapMapType(IMapHandler handler, IMap map) => throw new NotImplementedException();
+
+ public static void MapIsShowingUser(IMapHandler handler, IMap map) => throw new NotImplementedException();
+
+ public static void MapIsScrollEnabled(IMapHandler handler, IMap map) => throw new NotImplementedException();
+
+ public static void MapIsTrafficEnabled(IMapHandler handler, IMap map) => throw new NotImplementedException();
+
+ public static void MapIsZoomEnabled(IMapHandler handler, IMap map) => throw new NotImplementedException();
+
+ public static void MapMoveToRegion(IMapHandler handler, IMap map, object? arg) => throw new NotImplementedException();
+
+ public static void MapPins(IMapHandler handler, IMap map) => throw new NotImplementedException();
+
+ public static void MapElements(IMapHandler handler, IMap map) => throw new NotImplementedException();
+
+ public void UpdateMapElement(IMapElement element) => throw new NotImplementedException();
+ }
+}
diff --git a/src/Core/maps/src/Handlers/Map/MapHandler.Tizen.cs b/src/Core/maps/src/Handlers/Map/MapHandler.Tizen.cs
new file mode 100644
index 000000000000..c9dd80f71f05
--- /dev/null
+++ b/src/Core/maps/src/Handlers/Map/MapHandler.Tizen.cs
@@ -0,0 +1,29 @@
+using System;
+using Microsoft.Maui.Handlers;
+
+namespace Microsoft.Maui.Maps.Handlers
+{
+ public partial class MapHandler : ViewHandler
+ {
+
+ protected override ElmSharp.EvasObject CreatePlatformView() => throw new NotImplementedException();
+
+ public static void MapMapType(IMapHandler handler, IMap map) => throw new NotImplementedException();
+
+ public static void MapIsShowingUser(IMapHandler handler, IMap map) => throw new NotImplementedException();
+
+ public static void MapIsScrollEnabled(IMapHandler handler, IMap map) => throw new NotImplementedException();
+
+ public static void MapIsTrafficEnabled(IMapHandler handler, IMap map) => throw new NotImplementedException();
+
+ public static void MapIsZoomEnabled(IMapHandler handler, IMap map) => throw new NotImplementedException();
+
+ public static void MapMoveToRegion(IMapHandler handler, IMap map, object? arg) => throw new NotImplementedException();
+
+ public static void MapPins(IMapHandler handler, IMap map) => throw new NotImplementedException();
+
+ public static void MapElements(IMapHandler handler, IMap map) => throw new NotImplementedException();
+
+ public void UpdateMapElement(IMapElement element) => throw new NotImplementedException();
+ }
+}
diff --git a/src/Core/maps/src/Handlers/Map/MapHandler.Windows.cs b/src/Core/maps/src/Handlers/Map/MapHandler.Windows.cs
new file mode 100644
index 000000000000..4a776d8603b0
--- /dev/null
+++ b/src/Core/maps/src/Handlers/Map/MapHandler.Windows.cs
@@ -0,0 +1,30 @@
+using System;
+using Microsoft.Maui.Handlers;
+using Microsoft.UI.Xaml;
+
+namespace Microsoft.Maui.Maps.Handlers
+{
+ public partial class MapHandler : ViewHandler
+ {
+
+ protected override FrameworkElement CreatePlatformView() => throw new NotImplementedException();
+
+ public static void MapMapType(IMapHandler handler, IMap map) => throw new NotImplementedException();
+
+ public static void MapIsZoomEnabled(IMapHandler handler, IMap map) => throw new NotImplementedException();
+
+ public static void MapIsScrollEnabled(IMapHandler handler, IMap map) => throw new NotImplementedException();
+
+ public static void MapIsTrafficEnabled(IMapHandler handler, IMap map) => throw new NotImplementedException();
+
+ public static void MapIsShowingUser(IMapHandler handler, IMap map) => throw new NotImplementedException();
+
+ public static void MapMoveToRegion(IMapHandler handler, IMap map, object? arg) => throw new NotImplementedException();
+
+ public static void MapPins(IMapHandler handler, IMap map) => throw new NotImplementedException();
+
+ public static void MapElements(IMapHandler handler, IMap map) => throw new NotImplementedException();
+
+ public void UpdateMapElement(IMapElement element) => throw new NotImplementedException();
+ }
+}
diff --git a/src/Core/maps/src/Handlers/Map/MapHandler.cs b/src/Core/maps/src/Handlers/Map/MapHandler.cs
new file mode 100644
index 000000000000..43ab32e2025e
--- /dev/null
+++ b/src/Core/maps/src/Handlers/Map/MapHandler.cs
@@ -0,0 +1,58 @@
+#if __IOS__ || MACCATALYST
+using PlatformView = Microsoft.Maui.Maps.Platform.MauiMKMapView;
+#elif MONOANDROID
+using PlatformView = Android.Gms.Maps.MapView;
+#elif WINDOWS
+using PlatformView = Microsoft.UI.Xaml.FrameworkElement;
+#elif TIZEN
+using PlatformView = ElmSharp.EvasObject;
+#elif (NETSTANDARD || !PLATFORM) || (NET6_0 && !IOS && !ANDROID && !TIZEN)
+using PlatformView = System.Object;
+#endif
+using Microsoft.Maui.Handlers;
+
+namespace Microsoft.Maui.Maps.Handlers
+{
+ public partial class MapHandler : IMapHandler
+ {
+ public static IPropertyMapper Mapper = new PropertyMapper(ViewHandler.ViewMapper)
+ {
+ [nameof(IMap.MapType)] = MapMapType,
+ [nameof(IMap.IsShowingUser)] = MapIsShowingUser,
+ [nameof(IMap.IsScrollEnabled)] = MapIsScrollEnabled,
+ [nameof(IMap.IsTrafficEnabled)] = MapIsTrafficEnabled,
+ [nameof(IMap.IsZoomEnabled)] = MapIsZoomEnabled,
+ [nameof(IMap.Pins)] = MapPins,
+ [nameof(IMap.Elements)] = MapElements,
+ };
+
+
+ public static CommandMapper CommandMapper = new(ViewCommandMapper)
+ {
+ [nameof(IMap.MoveToRegion)] = MapMoveToRegion,
+ [nameof(IMapHandler.UpdateMapElement)] = MapUpdateMapElement,
+ };
+
+ public MapHandler() : base(Mapper, CommandMapper)
+ {
+
+ }
+
+ public MapHandler(IPropertyMapper? mapper = null, CommandMapper? commandMapper = null)
+ : base(mapper ?? Mapper, commandMapper ?? CommandMapper)
+ {
+ }
+
+ IMap IMapHandler.VirtualView => VirtualView;
+
+ PlatformView IMapHandler.PlatformView => PlatformView;
+
+ public static void MapUpdateMapElement(IMapHandler handler, IMap map, object? arg)
+ {
+ if (arg is not MapElementHandlerUpdate args)
+ return;
+
+ handler.UpdateMapElement(args.MapElement);
+ }
+ }
+}
diff --git a/src/Core/maps/src/Handlers/Map/MapHandler.iOS.cs b/src/Core/maps/src/Handlers/Map/MapHandler.iOS.cs
new file mode 100644
index 000000000000..96235552c7e6
--- /dev/null
+++ b/src/Core/maps/src/Handlers/Map/MapHandler.iOS.cs
@@ -0,0 +1,107 @@
+using System.Collections;
+using CoreLocation;
+using MapKit;
+using Microsoft.Maui.Handlers;
+using Microsoft.Maui.Maps.Platform;
+
+namespace Microsoft.Maui.Maps.Handlers
+{
+
+ public partial class MapHandler : ViewHandler
+ {
+ CLLocationManager? _locationManager;
+
+ protected override MauiMKMapView CreatePlatformView()
+ {
+ return MapPool.Get() ?? new MauiMKMapView(this);
+ }
+
+ protected override void ConnectHandler(MauiMKMapView platformView)
+ {
+ base.ConnectHandler(platformView);
+ _locationManager = new CLLocationManager();
+ }
+
+ protected override void DisconnectHandler(MauiMKMapView platformView)
+ {
+ base.DisconnectHandler(platformView);
+
+ // This handler is done with the MKMapView; we can put it in the pool
+ // for other rendererers to use in the future
+ MapPool.Add(platformView);
+ }
+
+ public static void MapMapType(IMapHandler handler, IMap map)
+ {
+ switch (map.MapType)
+ {
+ case MapType.Street:
+ handler.PlatformView.MapType = MKMapType.Standard;
+ break;
+ case MapType.Satellite:
+ handler.PlatformView.MapType = MKMapType.Satellite;
+ break;
+ case MapType.Hybrid:
+ handler.PlatformView.MapType = MKMapType.Hybrid;
+ break;
+ }
+ }
+
+ public static void MapIsShowingUser(IMapHandler handler, IMap map)
+ {
+#if !MACCATALYST
+ if (map.IsShowingUser)
+ {
+ MapHandler? mapHandler = handler as MapHandler;
+ mapHandler?._locationManager?.RequestWhenInUseAuthorization();
+ }
+#endif
+ handler.PlatformView.ShowsUserLocation = map.IsShowingUser;
+ }
+
+ public static void MapIsScrollEnabled(IMapHandler handler, IMap map)
+ {
+ handler.PlatformView.ScrollEnabled = map.IsScrollEnabled;
+ }
+
+ public static void MapIsTrafficEnabled(IMapHandler handler, IMap map)
+ {
+ handler.PlatformView.ShowsTraffic = map.IsTrafficEnabled;
+ }
+
+ public static void MapIsZoomEnabled(IMapHandler handler, IMap map)
+ {
+ handler.PlatformView.ZoomEnabled = map.IsZoomEnabled;
+ }
+
+ public static void MapPins(IMapHandler handler, IMap map)
+ {
+ handler.PlatformView.AddPins((IList)map.Pins);
+ }
+
+ public static void MapElements(IMapHandler handler, IMap map)
+ {
+ handler.PlatformView.AddElements((IList)map.Elements);
+ }
+
+ public static void MapMoveToRegion(IMapHandler handler, IMap map, object? arg)
+ {
+ MapSpan? newRegion = arg as MapSpan;
+ if (newRegion != null)
+ (handler as MapHandler)?.MoveToRegion(newRegion, true);
+ }
+
+ public void UpdateMapElement(IMapElement element)
+ {
+ PlatformView.RemoveElements(new[] { element });
+ PlatformView.AddElements(new[] { element });
+ }
+
+ void MoveToRegion(MapSpan mapSpan, bool animated = true)
+ {
+ var center = mapSpan.Center;
+ var mapRegion = new MKCoordinateRegion(new CLLocationCoordinate2D(center.Latitude, center.Longitude), new MKCoordinateSpan(mapSpan.LatitudeDegrees, mapSpan.LongitudeDegrees));
+ PlatformView.SetRegion(mapRegion, animated);
+ }
+ }
+}
diff --git a/src/Core/maps/src/Handlers/MapElement/IMapElementHandler.cs b/src/Core/maps/src/Handlers/MapElement/IMapElementHandler.cs
new file mode 100644
index 000000000000..451e936c3ebb
--- /dev/null
+++ b/src/Core/maps/src/Handlers/MapElement/IMapElementHandler.cs
@@ -0,0 +1,23 @@
+#if __IOS__ || MACCATALYST
+using PlatformView = MapKit.MKOverlayRenderer;
+#elif MONOANDROID
+using Android.Gms.Maps;
+using Android.OS;
+using Android.Runtime;
+using PlatformView = Java.Lang.Object;
+#elif WINDOWS
+using PlatformView = System.Object;
+#elif TIZEN
+using PlatformView = ElmSharp.EvasObject;
+#elif (NETSTANDARD || !PLATFORM) || (NET6_0 && !IOS && !ANDROID && !TIZEN)
+using PlatformView = System.Object;
+#endif
+
+namespace Microsoft.Maui.Maps.Handlers
+{
+ public interface IMapElementHandler : IElementHandler
+ {
+ new IMapElement VirtualView { get; }
+ new PlatformView PlatformView { get; }
+ }
+}
diff --git a/src/Core/maps/src/Handlers/MapElement/MapElementHandler.Android.cs b/src/Core/maps/src/Handlers/MapElement/MapElementHandler.Android.cs
new file mode 100644
index 000000000000..f715a2fdf58c
--- /dev/null
+++ b/src/Core/maps/src/Handlers/MapElement/MapElementHandler.Android.cs
@@ -0,0 +1,121 @@
+using Android.Gms.Maps;
+using Android.Gms.Maps.Model;
+using Microsoft.Maui.Graphics;
+using Microsoft.Maui.Graphics.Platform;
+using Microsoft.Maui.Handlers;
+
+namespace Microsoft.Maui.Maps.Handlers
+{
+ public partial class MapElementHandler : ElementHandler
+ {
+ protected override Java.Lang.Object CreatePlatformElement()
+ {
+ if (VirtualView is IGeoPathMapElement geoPathMapElement)
+ {
+ if (geoPathMapElement is IFilledMapElement)
+ {
+ return new PolygonOptions();
+ }
+ else
+ {
+ return new PolylineOptions();
+ }
+ }
+
+ if (VirtualView is ICircleMapElement circleMapElement)
+ return new CircleOptions();
+
+ return null!;
+ }
+
+ public static void MapStroke(IMapElementHandler handler, IMapElement mapElement)
+ {
+ if (mapElement.Stroke is not SolidPaint solidPaint)
+ return;
+
+ var platformColor = solidPaint.Color.AsColor();
+
+ if (handler.PlatformView is PolygonOptions polygonOptions)
+ polygonOptions.InvokeStrokeColor(platformColor);
+ if (handler.PlatformView is PolylineOptions polyLineOptions)
+ polyLineOptions.InvokeColor(platformColor);
+ if (handler.PlatformView is CircleOptions circleOptions)
+ circleOptions.InvokeStrokeColor(platformColor);
+ }
+
+ public static void MapStrokeThickness(IMapElementHandler handler, IMapElement mapElement)
+ {
+ if (handler.PlatformView is PolygonOptions polygonOptions)
+ polygonOptions.InvokeStrokeWidth((float)mapElement.StrokeThickness);
+ if (handler.PlatformView is PolylineOptions polyLineOptions)
+ polyLineOptions.InvokeWidth((float)mapElement.StrokeThickness);
+ if (handler.PlatformView is CircleOptions circleOptions)
+ circleOptions.InvokeStrokeWidth((float)mapElement.StrokeThickness);
+ }
+
+ public static void MapFill(IMapElementHandler handler, IMapElement mapElement)
+ {
+ if (mapElement is not IFilledMapElement filledMapElement)
+ return;
+
+ if (filledMapElement.Fill is not SolidPaint solidPaintFill)
+ return;
+
+ var platformColor = solidPaintFill.Color.AsColor();
+ if (handler.PlatformView is PolygonOptions polygonOptions)
+ polygonOptions.InvokeFillColor(platformColor);
+ if (handler.PlatformView is CircleOptions circleOptions)
+ circleOptions.InvokeFillColor(platformColor);
+ }
+
+ public static void MapGeopath(IMapElementHandler handler, IMapElement mapElement)
+ {
+ if (mapElement is not IGeoPathMapElement geoPathMapElement)
+ return;
+
+ if (handler.PlatformView is PolygonOptions polygonOptions)
+ {
+ // Will throw an exception when added to the map if Points is empty
+ if (geoPathMapElement.Count == 0)
+ {
+ polygonOptions.Points.Add(new LatLng(0, 0));
+ }
+ else
+ {
+ foreach (var position in geoPathMapElement)
+ {
+ polygonOptions.Points.Add(new LatLng(position.Latitude, position.Longitude));
+ }
+ }
+ }
+
+ if (handler.PlatformView is PolylineOptions polylineOptions)
+ {
+ // Will throw an exception when added to the map if Points is empty
+ if (geoPathMapElement.Count == 0)
+ {
+ polylineOptions.Points.Add(new LatLng(0, 0));
+ }
+ else
+ {
+ foreach (var position in geoPathMapElement)
+ {
+ polylineOptions.Points.Add(new LatLng(position.Latitude, position.Longitude));
+ }
+ }
+ }
+ }
+ public static void MapRadius(IMapElementHandler handler, IMapElement mapElement)
+ {
+ if (handler.PlatformView is CircleOptions circleOptions && mapElement is ICircleMapElement circleMapElement)
+ circleOptions.InvokeRadius(circleMapElement.Radius.Meters);
+
+ }
+ public static void MapCenter(IMapElementHandler handler, IMapElement mapElement)
+ {
+ if (handler.PlatformView is CircleOptions circleOptions && mapElement is ICircleMapElement circleMapElement)
+ circleOptions.InvokeCenter(new LatLng(circleMapElement.Center.Latitude, circleMapElement.Center.Longitude));
+
+ }
+ }
+}
diff --git a/src/Core/maps/src/Handlers/MapElement/MapElementHandler.Standard.cs b/src/Core/maps/src/Handlers/MapElement/MapElementHandler.Standard.cs
new file mode 100644
index 000000000000..234a9f4ca869
--- /dev/null
+++ b/src/Core/maps/src/Handlers/MapElement/MapElementHandler.Standard.cs
@@ -0,0 +1,11 @@
+using Microsoft.Maui.Handlers;
+namespace Microsoft.Maui.Maps.Handlers
+{
+ public partial class MapElementHandler : ElementHandler
+ {
+ protected override object CreatePlatformElement() => throw new System.NotImplementedException();
+ public static void MapStroke(IMapElementHandler handler, IMapElement mapElement) => throw new System.NotImplementedException();
+ public static void MapStrokeThickness(IMapElementHandler handler, IMapElement mapElement) => throw new System.NotImplementedException();
+ public static void MapFill(IMapElementHandler handler, IMapElement mapElement) => throw new System.NotImplementedException();
+ }
+}
diff --git a/src/Core/maps/src/Handlers/MapElement/MapElementHandler.Tizen.cs b/src/Core/maps/src/Handlers/MapElement/MapElementHandler.Tizen.cs
new file mode 100644
index 000000000000..aa8870f32e0a
--- /dev/null
+++ b/src/Core/maps/src/Handlers/MapElement/MapElementHandler.Tizen.cs
@@ -0,0 +1,11 @@
+using Microsoft.Maui.Handlers;
+namespace Microsoft.Maui.Maps.Handlers
+{
+ public partial class MapElementHandler : ElementHandler
+ {
+ protected override ElmSharp.EvasObject CreatePlatformElement() => throw new System.NotImplementedException();
+ public static void MapStroke(IMapElementHandler handler, IMapElement mapElement) => throw new System.NotImplementedException();
+ public static void MapStrokeThickness(IMapElementHandler handler, IMapElement mapElement) => throw new System.NotImplementedException();
+ public static void MapFill(IMapElementHandler handler, IMapElement mapElement) => throw new System.NotImplementedException();
+ }
+}
diff --git a/src/Core/maps/src/Handlers/MapElement/MapElementHandler.Windows.cs b/src/Core/maps/src/Handlers/MapElement/MapElementHandler.Windows.cs
new file mode 100644
index 000000000000..eaf8d85e3e59
--- /dev/null
+++ b/src/Core/maps/src/Handlers/MapElement/MapElementHandler.Windows.cs
@@ -0,0 +1,12 @@
+using Microsoft.Maui.Handlers;
+
+namespace Microsoft.Maui.Maps.Handlers
+{
+ public partial class MapElementHandler : ElementHandler
+ {
+ protected override object CreatePlatformElement() => throw new System.NotImplementedException();
+ public static void MapStroke(IMapElementHandler handler, IMapElement mapElement) => throw new System.NotImplementedException();
+ public static void MapStrokeThickness(IMapElementHandler handler, IMapElement mapElement) => throw new System.NotImplementedException();
+ public static void MapFill(IMapElementHandler handler, IMapElement mapElement) => throw new System.NotImplementedException();
+ }
+}
diff --git a/src/Core/maps/src/Handlers/MapElement/MapElementHandler.cs b/src/Core/maps/src/Handlers/MapElement/MapElementHandler.cs
new file mode 100644
index 000000000000..74d4c02bdcab
--- /dev/null
+++ b/src/Core/maps/src/Handlers/MapElement/MapElementHandler.cs
@@ -0,0 +1,45 @@
+#if __IOS__ || MACCATALYST
+using PlatformView = MapKit.MKOverlayRenderer;
+#elif MONOANDROID
+using PlatformView = Java.Lang.Object;
+#elif WINDOWS
+using PlatformView = System.Object;
+#elif TIZEN
+using PlatformView = ElmSharp.EvasObject;
+#elif (NETSTANDARD || !PLATFORM) || (NET6_0 && !IOS && !ANDROID && !TIZEN)
+using PlatformView = System.Object;
+#endif
+using Microsoft.Maui.Handlers;
+
+namespace Microsoft.Maui.Maps.Handlers
+{
+ public partial class MapElementHandler : IMapElementHandler
+ {
+ public static IPropertyMapper Mapper = new PropertyMapper(ElementMapper)
+ {
+ [nameof(IMapElement.Stroke)] = MapStroke,
+ [nameof(IMapElement.StrokeThickness)] = MapStrokeThickness,
+ [nameof(IFilledMapElement.Fill)] = MapFill,
+#if MONOANDROID
+ ["Geopath"] = MapGeopath,
+ [nameof(ICircleMapElement.Radius)] = MapRadius,
+ [nameof(ICircleMapElement.Center)] = MapCenter,
+#endif
+ };
+
+
+ public MapElementHandler() : base(Mapper)
+ {
+
+ }
+
+ public MapElementHandler(IPropertyMapper? mapper = null)
+ : base(mapper ?? Mapper)
+ {
+ }
+
+ IMapElement IMapElementHandler.VirtualView => VirtualView;
+
+ PlatformView IMapElementHandler.PlatformView => PlatformView;
+ }
+}
diff --git a/src/Core/maps/src/Handlers/MapElement/MapElementHandler.iOS.cs b/src/Core/maps/src/Handlers/MapElement/MapElementHandler.iOS.cs
new file mode 100644
index 000000000000..ddec558fce9e
--- /dev/null
+++ b/src/Core/maps/src/Handlers/MapElement/MapElementHandler.iOS.cs
@@ -0,0 +1,63 @@
+using MapKit;
+using Microsoft.Maui.Graphics;
+using Microsoft.Maui.Handlers;
+using Microsoft.Maui.Platform;
+
+namespace Microsoft.Maui.Maps.Handlers
+{
+ public partial class MapElementHandler : ElementHandler
+ {
+ protected override MKOverlayRenderer CreatePlatformElement()
+ {
+ if (VirtualView.MapElementId != null)
+ {
+ var mapElementId = VirtualView.MapElementId;
+
+ if (mapElementId is MKPolygon mKPolygon)
+ return new MKPolygonRenderer(mKPolygon);
+
+ if (mapElementId is MKPolyline line)
+ return new MKPolylineRenderer(line);
+
+ if (mapElementId is MKCircle circle)
+ return new MKCircleRenderer(circle);
+ }
+
+ return new MKOverlayRenderer();
+ }
+
+ public static void MapStroke(IMapElementHandler handler, IMapElement mapElement)
+ {
+ var platformColor = mapElement.Stroke.ToColor()?.ToPlatform();
+ if (handler.PlatformView is MKPolygonRenderer polygonRenderer)
+ polygonRenderer.StrokeColor = platformColor;
+ if (handler.PlatformView is MKPolylineRenderer polylineRenderer)
+ polylineRenderer.StrokeColor = platformColor;
+ if (handler.PlatformView is MKCircleRenderer circleRenderer)
+ circleRenderer.StrokeColor = platformColor;
+ }
+
+ public static void MapStrokeThickness(IMapElementHandler handler, IMapElement mapElement)
+ {
+ if (handler.PlatformView is MKPolygonRenderer polygonRenderer)
+ polygonRenderer.LineWidth = (nfloat)mapElement.StrokeThickness;
+ if (handler.PlatformView is MKPolylineRenderer polylineRenderer)
+ polylineRenderer.LineWidth = (nfloat)mapElement.StrokeThickness;
+ if (handler.PlatformView is MKCircleRenderer circleRenderer)
+ circleRenderer.LineWidth = (nfloat)mapElement.StrokeThickness;
+ }
+
+ public static void MapFill(IMapElementHandler handler, IMapElement mapElement)
+ {
+ if (mapElement is not IFilledMapElement filledMapElement)
+ return;
+
+ var platformColor = filledMapElement.Fill?.ToColor()?.ToPlatform();
+
+ if (handler.PlatformView is MKPolygonRenderer polygonRenderer)
+ polygonRenderer.FillColor = platformColor;
+ if (handler.PlatformView is MKCircleRenderer circleRenderer)
+ circleRenderer.FillColor = platformColor;
+ }
+ }
+}
diff --git a/src/Core/maps/src/Handlers/MapElement/MapElementHandlerUpdate.cs b/src/Core/maps/src/Handlers/MapElement/MapElementHandlerUpdate.cs
new file mode 100644
index 000000000000..6359efeb3c94
--- /dev/null
+++ b/src/Core/maps/src/Handlers/MapElement/MapElementHandlerUpdate.cs
@@ -0,0 +1,8 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Microsoft.Maui.Maps.Handlers
+{
+ public record MapElementHandlerUpdate(int Index, IMapElement MapElement);
+}
diff --git a/src/Core/maps/src/Handlers/MapPin/IMapPinHandler.cs b/src/Core/maps/src/Handlers/MapPin/IMapPinHandler.cs
new file mode 100644
index 000000000000..4c095a71b357
--- /dev/null
+++ b/src/Core/maps/src/Handlers/MapPin/IMapPinHandler.cs
@@ -0,0 +1,21 @@
+#if __IOS__ || MACCATALYST
+using PlatformView = MapKit.IMKAnnotation;
+#elif MONOANDROID
+using Android.Gms.Maps;
+using PlatformView = Android.Gms.Maps.Model.MarkerOptions;
+#elif WINDOWS
+using PlatformView = System.Object;
+#elif TIZEN
+using PlatformView = ElmSharp.EvasObject;
+#elif (NETSTANDARD || !PLATFORM) || (NET6_0 && !IOS && !ANDROID && !TIZEN)
+using PlatformView = System.Object;
+#endif
+
+namespace Microsoft.Maui.Maps.Handlers
+{
+ public interface IMapPinHandler : IElementHandler
+ {
+ new IMapPin VirtualView { get; }
+ new PlatformView PlatformView { get; }
+ }
+}
diff --git a/src/Core/maps/src/Handlers/MapPin/MapPinHandler.Android.cs b/src/Core/maps/src/Handlers/MapPin/MapPinHandler.Android.cs
new file mode 100644
index 000000000000..b02d5020e563
--- /dev/null
+++ b/src/Core/maps/src/Handlers/MapPin/MapPinHandler.Android.cs
@@ -0,0 +1,27 @@
+using Android.Gms.Maps;
+using Android.Gms.Maps.Model;
+using Microsoft.Maui.Handlers;
+
+namespace Microsoft.Maui.Maps.Handlers
+{
+ public partial class MapPinHandler : ElementHandler
+ {
+ protected override MarkerOptions CreatePlatformElement() => new MarkerOptions();
+
+ public static void MapLocation(IMapPinHandler handler, IMapPin mapPin)
+ {
+ if (mapPin.Location != null)
+ handler.PlatformView.SetPosition(new LatLng(mapPin.Location.Latitude, mapPin.Location.Longitude));
+ }
+
+ public static void MapLabel(IMapPinHandler handler, IMapPin mapPin)
+ {
+ handler.PlatformView.SetTitle(mapPin.Label);
+ }
+
+ public static void MapAddress(IMapPinHandler handler, IMapPin mapPin)
+ {
+ handler.PlatformView.SetSnippet(mapPin.Address);
+ }
+ }
+}
diff --git a/src/Core/maps/src/Handlers/MapPin/MapPinHandler.Standard.cs b/src/Core/maps/src/Handlers/MapPin/MapPinHandler.Standard.cs
new file mode 100644
index 000000000000..08e42e194907
--- /dev/null
+++ b/src/Core/maps/src/Handlers/MapPin/MapPinHandler.Standard.cs
@@ -0,0 +1,13 @@
+using Microsoft.Maui.Handlers;
+namespace Microsoft.Maui.Maps.Handlers
+{
+ public partial class MapPinHandler : ElementHandler
+ {
+ protected override object CreatePlatformElement() => throw new System.NotImplementedException();
+ public static void MapLocation(IMapPinHandler handler, IMapPin mapPin) { }
+
+ public static void MapLabel(IMapPinHandler handler, IMapPin mapPin) { }
+
+ public static void MapAddress(IMapPinHandler handler, IMapPin mapPin) { }
+ }
+}
diff --git a/src/Core/maps/src/Handlers/MapPin/MapPinHandler.Tizen.cs b/src/Core/maps/src/Handlers/MapPin/MapPinHandler.Tizen.cs
new file mode 100644
index 000000000000..aab4542ce115
--- /dev/null
+++ b/src/Core/maps/src/Handlers/MapPin/MapPinHandler.Tizen.cs
@@ -0,0 +1,13 @@
+using Microsoft.Maui.Handlers;
+namespace Microsoft.Maui.Maps.Handlers
+{
+ public partial class MapPinHandler : ElementHandler
+ {
+ protected override ElmSharp.EvasObject CreatePlatformElement() => throw new System.NotImplementedException();
+ public static void MapLocation(IMapPinHandler handler, IMapPin mapPin) { }
+
+ public static void MapLabel(IMapPinHandler handler, IMapPin mapPin) { }
+
+ public static void MapAddress(IMapPinHandler handler, IMapPin mapPin) { }
+ }
+}
diff --git a/src/Core/maps/src/Handlers/MapPin/MapPinHandler.Windows.cs b/src/Core/maps/src/Handlers/MapPin/MapPinHandler.Windows.cs
new file mode 100644
index 000000000000..37ac75d1300f
--- /dev/null
+++ b/src/Core/maps/src/Handlers/MapPin/MapPinHandler.Windows.cs
@@ -0,0 +1,15 @@
+using Microsoft.Maui.Handlers;
+
+namespace Microsoft.Maui.Maps.Handlers
+{
+ public partial class MapPinHandler : ElementHandler
+ {
+ protected override object CreatePlatformElement() => throw new System.NotImplementedException();
+
+ public static void MapLocation(IMapPinHandler handler, IMapPin mapPin) { }
+
+ public static void MapLabel(IMapPinHandler handler, IMapPin mapPin) { }
+
+ public static void MapAddress(IMapPinHandler handler, IMapPin mapPin) { }
+ }
+}
diff --git a/src/Core/maps/src/Handlers/MapPin/MapPinHandler.cs b/src/Core/maps/src/Handlers/MapPin/MapPinHandler.cs
new file mode 100644
index 000000000000..36c4d9ec9579
--- /dev/null
+++ b/src/Core/maps/src/Handlers/MapPin/MapPinHandler.cs
@@ -0,0 +1,39 @@
+#if __IOS__ || MACCATALYST
+using PlatformView = MapKit.IMKAnnotation;
+#elif MONOANDROID
+using PlatformView = Android.Gms.Maps.Model.MarkerOptions;
+#elif WINDOWS
+using PlatformView = System.Object;
+#elif TIZEN
+using PlatformView = ElmSharp.EvasObject;
+#elif (NETSTANDARD || !PLATFORM) || (NET6_0 && !IOS && !ANDROID && !TIZEN)
+using PlatformView = System.Object;
+#endif
+using Microsoft.Maui.Handlers;
+
+namespace Microsoft.Maui.Maps.Handlers
+{
+ public partial class MapPinHandler : IMapPinHandler
+ {
+ public static IPropertyMapper Mapper = new PropertyMapper(ElementMapper)
+ {
+ [nameof(IMapPin.Location)] = MapLocation,
+ [nameof(IMapPin.Label)] = MapLabel,
+ [nameof(IMapPin.Address)] = MapAddress,
+ };
+
+ public MapPinHandler() : base(Mapper)
+ {
+
+ }
+
+ public MapPinHandler(IPropertyMapper? mapper = null)
+ : base(mapper ?? Mapper)
+ {
+ }
+
+ IMapPin IMapPinHandler.VirtualView => VirtualView;
+
+ PlatformView IMapPinHandler.PlatformView => PlatformView;
+ }
+}
diff --git a/src/Core/maps/src/Handlers/MapPin/MapPinHandler.iOS.cs b/src/Core/maps/src/Handlers/MapPin/MapPinHandler.iOS.cs
new file mode 100644
index 000000000000..75e134c11f8e
--- /dev/null
+++ b/src/Core/maps/src/Handlers/MapPin/MapPinHandler.iOS.cs
@@ -0,0 +1,30 @@
+using System;
+using CoreLocation;
+using MapKit;
+using Microsoft.Maui.Handlers;
+
+namespace Microsoft.Maui.Maps.Handlers
+{
+ public partial class MapPinHandler : ElementHandler
+ {
+ protected override IMKAnnotation CreatePlatformElement() => new MKPointAnnotation();
+
+ public static void MapLocation(IMapPinHandler handler, IMapPin mapPin)
+ {
+ if (handler.PlatformView is MKPointAnnotation mKPointAnnotation)
+ mKPointAnnotation.Coordinate = new CLLocationCoordinate2D(mapPin.Location.Latitude, mapPin.Location.Longitude);
+ }
+
+ public static void MapLabel(IMapPinHandler handler, IMapPin mapPin)
+ {
+ if (handler.PlatformView is MKPointAnnotation mKPointAnnotation)
+ mKPointAnnotation.Title = mapPin.Label;
+ }
+
+ public static void MapAddress(IMapPinHandler handler, IMapPin mapPin)
+ {
+ if (handler.PlatformView is MKPointAnnotation mKPointAnnotation)
+ mKPointAnnotation.Subtitle = mapPin.Address;
+ }
+ }
+}
diff --git a/src/Core/maps/src/Maps.csproj b/src/Core/maps/src/Maps.csproj
new file mode 100644
index 000000000000..9a5b9677f64c
--- /dev/null
+++ b/src/Core/maps/src/Maps.csproj
@@ -0,0 +1,29 @@
+
+
+
+ netstandard2.1;netstandard2.0;$(_MauiDotNetTfm);$(MauiPlatforms)
+ Microsoft.Maui.Maps
+ Microsoft.Maui.Maps
+ enable
+ true
+ true
+ $(NoWarn);CS1591;RS0041;RS0026;RS0027
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Core/maps/src/Platform/iOS/MapPool.cs b/src/Core/maps/src/Platform/iOS/MapPool.cs
new file mode 100644
index 000000000000..801229429a1b
--- /dev/null
+++ b/src/Core/maps/src/Platform/iOS/MapPool.cs
@@ -0,0 +1,16 @@
+using System.Collections.Concurrent;
+
+namespace Microsoft.Maui.Maps.Platform
+{
+ internal class MapPool
+ {
+ static MapPool? s_instance;
+ public static MapPool Instance => s_instance ??= new MapPool();
+
+ internal readonly ConcurrentQueue Maps = new ConcurrentQueue();
+
+ public static void Add(MauiMKMapView mapView) => Instance.Maps.Enqueue(mapView);
+
+ public static MauiMKMapView? Get() => Instance.Maps.TryDequeue(out MauiMKMapView? mapView) ? mapView : null;
+ }
+}
diff --git a/src/Core/maps/src/Platform/iOS/MauiMKMapView.cs b/src/Core/maps/src/Platform/iOS/MauiMKMapView.cs
new file mode 100644
index 000000000000..1d09d3227125
--- /dev/null
+++ b/src/Core/maps/src/Platform/iOS/MauiMKMapView.cs
@@ -0,0 +1,292 @@
+using System;
+using System.Collections;
+using System.Linq;
+using CoreLocation;
+using MapKit;
+using Microsoft.Maui.Maps.Handlers;
+using Microsoft.Maui.Platform;
+using ObjCRuntime;
+using UIKit;
+
+namespace Microsoft.Maui.Maps.Platform
+{
+ public class MauiMKMapView : MKMapView
+ {
+ WeakReference _handlerRef;
+ object? _lastTouchedView;
+ UITapGestureRecognizer? _mapClickedGestureRecognizer;
+
+ public MauiMKMapView(IMapHandler handler)
+ {
+ _handlerRef = new WeakReference(handler);
+ OverlayRenderer = GetViewForOverlayDelegate;
+ }
+
+ public override void MovedToWindow()
+ {
+ base.MovedToWindow();
+ if (Window != null)
+ Startup();
+ else
+ Cleanup();
+ }
+
+ protected virtual MKOverlayRenderer GetViewForOverlayDelegate(MKMapView mapview, IMKOverlay overlay)
+ {
+ MKOverlayRenderer? overlayRenderer = null;
+ switch (overlay)
+ {
+ case MKPolyline polyline:
+ overlayRenderer = GetMapElement(polyline);
+ break;
+ case MKPolygon polygon:
+ overlayRenderer = GetMapElement(polygon);
+ break;
+ case MKCircle circle:
+ overlayRenderer = GetMapElement(circle);
+ break;
+ default:
+ break;
+ }
+ if (overlayRenderer == null)
+ throw new InvalidOperationException($"MKOverlayRenderer not found for {overlay}.");
+
+ return overlayRenderer;
+ }
+
+#pragma warning disable CS0108 // Member hides inherited member; missing new keyword
+ MKAnnotationView GetViewForAnnotation(MKMapView mapView, IMKAnnotation annotation)
+#pragma warning restore CS0108 // Member hides inherited member; missing new keyword
+ {
+ MKAnnotationView? mapPin;
+
+ // https://bugzilla.xamarin.com/show_bug.cgi?id=26416
+ var userLocationAnnotation = Runtime.GetNSObject(annotation.Handle) as MKUserLocation;
+ if (userLocationAnnotation != null)
+ return null!;
+
+ const string defaultPinId = "defaultPin";
+ mapPin = mapView.DequeueReusableAnnotation(defaultPinId);
+ if (mapPin == null)
+ {
+ if (OperatingSystem.IsIOSVersionAtLeast(11))
+ {
+ mapPin = new MKMarkerAnnotationView(annotation, defaultPinId);
+ }
+ else
+ {
+ mapPin = new MKPinAnnotationView(annotation, defaultPinId);
+
+ }
+
+ mapPin.CanShowCallout = true;
+
+ if (OperatingSystem.IsIOSVersionAtLeast(11))
+ {
+ // Need to set this to get the callout bubble to show up
+ // Without this no callout is shown, it's displayed differently
+ mapPin.RightCalloutAccessoryView = new UIView();
+ }
+ }
+
+ mapPin.Annotation = annotation;
+ AttachGestureToPin(mapPin, annotation);
+
+ return mapPin;
+ }
+
+ internal void AddPins(IList pins)
+ {
+ _handlerRef.TryGetTarget(out IMapHandler? handler);
+ if (handler?.MauiContext == null)
+ return;
+
+ if (Annotations?.Length > 0)
+ RemoveAnnotations(Annotations);
+
+ foreach (IMapPin pin in pins)
+ {
+ if (pin.ToHandler(handler.MauiContext).PlatformView is IMKAnnotation annotation)
+ {
+ pin.MarkerId = annotation;
+ AddAnnotation(annotation);
+ }
+ }
+ }
+
+ internal void AddElements(IList elements)
+ {
+ foreach (IMapElement element in elements)
+ {
+ IMKOverlay? overlay = null;
+ switch (element)
+ {
+ case IGeoPathMapElement geoPathElement:
+ if (geoPathElement is IFilledMapElement)
+ overlay = MKPolygon.FromCoordinates(geoPathElement
+ .Select(position => new CLLocationCoordinate2D(position.Latitude, position.Longitude))
+ .ToArray());
+ else
+ overlay = MKPolyline.FromCoordinates(geoPathElement
+ .Select(position => new CLLocationCoordinate2D(position.Latitude, position.Longitude))
+ .ToArray());
+ break;
+ case ICircleMapElement circleElement:
+ overlay = MKCircle.Circle(
+ new CLLocationCoordinate2D(circleElement.Center.Latitude, circleElement.Center.Longitude),
+ circleElement.Radius.Meters);
+ break;
+ }
+
+ if (overlay != null)
+ {
+ element.MapElementId = overlay;
+ AddOverlay(overlay);
+ }
+ }
+ }
+
+ internal void RemoveElements(IList elements)
+ {
+ foreach (IMapElement element in elements)
+ {
+ if (element.MapElementId is IMKOverlay overlay)
+ RemoveOverlay(overlay);
+ }
+ }
+
+ void Startup()
+ {
+ RegionChanged += MkMapViewOnRegionChanged;
+ DidSelectAnnotationView += MkMapViewOnAnnotationViewSelected;
+ AddGestureRecognizer(_mapClickedGestureRecognizer = new UITapGestureRecognizer(OnMapClicked));
+ }
+
+ void Cleanup()
+ {
+ if (_mapClickedGestureRecognizer != null)
+ {
+ RemoveGestureRecognizer(_mapClickedGestureRecognizer);
+ _mapClickedGestureRecognizer.Dispose();
+ _mapClickedGestureRecognizer = null;
+ }
+ RegionChanged -= MkMapViewOnRegionChanged;
+ DidSelectAnnotationView -= MkMapViewOnAnnotationViewSelected;
+ }
+
+ void MkMapViewOnAnnotationViewSelected(object? sender, MKAnnotationViewEventArgs e)
+ {
+ var annotation = e.View.Annotation;
+ var pin = GetPinForAnnotation(annotation!);
+
+ if (pin == null)
+ return;
+ // SendMarkerClick() returns the value of PinClickedEventArgs.HideInfoWindow
+ // Hide the info window by deselecting the annotation
+ bool deselect = pin.SendMarkerClick();
+ if (deselect)
+ DeselectAnnotation(annotation, false);
+ }
+
+ void MkMapViewOnRegionChanged(object? sender, MKMapViewChangeEventArgs e)
+ {
+ if (_handlerRef.TryGetTarget(out IMapHandler? handler) && handler?.VirtualView != null)
+ handler.VirtualView.VisibleRegion = new MapSpan(new Devices.Sensors.Location(Region.Center.Latitude, Region.Center.Longitude), Region.Span.LatitudeDelta, Region.Span.LongitudeDelta);
+ }
+
+ IMapPin GetPinForAnnotation(IMKAnnotation annotation)
+ {
+ IMapPin targetPin = null!;
+ _handlerRef.TryGetTarget(out IMapHandler? handler);
+ IMap map = handler?.VirtualView!;
+
+ for (int i = 0; i < map.Pins.Count; i++)
+ {
+ var pin = map.Pins[i];
+ if ((pin?.MarkerId as IMKAnnotation) == annotation)
+ {
+ targetPin = pin;
+ break;
+ }
+ }
+
+ return targetPin;
+ }
+
+ void AttachGestureToPin(MKAnnotationView mapPin, IMKAnnotation annotation)
+ {
+ var recognizers = mapPin.GestureRecognizers;
+
+ if (recognizers != null)
+ {
+ foreach (var r in recognizers)
+ {
+ mapPin.RemoveGestureRecognizer(r);
+ }
+ }
+
+ var recognizer = new UITapGestureRecognizer(g => OnCalloutClicked(annotation))
+ {
+ ShouldReceiveTouch = (gestureRecognizer, touch) =>
+ {
+ _lastTouchedView = touch.View;
+ return true;
+ }
+ };
+
+ mapPin.AddGestureRecognizer(recognizer);
+ }
+
+ void OnCalloutClicked(IMKAnnotation annotation)
+ {
+ // lookup pin
+ var targetPin = GetPinForAnnotation(annotation);
+
+ // pin not found. Must have been activated outside of forms
+ if (targetPin == null)
+ return;
+
+ // if the tap happened on the annotation view itself, skip because this is what happens when the callout is showing
+ // when the callout is already visible the tap comes in on a different view
+ if (_lastTouchedView is MKAnnotationView)
+ return;
+
+ targetPin.SendMarkerClick();
+
+ // SendInfoWindowClick() returns the value of PinClickedEventArgs.HideInfoWindow
+ // Hide the info window by deselecting the annotation
+ bool deselect = targetPin.SendInfoWindowClick();
+ if (deselect)
+ DeselectAnnotation(annotation, true);
+ }
+
+ T? GetMapElement(IMKOverlay mkPolyline) where T : MKOverlayRenderer
+ {
+ _handlerRef.TryGetTarget(out IMapHandler? handler);
+ var map = handler?.VirtualView;
+ IMapElement mapElement = default!;
+ for (int i = 0; i < map?.Elements.Count; i++)
+ {
+ var element = map.Elements[i];
+ if (ReferenceEquals(element.MapElementId, mkPolyline))
+ {
+ mapElement = element;
+ break;
+ }
+ }
+ //Make sure we Disconnect old handler we don't want to reuse that one
+ mapElement?.Handler?.DisconnectHandler();
+ return mapElement?.ToHandler(handler?.MauiContext!).PlatformView as T;
+ }
+
+ static void OnMapClicked(UITapGestureRecognizer recognizer)
+ {
+ if (recognizer.View is not MauiMKMapView mauiMkMapView)
+ return;
+ var tapPoint = recognizer.LocationInView(mauiMkMapView);
+ var tapGPS = mauiMkMapView.ConvertPoint(tapPoint, mauiMkMapView);
+ if (mauiMkMapView._handlerRef.TryGetTarget(out IMapHandler? handler))
+ handler?.VirtualView.Clicked(new Devices.Sensors.Location(tapGPS.Latitude, tapGPS.Longitude));
+ }
+ }
+}
diff --git a/src/Controls/Maps/src/Distance.cs b/src/Core/maps/src/Primitives/Distance.cs
similarity index 88%
rename from src/Controls/Maps/src/Distance.cs
rename to src/Core/maps/src/Primitives/Distance.cs
index 5c2f1ebc7856..8f1c3c9d442f 100644
--- a/src/Controls/Maps/src/Distance.cs
+++ b/src/Core/maps/src/Primitives/Distance.cs
@@ -1,7 +1,10 @@
-using System;
+using System;
+using System.Collections.Generic;
using System.Diagnostics;
+using System.Text;
+using Microsoft.Maui.Devices.Sensors;
-namespace Microsoft.Maui.Controls.Maps
+namespace Microsoft.Maui.Maps
{
public struct Distance
{
@@ -49,7 +52,7 @@ public static Distance FromKilometers(double kilometers)
return new Distance(kilometers * MetersPerKilometer);
}
- public static Distance BetweenPositions(Position position1, Position position2)
+ public static Distance BetweenPositions(Location position1, Location position2)
{
var latitude1 = position1.Latitude.ToRadians();
var longitude1 = position1.Longitude.ToRadians();
@@ -74,7 +77,7 @@ public bool Equals(Distance other)
return Meters.Equals(other.Meters);
}
- public override bool Equals(object obj)
+ public override bool Equals(object? obj)
{
if (ReferenceEquals(null, obj))
return false;
@@ -96,4 +99,4 @@ public override int GetHashCode()
return !left.Equals(right);
}
}
-}
\ No newline at end of file
+}
diff --git a/src/Controls/Maps/src/GeographyUtils.cs b/src/Core/maps/src/Primitives/GeographyUtils.cs
similarity index 60%
rename from src/Controls/Maps/src/GeographyUtils.cs
rename to src/Core/maps/src/Primitives/GeographyUtils.cs
index bbae4950273d..f8835a316971 100644
--- a/src/Controls/Maps/src/GeographyUtils.cs
+++ b/src/Core/maps/src/Primitives/GeographyUtils.cs
@@ -1,28 +1,24 @@
-using System;
+using System;
using System.Collections.Generic;
+using System.Text;
+using Microsoft.Maui.Devices.Sensors;
-namespace Microsoft.Maui.Controls.Maps
+namespace Microsoft.Maui.Maps
{
public static class GeographyUtils
{
internal const double EarthRadiusKm = 6371;
- public static double ToRadians(this double degrees)
- {
- return degrees * Math.PI / 180.0;
- }
+ public static double ToRadians(this double degrees) => degrees * Math.PI / 180.0;
- public static double ToDegrees(this double radians)
- {
- return radians / Math.PI * 180.0;
- }
+ public static double ToDegrees(this double radians) => radians / Math.PI * 180.0;
- public static List ToCircumferencePositions(this Circle circle)
+ public static List ToCircumferencePositions(this ICircleMapElement circle)
{
- var positions = new List();
+ var positions = new List();
double centerLatitude = circle.Center.Latitude.ToRadians();
double centerLongitude = circle.Center.Longitude.ToRadians();
- double distance = circle.Radius.Kilometers / GeographyUtils.EarthRadiusKm;
+ double distance = circle.Radius.Kilometers / EarthRadiusKm;
for (int angle = 0; angle <= 360; angle++)
{
@@ -33,7 +29,7 @@ public static List ToCircumferencePositions(this Circle circle)
Math.Atan2(Math.Sin(angleInRadians) * Math.Sin(distance) * Math.Cos(centerLatitude),
Math.Cos(distance) - Math.Sin(centerLatitude) * Math.Sin(latitude));
- positions.Add(new Position(latitude.ToDegrees(), longitude.ToDegrees()));
+ positions.Add(new Location(latitude.ToDegrees(), longitude.ToDegrees()));
}
return positions;
diff --git a/src/Controls/Maps/src/MapSpan.cs b/src/Core/maps/src/Primitives/MapSpan.cs
similarity index 73%
rename from src/Controls/Maps/src/MapSpan.cs
rename to src/Core/maps/src/Primitives/MapSpan.cs
index 67d6db8e4089..d5e8387e2eff 100644
--- a/src/Controls/Maps/src/MapSpan.cs
+++ b/src/Core/maps/src/Primitives/MapSpan.cs
@@ -1,20 +1,21 @@
using System;
+using Microsoft.Maui.Devices.Sensors;
-namespace Microsoft.Maui.Controls.Maps
+namespace Microsoft.Maui.Maps
{
public sealed class MapSpan
{
const double EarthCircumferenceKm = GeographyUtils.EarthRadiusKm * 2 * Math.PI;
const double MinimumRangeDegrees = 0.001 / EarthCircumferenceKm * 360; // 1 meter
- public MapSpan(Position center, double latitudeDegrees, double longitudeDegrees)
+ public MapSpan(Location center, double latitudeDegrees, double longitudeDegrees)
{
Center = center;
LatitudeDegrees = Math.Min(Math.Max(latitudeDegrees, MinimumRangeDegrees), 90.0);
LongitudeDegrees = Math.Min(Math.Max(longitudeDegrees, MinimumRangeDegrees), 180.0);
}
- public Position Center { get; }
+ public Location Center { get; }
public double LatitudeDegrees { get; }
@@ -36,10 +37,10 @@ public MapSpan ClampLatitude(double north, double south)
south = Math.Max(Math.Min(south, 0), -90);
double lat = Math.Max(Math.Min(Center.Latitude, north), south);
double maxDLat = Math.Min(north - lat, -south + lat) * 2;
- return new MapSpan(new Position(lat, Center.Longitude), Math.Min(LatitudeDegrees, maxDLat), LongitudeDegrees);
+ return new MapSpan(new Location(lat, Center.Longitude), Math.Min(LatitudeDegrees, maxDLat), LongitudeDegrees);
}
- public override bool Equals(object obj)
+ public override bool Equals(object? obj)
{
if (ReferenceEquals(null, obj))
return false;
@@ -48,7 +49,7 @@ public override bool Equals(object obj)
return obj is MapSpan && Equals((MapSpan)obj);
}
- public static MapSpan FromCenterAndRadius(Position center, Distance radius)
+ public static MapSpan FromCenterAndRadius(Location center, Distance radius)
{
return new MapSpan(center, 2 * DistanceToLatitudeDegrees(radius), 2 * DistanceToLongitudeDegrees(center, radius));
}
@@ -64,12 +65,12 @@ public override int GetHashCode()
}
}
- public static bool operator ==(MapSpan left, MapSpan right)
+ public static bool operator ==(MapSpan? left, MapSpan? right)
{
return Equals(left, right);
}
- public static bool operator !=(MapSpan left, MapSpan right)
+ public static bool operator !=(MapSpan? left, MapSpan? right)
{
return !Equals(left, right);
}
@@ -85,9 +86,9 @@ static double DistanceToLatitudeDegrees(Distance distance)
return distance.Kilometers / EarthCircumferenceKm * 360;
}
- static double DistanceToLongitudeDegrees(Position position, Distance distance)
+ static double DistanceToLongitudeDegrees(Location location, Distance distance)
{
- double latCircumference = LatitudeCircumferenceKm(position);
+ double latCircumference = LatitudeCircumferenceKm(location);
return distance.Kilometers / latCircumference * 360;
}
@@ -96,9 +97,9 @@ bool Equals(MapSpan other)
return Center.Equals(other.Center) && LongitudeDegrees.Equals(other.LongitudeDegrees) && LatitudeDegrees.Equals(other.LatitudeDegrees);
}
- static double LatitudeCircumferenceKm(Position position)
+ static double LatitudeCircumferenceKm(Location location)
{
- return EarthCircumferenceKm * Math.Cos(position.Latitude * Math.PI / 180.0);
+ return EarthCircumferenceKm * Math.Cos(location.Latitude * Math.PI / 180.0);
}
static double LatitudeDegreesToKm(double latitudeDegrees)
@@ -106,10 +107,15 @@ static double LatitudeDegreesToKm(double latitudeDegrees)
return EarthCircumferenceKm * latitudeDegrees / 360;
}
- static double LongitudeDegreesToKm(Position position, double longitudeDegrees)
+ static double LongitudeDegreesToKm(Location location, double longitudeDegrees)
{
- double latCircumference = LatitudeCircumferenceKm(position);
+ double latCircumference = LatitudeCircumferenceKm(location);
return latCircumference * longitudeDegrees / 360;
}
+
+ public override string ToString()
+ {
+ return $"{Center}, {LatitudeDegrees}, {LongitudeDegrees}";
+ }
}
}
\ No newline at end of file
diff --git a/src/Core/maps/src/Primitives/MapType.cs b/src/Core/maps/src/Primitives/MapType.cs
new file mode 100644
index 000000000000..8b8fe0266db4
--- /dev/null
+++ b/src/Core/maps/src/Primitives/MapType.cs
@@ -0,0 +1,23 @@
+namespace Microsoft.Maui.Maps
+{
+ ///
+ /// Specify which visual representation should be shown for a map.
+ ///
+ public enum MapType
+ {
+ ///
+ /// Shows the as a schematic overview of all roads, streets, etc.
+ ///
+ Street,
+
+ ///
+ /// Shows the with satellite imagery.
+ ///
+ Satellite,
+
+ ///
+ /// Shows the with satellite imagery and a street map overlay.
+ ///
+ Hybrid
+ }
+}
\ No newline at end of file
diff --git a/src/Core/maps/src/PublicAPI/net-android/PublicAPI.Shipped.txt b/src/Core/maps/src/PublicAPI/net-android/PublicAPI.Shipped.txt
new file mode 100644
index 000000000000..ab058de62d44
--- /dev/null
+++ b/src/Core/maps/src/PublicAPI/net-android/PublicAPI.Shipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Core/maps/src/PublicAPI/net-android/PublicAPI.Unshipped.txt b/src/Core/maps/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
new file mode 100644
index 000000000000..41d0d25d1997
--- /dev/null
+++ b/src/Core/maps/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
@@ -0,0 +1,128 @@
+Microsoft.Maui.Maps.Distance
+Microsoft.Maui.Maps.Distance.Distance() -> void
+Microsoft.Maui.Maps.Distance.Distance(double meters) -> void
+Microsoft.Maui.Maps.Distance.Equals(Microsoft.Maui.Maps.Distance other) -> bool
+Microsoft.Maui.Maps.Distance.Kilometers.get -> double
+Microsoft.Maui.Maps.Distance.Meters.get -> double
+Microsoft.Maui.Maps.Distance.Miles.get -> double
+Microsoft.Maui.Maps.GeographyUtils
+Microsoft.Maui.Maps.Handlers.IMapElementHandler
+Microsoft.Maui.Maps.Handlers.IMapElementHandler.PlatformView.get -> Java.Lang.Object!
+Microsoft.Maui.Maps.Handlers.IMapElementHandler.VirtualView.get -> Microsoft.Maui.Maps.IMapElement!
+Microsoft.Maui.Maps.Handlers.IMapHandler
+Microsoft.Maui.Maps.Handlers.IMapHandler.Map.get -> Android.Gms.Maps.GoogleMap?
+Microsoft.Maui.Maps.Handlers.IMapHandler.Map.set -> void
+Microsoft.Maui.Maps.Handlers.IMapHandler.PlatformView.get -> Android.Gms.Maps.MapView!
+Microsoft.Maui.Maps.Handlers.IMapHandler.UpdateMapElement(Microsoft.Maui.Maps.IMapElement! element) -> void
+Microsoft.Maui.Maps.Handlers.IMapHandler.VirtualView.get -> Microsoft.Maui.Maps.IMap!
+Microsoft.Maui.Maps.Handlers.IMapPinHandler
+Microsoft.Maui.Maps.Handlers.IMapPinHandler.PlatformView.get -> Android.Gms.Maps.Model.MarkerOptions!
+Microsoft.Maui.Maps.Handlers.IMapPinHandler.VirtualView.get -> Microsoft.Maui.Maps.IMapPin!
+Microsoft.Maui.Maps.Handlers.MapElementHandler
+Microsoft.Maui.Maps.Handlers.MapElementHandler.MapElementHandler() -> void
+Microsoft.Maui.Maps.Handlers.MapElementHandler.MapElementHandler(Microsoft.Maui.IPropertyMapper? mapper = null) -> void
+Microsoft.Maui.Maps.Handlers.MapElementHandlerUpdate
+Microsoft.Maui.Maps.Handlers.MapElementHandlerUpdate.Index.get -> int
+Microsoft.Maui.Maps.Handlers.MapElementHandlerUpdate.Index.init -> void
+Microsoft.Maui.Maps.Handlers.MapElementHandlerUpdate.MapElement.get -> Microsoft.Maui.Maps.IMapElement!
+Microsoft.Maui.Maps.Handlers.MapElementHandlerUpdate.MapElement.init -> void
+Microsoft.Maui.Maps.Handlers.MapElementHandlerUpdate.MapElementHandlerUpdate(int Index, Microsoft.Maui.Maps.IMapElement! MapElement) -> void
+Microsoft.Maui.Maps.Handlers.MapHandler
+Microsoft.Maui.Maps.Handlers.MapHandler.GetNativeCircle(Microsoft.Maui.Maps.ICircleMapElement! circle) -> Android.Gms.Maps.Model.Circle?
+Microsoft.Maui.Maps.Handlers.MapHandler.GetNativePolygon(Microsoft.Maui.Maps.IGeoPathMapElement! polygon) -> Android.Gms.Maps.Model.Polygon?
+Microsoft.Maui.Maps.Handlers.MapHandler.GetNativePolyline(Microsoft.Maui.Maps.IGeoPathMapElement! polyline) -> Android.Gms.Maps.Model.Polyline?
+Microsoft.Maui.Maps.Handlers.MapHandler.GetPinForMarker(Android.Gms.Maps.Model.Marker! marker) -> Microsoft.Maui.Maps.IMapPin?
+Microsoft.Maui.Maps.Handlers.MapHandler.Map.get -> Android.Gms.Maps.GoogleMap?
+Microsoft.Maui.Maps.Handlers.MapHandler.Map.set -> void
+Microsoft.Maui.Maps.Handlers.MapHandler.MapHandler() -> void
+Microsoft.Maui.Maps.Handlers.MapHandler.MapHandler(Microsoft.Maui.IPropertyMapper? mapper = null, Microsoft.Maui.CommandMapper? commandMapper = null) -> void
+Microsoft.Maui.Maps.Handlers.MapHandler.UpdateMapElement(Microsoft.Maui.Maps.IMapElement! element) -> void
+Microsoft.Maui.Maps.Handlers.MapPinHandler
+Microsoft.Maui.Maps.Handlers.MapPinHandler.MapPinHandler() -> void
+Microsoft.Maui.Maps.Handlers.MapPinHandler.MapPinHandler(Microsoft.Maui.IPropertyMapper? mapper = null) -> void
+Microsoft.Maui.Maps.ICircleMapElement
+Microsoft.Maui.Maps.ICircleMapElement.Center.get -> Microsoft.Maui.Devices.Sensors.Location!
+Microsoft.Maui.Maps.ICircleMapElement.Radius.get -> Microsoft.Maui.Maps.Distance
+Microsoft.Maui.Maps.IFilledMapElement
+Microsoft.Maui.Maps.IFilledMapElement.Fill.get -> Microsoft.Maui.Graphics.Paint?
+Microsoft.Maui.Maps.IGeoPathMapElement
+Microsoft.Maui.Maps.IMap
+Microsoft.Maui.Maps.IMap.Clicked(Microsoft.Maui.Devices.Sensors.Location! position) -> void
+Microsoft.Maui.Maps.IMap.Elements.get -> System.Collections.Generic.IList!
+Microsoft.Maui.Maps.IMap.IsScrollEnabled.get -> bool
+Microsoft.Maui.Maps.IMap.IsTrafficEnabled.get -> bool
+Microsoft.Maui.Maps.IMap.IsZoomEnabled.get -> bool
+Microsoft.Maui.Maps.IMap.IsShowingUser.get -> bool
+Microsoft.Maui.Maps.IMap.MapType.get -> Microsoft.Maui.Maps.MapType
+Microsoft.Maui.Maps.IMap.MoveToRegion(Microsoft.Maui.Maps.MapSpan! region) -> void
+Microsoft.Maui.Maps.IMap.Pins.get -> System.Collections.Generic.IList!
+Microsoft.Maui.Maps.IMap.VisibleRegion.get -> Microsoft.Maui.Maps.MapSpan?
+Microsoft.Maui.Maps.IMap.VisibleRegion.set -> void
+Microsoft.Maui.Maps.IMapElement
+Microsoft.Maui.Maps.IMapElement.MapElementId.get -> object?
+Microsoft.Maui.Maps.IMapElement.MapElementId.set -> void
+Microsoft.Maui.Maps.IMapPin
+Microsoft.Maui.Maps.IMapPin.Address.get -> string!
+Microsoft.Maui.Maps.IMapPin.Label.get -> string!
+Microsoft.Maui.Maps.IMapPin.Location.get -> Microsoft.Maui.Devices.Sensors.Location!
+Microsoft.Maui.Maps.IMapPin.MarkerId.get -> object?
+Microsoft.Maui.Maps.IMapPin.MarkerId.set -> void
+Microsoft.Maui.Maps.IMapPin.SendInfoWindowClick() -> bool
+Microsoft.Maui.Maps.IMapPin.SendMarkerClick() -> bool
+Microsoft.Maui.Maps.MapSpan
+Microsoft.Maui.Maps.MapSpan.Center.get -> Microsoft.Maui.Devices.Sensors.Location!
+Microsoft.Maui.Maps.MapSpan.ClampLatitude(double north, double south) -> Microsoft.Maui.Maps.MapSpan!
+Microsoft.Maui.Maps.MapSpan.LatitudeDegrees.get -> double
+Microsoft.Maui.Maps.MapSpan.LongitudeDegrees.get -> double
+Microsoft.Maui.Maps.MapSpan.MapSpan(Microsoft.Maui.Devices.Sensors.Location! center, double latitudeDegrees, double longitudeDegrees) -> void
+Microsoft.Maui.Maps.MapSpan.Radius.get -> Microsoft.Maui.Maps.Distance
+Microsoft.Maui.Maps.MapSpan.WithZoom(double zoomFactor) -> Microsoft.Maui.Maps.MapSpan!
+Microsoft.Maui.Maps.MapType
+Microsoft.Maui.Maps.MapType.Hybrid = 2 -> Microsoft.Maui.Maps.MapType
+Microsoft.Maui.Maps.MapType.Satellite = 1 -> Microsoft.Maui.Maps.MapType
+Microsoft.Maui.Maps.MapType.Street = 0 -> Microsoft.Maui.Maps.MapType
+override Microsoft.Maui.Maps.Distance.Equals(object? obj) -> bool
+override Microsoft.Maui.Maps.Distance.GetHashCode() -> int
+override Microsoft.Maui.Maps.Handlers.MapElementHandler.CreatePlatformElement() -> Java.Lang.Object!
+override Microsoft.Maui.Maps.Handlers.MapHandler.ConnectHandler(Android.Gms.Maps.MapView! platformView) -> void
+override Microsoft.Maui.Maps.Handlers.MapHandler.CreatePlatformView() -> Android.Gms.Maps.MapView!
+override Microsoft.Maui.Maps.Handlers.MapHandler.DisconnectHandler(Android.Gms.Maps.MapView! platformView) -> void
+override Microsoft.Maui.Maps.Handlers.MapPinHandler.CreatePlatformElement() -> Android.Gms.Maps.Model.MarkerOptions!
+override Microsoft.Maui.Maps.MapSpan.Equals(object? obj) -> bool
+override Microsoft.Maui.Maps.MapSpan.GetHashCode() -> int
+override Microsoft.Maui.Maps.MapSpan.ToString() -> string!
+static Microsoft.Maui.Maps.Distance.BetweenPositions(Microsoft.Maui.Devices.Sensors.Location! position1, Microsoft.Maui.Devices.Sensors.Location! position2) -> Microsoft.Maui.Maps.Distance
+static Microsoft.Maui.Maps.Distance.FromKilometers(double kilometers) -> Microsoft.Maui.Maps.Distance
+static Microsoft.Maui.Maps.Distance.FromMeters(double meters) -> Microsoft.Maui.Maps.Distance
+static Microsoft.Maui.Maps.Distance.FromMiles(double miles) -> Microsoft.Maui.Maps.Distance
+static Microsoft.Maui.Maps.Distance.operator !=(Microsoft.Maui.Maps.Distance left, Microsoft.Maui.Maps.Distance right) -> bool
+static Microsoft.Maui.Maps.Distance.operator ==(Microsoft.Maui.Maps.Distance left, Microsoft.Maui.Maps.Distance right) -> bool
+static Microsoft.Maui.Maps.GeographyUtils.ToCircumferencePositions(this Microsoft.Maui.Maps.ICircleMapElement! circle) -> System.Collections.Generic.List!
+static Microsoft.Maui.Maps.GeographyUtils.ToDegrees(this double radians) -> double
+static Microsoft.Maui.Maps.GeographyUtils.ToRadians(this double degrees) -> double
+static Microsoft.Maui.Maps.Handlers.MapElementHandler.MapCenter(Microsoft.Maui.Maps.Handlers.IMapElementHandler! handler, Microsoft.Maui.Maps.IMapElement! mapElement) -> void
+static Microsoft.Maui.Maps.Handlers.MapElementHandler.MapFill(Microsoft.Maui.Maps.Handlers.IMapElementHandler! handler, Microsoft.Maui.Maps.IMapElement! mapElement) -> void
+static Microsoft.Maui.Maps.Handlers.MapElementHandler.MapGeopath(Microsoft.Maui.Maps.Handlers.IMapElementHandler! handler, Microsoft.Maui.Maps.IMapElement! mapElement) -> void
+static Microsoft.Maui.Maps.Handlers.MapElementHandler.Mapper -> Microsoft.Maui.IPropertyMapper!
+static Microsoft.Maui.Maps.Handlers.MapElementHandler.MapRadius(Microsoft.Maui.Maps.Handlers.IMapElementHandler! handler, Microsoft.Maui.Maps.IMapElement! mapElement) -> void
+static Microsoft.Maui.Maps.Handlers.MapElementHandler.MapStroke(Microsoft.Maui.Maps.Handlers.IMapElementHandler! handler, Microsoft.Maui.Maps.IMapElement! mapElement) -> void
+static Microsoft.Maui.Maps.Handlers.MapElementHandler.MapStrokeThickness(Microsoft.Maui.Maps.Handlers.IMapElementHandler! handler, Microsoft.Maui.Maps.IMapElement! mapElement) -> void
+static Microsoft.Maui.Maps.Handlers.MapHandler.Bundle.set -> void
+static Microsoft.Maui.Maps.Handlers.MapHandler.CommandMapper -> Microsoft.Maui.CommandMapper!
+static Microsoft.Maui.Maps.Handlers.MapHandler.MapElements(Microsoft.Maui.Maps.Handlers.IMapHandler! handler, Microsoft.Maui.Maps.IMap! map) -> void
+static Microsoft.Maui.Maps.Handlers.MapHandler.MapIsScrollEnabled(Microsoft.Maui.Maps.Handlers.IMapHandler! handler, Microsoft.Maui.Maps.IMap! map) -> void
+static Microsoft.Maui.Maps.Handlers.MapHandler.MapIsTrafficEnabled(Microsoft.Maui.Maps.Handlers.IMapHandler! handler, Microsoft.Maui.Maps.IMap! map) -> void
+static Microsoft.Maui.Maps.Handlers.MapHandler.MapIsZoomEnabled(Microsoft.Maui.Maps.Handlers.IMapHandler! handler, Microsoft.Maui.Maps.IMap! map) -> void
+static Microsoft.Maui.Maps.Handlers.MapHandler.MapIsShowingUser(Microsoft.Maui.Maps.Handlers.IMapHandler! handler, Microsoft.Maui.Maps.IMap! map) -> void
+static Microsoft.Maui.Maps.Handlers.MapHandler.MapMapType(Microsoft.Maui.Maps.Handlers.IMapHandler! handler, Microsoft.Maui.Maps.IMap! map) -> void
+static Microsoft.Maui.Maps.Handlers.MapHandler.MapMoveToRegion(Microsoft.Maui.Maps.Handlers.IMapHandler! handler, Microsoft.Maui.Maps.IMap! map, object? arg) -> void
+static Microsoft.Maui.Maps.Handlers.MapHandler.Mapper -> Microsoft.Maui.IPropertyMapper!
+static Microsoft.Maui.Maps.Handlers.MapHandler.MapPins(Microsoft.Maui.Maps.Handlers.IMapHandler! handler, Microsoft.Maui.Maps.IMap! map) -> void
+static Microsoft.Maui.Maps.Handlers.MapHandler.MapUpdateMapElement(Microsoft.Maui.Maps.Handlers.IMapHandler! handler, Microsoft.Maui.Maps.IMap! map, object? arg) -> void
+static Microsoft.Maui.Maps.Handlers.MapPinHandler.MapAddress(Microsoft.Maui.Maps.Handlers.IMapPinHandler! handler, Microsoft.Maui.Maps.IMapPin! mapPin) -> void
+static Microsoft.Maui.Maps.Handlers.MapPinHandler.MapLabel(Microsoft.Maui.Maps.Handlers.IMapPinHandler! handler, Microsoft.Maui.Maps.IMapPin! mapPin) -> void
+static Microsoft.Maui.Maps.Handlers.MapPinHandler.MapLocation(Microsoft.Maui.Maps.Handlers.IMapPinHandler! handler, Microsoft.Maui.Maps.IMapPin! mapPin) -> void
+static Microsoft.Maui.Maps.Handlers.MapPinHandler.Mapper -> Microsoft.Maui.IPropertyMapper!
+static Microsoft.Maui.Maps.MapSpan.FromCenterAndRadius(Microsoft.Maui.Devices.Sensors.Location! center, Microsoft.Maui.Maps.Distance radius) -> Microsoft.Maui.Maps.MapSpan!
+static Microsoft.Maui.Maps.MapSpan.operator !=(Microsoft.Maui.Maps.MapSpan? left, Microsoft.Maui.Maps.MapSpan? right) -> bool
+static Microsoft.Maui.Maps.MapSpan.operator ==(Microsoft.Maui.Maps.MapSpan? left, Microsoft.Maui.Maps.MapSpan? right) -> bool
\ No newline at end of file
diff --git a/src/Core/maps/src/PublicAPI/net-ios/PublicAPI.Shipped.txt b/src/Core/maps/src/PublicAPI/net-ios/PublicAPI.Shipped.txt
new file mode 100644
index 000000000000..ab058de62d44
--- /dev/null
+++ b/src/Core/maps/src/PublicAPI/net-ios/PublicAPI.Shipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Core/maps/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt b/src/Core/maps/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt
new file mode 100644
index 000000000000..994421b1d66f
--- /dev/null
+++ b/src/Core/maps/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt
@@ -0,0 +1,120 @@
+Microsoft.Maui.Maps.Distance
+Microsoft.Maui.Maps.Distance.Distance() -> void
+Microsoft.Maui.Maps.Distance.Distance(double meters) -> void
+Microsoft.Maui.Maps.Distance.Equals(Microsoft.Maui.Maps.Distance other) -> bool
+Microsoft.Maui.Maps.Distance.Kilometers.get -> double
+Microsoft.Maui.Maps.Distance.Meters.get -> double
+Microsoft.Maui.Maps.Distance.Miles.get -> double
+Microsoft.Maui.Maps.GeographyUtils
+Microsoft.Maui.Maps.Handlers.IMapElementHandler
+Microsoft.Maui.Maps.Handlers.IMapElementHandler.PlatformView.get -> MapKit.MKOverlayRenderer!
+Microsoft.Maui.Maps.Handlers.IMapElementHandler.VirtualView.get -> Microsoft.Maui.Maps.IMapElement!
+Microsoft.Maui.Maps.Handlers.IMapHandler
+Microsoft.Maui.Maps.Handlers.IMapHandler.PlatformView.get -> Microsoft.Maui.Maps.Platform.MauiMKMapView!
+Microsoft.Maui.Maps.Handlers.IMapHandler.UpdateMapElement(Microsoft.Maui.Maps.IMapElement! element) -> void
+Microsoft.Maui.Maps.Handlers.IMapHandler.VirtualView.get -> Microsoft.Maui.Maps.IMap!
+Microsoft.Maui.Maps.Handlers.IMapPinHandler
+Microsoft.Maui.Maps.Handlers.IMapPinHandler.PlatformView.get -> MapKit.IMKAnnotation!
+Microsoft.Maui.Maps.Handlers.IMapPinHandler.VirtualView.get -> Microsoft.Maui.Maps.IMapPin!
+Microsoft.Maui.Maps.Handlers.MapElementHandler
+Microsoft.Maui.Maps.Handlers.MapElementHandler.MapElementHandler() -> void
+Microsoft.Maui.Maps.Handlers.MapElementHandler.MapElementHandler(Microsoft.Maui.IPropertyMapper? mapper = null) -> void
+Microsoft.Maui.Maps.Handlers.MapElementHandlerUpdate
+Microsoft.Maui.Maps.Handlers.MapElementHandlerUpdate.Index.get -> int
+Microsoft.Maui.Maps.Handlers.MapElementHandlerUpdate.Index.init -> void
+Microsoft.Maui.Maps.Handlers.MapElementHandlerUpdate.MapElement.get -> Microsoft.Maui.Maps.IMapElement!
+Microsoft.Maui.Maps.Handlers.MapElementHandlerUpdate.MapElement.init -> void
+Microsoft.Maui.Maps.Handlers.MapElementHandlerUpdate.MapElementHandlerUpdate(int Index, Microsoft.Maui.Maps.IMapElement! MapElement) -> void
+Microsoft.Maui.Maps.Handlers.MapHandler
+Microsoft.Maui.Maps.Handlers.MapHandler.MapHandler() -> void
+Microsoft.Maui.Maps.Handlers.MapHandler.MapHandler(Microsoft.Maui.IPropertyMapper? mapper = null, Microsoft.Maui.CommandMapper? commandMapper = null) -> void
+Microsoft.Maui.Maps.Handlers.MapHandler.UpdateMapElement(Microsoft.Maui.Maps.IMapElement! element) -> void
+Microsoft.Maui.Maps.Handlers.MapPinHandler
+Microsoft.Maui.Maps.Handlers.MapPinHandler.MapPinHandler() -> void
+Microsoft.Maui.Maps.Handlers.MapPinHandler.MapPinHandler(Microsoft.Maui.IPropertyMapper? mapper = null) -> void
+Microsoft.Maui.Maps.ICircleMapElement
+Microsoft.Maui.Maps.ICircleMapElement.Center.get -> Microsoft.Maui.Devices.Sensors.Location!
+Microsoft.Maui.Maps.ICircleMapElement.Radius.get -> Microsoft.Maui.Maps.Distance
+Microsoft.Maui.Maps.IFilledMapElement
+Microsoft.Maui.Maps.IFilledMapElement.Fill.get -> Microsoft.Maui.Graphics.Paint?
+Microsoft.Maui.Maps.IGeoPathMapElement
+Microsoft.Maui.Maps.IMap
+Microsoft.Maui.Maps.IMap.Clicked(Microsoft.Maui.Devices.Sensors.Location! position) -> void
+Microsoft.Maui.Maps.IMap.Elements.get -> System.Collections.Generic.IList!
+Microsoft.Maui.Maps.IMap.IsScrollEnabled.get -> bool
+Microsoft.Maui.Maps.IMap.IsTrafficEnabled.get -> bool
+Microsoft.Maui.Maps.IMap.IsZoomEnabled.get -> bool
+Microsoft.Maui.Maps.IMap.IsShowingUser.get -> bool
+Microsoft.Maui.Maps.IMap.MapType.get -> Microsoft.Maui.Maps.MapType
+Microsoft.Maui.Maps.IMap.MoveToRegion(Microsoft.Maui.Maps.MapSpan! region) -> void
+Microsoft.Maui.Maps.IMap.Pins.get -> System.Collections.Generic.IList!
+Microsoft.Maui.Maps.IMap.VisibleRegion.get -> Microsoft.Maui.Maps.MapSpan?
+Microsoft.Maui.Maps.IMap.VisibleRegion.set -> void
+Microsoft.Maui.Maps.IMapElement
+Microsoft.Maui.Maps.IMapElement.MapElementId.get -> object?
+Microsoft.Maui.Maps.IMapElement.MapElementId.set -> void
+Microsoft.Maui.Maps.IMapPin
+Microsoft.Maui.Maps.IMapPin.Address.get -> string!
+Microsoft.Maui.Maps.IMapPin.Label.get -> string!
+Microsoft.Maui.Maps.IMapPin.Location.get -> Microsoft.Maui.Devices.Sensors.Location!
+Microsoft.Maui.Maps.IMapPin.MarkerId.get -> object?
+Microsoft.Maui.Maps.IMapPin.MarkerId.set -> void
+Microsoft.Maui.Maps.IMapPin.SendInfoWindowClick() -> bool
+Microsoft.Maui.Maps.IMapPin.SendMarkerClick() -> bool
+Microsoft.Maui.Maps.MapSpan
+Microsoft.Maui.Maps.MapSpan.Center.get -> Microsoft.Maui.Devices.Sensors.Location!
+Microsoft.Maui.Maps.MapSpan.ClampLatitude(double north, double south) -> Microsoft.Maui.Maps.MapSpan!
+Microsoft.Maui.Maps.MapSpan.LatitudeDegrees.get -> double
+Microsoft.Maui.Maps.MapSpan.LongitudeDegrees.get -> double
+Microsoft.Maui.Maps.MapSpan.MapSpan(Microsoft.Maui.Devices.Sensors.Location! center, double latitudeDegrees, double longitudeDegrees) -> void
+Microsoft.Maui.Maps.MapSpan.Radius.get -> Microsoft.Maui.Maps.Distance
+Microsoft.Maui.Maps.MapSpan.WithZoom(double zoomFactor) -> Microsoft.Maui.Maps.MapSpan!
+Microsoft.Maui.Maps.MapType
+Microsoft.Maui.Maps.MapType.Hybrid = 2 -> Microsoft.Maui.Maps.MapType
+Microsoft.Maui.Maps.MapType.Satellite = 1 -> Microsoft.Maui.Maps.MapType
+Microsoft.Maui.Maps.MapType.Street = 0 -> Microsoft.Maui.Maps.MapType
+Microsoft.Maui.Maps.Platform.MauiMKMapView
+Microsoft.Maui.Maps.Platform.MauiMKMapView.MauiMKMapView(Microsoft.Maui.Maps.Handlers.IMapHandler! handler) -> void
+override Microsoft.Maui.Maps.Distance.Equals(object? obj) -> bool
+override Microsoft.Maui.Maps.Distance.GetHashCode() -> int
+override Microsoft.Maui.Maps.Handlers.MapElementHandler.CreatePlatformElement() -> MapKit.MKOverlayRenderer!
+override Microsoft.Maui.Maps.Handlers.MapHandler.ConnectHandler(Microsoft.Maui.Maps.Platform.MauiMKMapView! platformView) -> void
+override Microsoft.Maui.Maps.Handlers.MapHandler.CreatePlatformView() -> Microsoft.Maui.Maps.Platform.MauiMKMapView!
+override Microsoft.Maui.Maps.Handlers.MapHandler.DisconnectHandler(Microsoft.Maui.Maps.Platform.MauiMKMapView! platformView) -> void
+override Microsoft.Maui.Maps.Handlers.MapPinHandler.CreatePlatformElement() -> MapKit.IMKAnnotation!
+override Microsoft.Maui.Maps.MapSpan.Equals(object? obj) -> bool
+override Microsoft.Maui.Maps.MapSpan.GetHashCode() -> int
+override Microsoft.Maui.Maps.MapSpan.ToString() -> string!
+override Microsoft.Maui.Maps.Platform.MauiMKMapView.MovedToWindow() -> void
+static Microsoft.Maui.Maps.Distance.BetweenPositions(Microsoft.Maui.Devices.Sensors.Location! position1, Microsoft.Maui.Devices.Sensors.Location! position2) -> Microsoft.Maui.Maps.Distance
+static Microsoft.Maui.Maps.Distance.FromKilometers(double kilometers) -> Microsoft.Maui.Maps.Distance
+static Microsoft.Maui.Maps.Distance.FromMeters(double meters) -> Microsoft.Maui.Maps.Distance
+static Microsoft.Maui.Maps.Distance.FromMiles(double miles) -> Microsoft.Maui.Maps.Distance
+static Microsoft.Maui.Maps.Distance.operator !=(Microsoft.Maui.Maps.Distance left, Microsoft.Maui.Maps.Distance right) -> bool
+static Microsoft.Maui.Maps.Distance.operator ==(Microsoft.Maui.Maps.Distance left, Microsoft.Maui.Maps.Distance right) -> bool
+static Microsoft.Maui.Maps.GeographyUtils.ToCircumferencePositions(this Microsoft.Maui.Maps.ICircleMapElement! circle) -> System.Collections.Generic.List!
+static Microsoft.Maui.Maps.GeographyUtils.ToDegrees(this double radians) -> double
+static Microsoft.Maui.Maps.GeographyUtils.ToRadians(this double degrees) -> double
+static Microsoft.Maui.Maps.Handlers.MapElementHandler.MapFill(Microsoft.Maui.Maps.Handlers.IMapElementHandler! handler, Microsoft.Maui.Maps.IMapElement! mapElement) -> void
+static Microsoft.Maui.Maps.Handlers.MapElementHandler.Mapper -> Microsoft.Maui.IPropertyMapper!
+static Microsoft.Maui.Maps.Handlers.MapElementHandler.MapStroke(Microsoft.Maui.Maps.Handlers.IMapElementHandler! handler, Microsoft.Maui.Maps.IMapElement! mapElement) -> void
+static Microsoft.Maui.Maps.Handlers.MapElementHandler.MapStrokeThickness(Microsoft.Maui.Maps.Handlers.IMapElementHandler! handler, Microsoft.Maui.Maps.IMapElement! mapElement) -> void
+static Microsoft.Maui.Maps.Handlers.MapHandler.CommandMapper -> Microsoft.Maui.CommandMapper!
+static Microsoft.Maui.Maps.Handlers.MapHandler.MapElements(Microsoft.Maui.Maps.Handlers.IMapHandler! handler, Microsoft.Maui.Maps.IMap! map) -> void
+static Microsoft.Maui.Maps.Handlers.MapHandler.MapIsScrollEnabled(Microsoft.Maui.Maps.Handlers.IMapHandler! handler, Microsoft.Maui.Maps.IMap! map) -> void
+static Microsoft.Maui.Maps.Handlers.MapHandler.MapIsTrafficEnabled(Microsoft.Maui.Maps.Handlers.IMapHandler! handler, Microsoft.Maui.Maps.IMap! map) -> void
+static Microsoft.Maui.Maps.Handlers.MapHandler.MapIsZoomEnabled(Microsoft.Maui.Maps.Handlers.IMapHandler! handler, Microsoft.Maui.Maps.IMap! map) -> void
+static Microsoft.Maui.Maps.Handlers.MapHandler.MapIsShowingUser(Microsoft.Maui.Maps.Handlers.IMapHandler! handler, Microsoft.Maui.Maps.IMap! map) -> void
+static Microsoft.Maui.Maps.Handlers.MapHandler.MapMapType(Microsoft.Maui.Maps.Handlers.IMapHandler! handler, Microsoft.Maui.Maps.IMap! map) -> void
+static Microsoft.Maui.Maps.Handlers.MapHandler.MapMoveToRegion(Microsoft.Maui.Maps.Handlers.IMapHandler! handler, Microsoft.Maui.Maps.IMap! map, object? arg) -> void
+static Microsoft.Maui.Maps.Handlers.MapHandler.Mapper -> Microsoft.Maui.IPropertyMapper!
+static Microsoft.Maui.Maps.Handlers.MapHandler.MapPins(Microsoft.Maui.Maps.Handlers.IMapHandler! handler, Microsoft.Maui.Maps.IMap! map) -> void
+static Microsoft.Maui.Maps.Handlers.MapHandler.MapUpdateMapElement(Microsoft.Maui.Maps.Handlers.IMapHandler! handler, Microsoft.Maui.Maps.IMap! map, object? arg) -> void
+static Microsoft.Maui.Maps.Handlers.MapPinHandler.MapAddress(Microsoft.Maui.Maps.Handlers.IMapPinHandler! handler, Microsoft.Maui.Maps.IMapPin! mapPin) -> void
+static Microsoft.Maui.Maps.Handlers.MapPinHandler.MapLabel(Microsoft.Maui.Maps.Handlers.IMapPinHandler! handler, Microsoft.Maui.Maps.IMapPin! mapPin) -> void
+static Microsoft.Maui.Maps.Handlers.MapPinHandler.MapLocation(Microsoft.Maui.Maps.Handlers.IMapPinHandler! handler, Microsoft.Maui.Maps.IMapPin! mapPin) -> void
+static Microsoft.Maui.Maps.Handlers.MapPinHandler.Mapper -> Microsoft.Maui.IPropertyMapper!
+static Microsoft.Maui.Maps.MapSpan.FromCenterAndRadius(Microsoft.Maui.Devices.Sensors.Location! center, Microsoft.Maui.Maps.Distance radius) -> Microsoft.Maui.Maps.MapSpan!
+static Microsoft.Maui.Maps.MapSpan.operator !=(Microsoft.Maui.Maps.MapSpan? left, Microsoft.Maui.Maps.MapSpan? right) -> bool
+static Microsoft.Maui.Maps.MapSpan.operator ==(Microsoft.Maui.Maps.MapSpan? left, Microsoft.Maui.Maps.MapSpan? right) -> bool
+virtual Microsoft.Maui.Maps.Platform.MauiMKMapView.GetViewForOverlayDelegate(MapKit.MKMapView! mapview, MapKit.IMKOverlay! overlay) -> MapKit.MKOverlayRenderer!
\ No newline at end of file
diff --git a/src/Core/maps/src/PublicAPI/net-maccatalyst/PublicAPI.Shipped.txt b/src/Core/maps/src/PublicAPI/net-maccatalyst/PublicAPI.Shipped.txt
new file mode 100644
index 000000000000..ab058de62d44
--- /dev/null
+++ b/src/Core/maps/src/PublicAPI/net-maccatalyst/PublicAPI.Shipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Core/maps/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt b/src/Core/maps/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
new file mode 100644
index 000000000000..994421b1d66f
--- /dev/null
+++ b/src/Core/maps/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
@@ -0,0 +1,120 @@
+Microsoft.Maui.Maps.Distance
+Microsoft.Maui.Maps.Distance.Distance() -> void
+Microsoft.Maui.Maps.Distance.Distance(double meters) -> void
+Microsoft.Maui.Maps.Distance.Equals(Microsoft.Maui.Maps.Distance other) -> bool
+Microsoft.Maui.Maps.Distance.Kilometers.get -> double
+Microsoft.Maui.Maps.Distance.Meters.get -> double
+Microsoft.Maui.Maps.Distance.Miles.get -> double
+Microsoft.Maui.Maps.GeographyUtils
+Microsoft.Maui.Maps.Handlers.IMapElementHandler
+Microsoft.Maui.Maps.Handlers.IMapElementHandler.PlatformView.get -> MapKit.MKOverlayRenderer!
+Microsoft.Maui.Maps.Handlers.IMapElementHandler.VirtualView.get -> Microsoft.Maui.Maps.IMapElement!
+Microsoft.Maui.Maps.Handlers.IMapHandler
+Microsoft.Maui.Maps.Handlers.IMapHandler.PlatformView.get -> Microsoft.Maui.Maps.Platform.MauiMKMapView!
+Microsoft.Maui.Maps.Handlers.IMapHandler.UpdateMapElement(Microsoft.Maui.Maps.IMapElement! element) -> void
+Microsoft.Maui.Maps.Handlers.IMapHandler.VirtualView.get -> Microsoft.Maui.Maps.IMap!
+Microsoft.Maui.Maps.Handlers.IMapPinHandler
+Microsoft.Maui.Maps.Handlers.IMapPinHandler.PlatformView.get -> MapKit.IMKAnnotation!
+Microsoft.Maui.Maps.Handlers.IMapPinHandler.VirtualView.get -> Microsoft.Maui.Maps.IMapPin!
+Microsoft.Maui.Maps.Handlers.MapElementHandler
+Microsoft.Maui.Maps.Handlers.MapElementHandler.MapElementHandler() -> void
+Microsoft.Maui.Maps.Handlers.MapElementHandler.MapElementHandler(Microsoft.Maui.IPropertyMapper? mapper = null) -> void
+Microsoft.Maui.Maps.Handlers.MapElementHandlerUpdate
+Microsoft.Maui.Maps.Handlers.MapElementHandlerUpdate.Index.get -> int
+Microsoft.Maui.Maps.Handlers.MapElementHandlerUpdate.Index.init -> void
+Microsoft.Maui.Maps.Handlers.MapElementHandlerUpdate.MapElement.get -> Microsoft.Maui.Maps.IMapElement!
+Microsoft.Maui.Maps.Handlers.MapElementHandlerUpdate.MapElement.init -> void
+Microsoft.Maui.Maps.Handlers.MapElementHandlerUpdate.MapElementHandlerUpdate(int Index, Microsoft.Maui.Maps.IMapElement! MapElement) -> void
+Microsoft.Maui.Maps.Handlers.MapHandler
+Microsoft.Maui.Maps.Handlers.MapHandler.MapHandler() -> void
+Microsoft.Maui.Maps.Handlers.MapHandler.MapHandler(Microsoft.Maui.IPropertyMapper? mapper = null, Microsoft.Maui.CommandMapper? commandMapper = null) -> void
+Microsoft.Maui.Maps.Handlers.MapHandler.UpdateMapElement(Microsoft.Maui.Maps.IMapElement! element) -> void
+Microsoft.Maui.Maps.Handlers.MapPinHandler
+Microsoft.Maui.Maps.Handlers.MapPinHandler.MapPinHandler() -> void
+Microsoft.Maui.Maps.Handlers.MapPinHandler.MapPinHandler(Microsoft.Maui.IPropertyMapper? mapper = null) -> void
+Microsoft.Maui.Maps.ICircleMapElement
+Microsoft.Maui.Maps.ICircleMapElement.Center.get -> Microsoft.Maui.Devices.Sensors.Location!
+Microsoft.Maui.Maps.ICircleMapElement.Radius.get -> Microsoft.Maui.Maps.Distance
+Microsoft.Maui.Maps.IFilledMapElement
+Microsoft.Maui.Maps.IFilledMapElement.Fill.get -> Microsoft.Maui.Graphics.Paint?
+Microsoft.Maui.Maps.IGeoPathMapElement
+Microsoft.Maui.Maps.IMap
+Microsoft.Maui.Maps.IMap.Clicked(Microsoft.Maui.Devices.Sensors.Location! position) -> void
+Microsoft.Maui.Maps.IMap.Elements.get -> System.Collections.Generic.IList!
+Microsoft.Maui.Maps.IMap.IsScrollEnabled.get -> bool
+Microsoft.Maui.Maps.IMap.IsTrafficEnabled.get -> bool
+Microsoft.Maui.Maps.IMap.IsZoomEnabled.get -> bool
+Microsoft.Maui.Maps.IMap.IsShowingUser.get -> bool
+Microsoft.Maui.Maps.IMap.MapType.get -> Microsoft.Maui.Maps.MapType
+Microsoft.Maui.Maps.IMap.MoveToRegion(Microsoft.Maui.Maps.MapSpan! region) -> void
+Microsoft.Maui.Maps.IMap.Pins.get -> System.Collections.Generic.IList!
+Microsoft.Maui.Maps.IMap.VisibleRegion.get -> Microsoft.Maui.Maps.MapSpan?
+Microsoft.Maui.Maps.IMap.VisibleRegion.set -> void
+Microsoft.Maui.Maps.IMapElement
+Microsoft.Maui.Maps.IMapElement.MapElementId.get -> object?
+Microsoft.Maui.Maps.IMapElement.MapElementId.set -> void
+Microsoft.Maui.Maps.IMapPin
+Microsoft.Maui.Maps.IMapPin.Address.get -> string!
+Microsoft.Maui.Maps.IMapPin.Label.get -> string!
+Microsoft.Maui.Maps.IMapPin.Location.get -> Microsoft.Maui.Devices.Sensors.Location!
+Microsoft.Maui.Maps.IMapPin.MarkerId.get -> object?
+Microsoft.Maui.Maps.IMapPin.MarkerId.set -> void
+Microsoft.Maui.Maps.IMapPin.SendInfoWindowClick() -> bool
+Microsoft.Maui.Maps.IMapPin.SendMarkerClick() -> bool
+Microsoft.Maui.Maps.MapSpan
+Microsoft.Maui.Maps.MapSpan.Center.get -> Microsoft.Maui.Devices.Sensors.Location!
+Microsoft.Maui.Maps.MapSpan.ClampLatitude(double north, double south) -> Microsoft.Maui.Maps.MapSpan!
+Microsoft.Maui.Maps.MapSpan.LatitudeDegrees.get -> double
+Microsoft.Maui.Maps.MapSpan.LongitudeDegrees.get -> double
+Microsoft.Maui.Maps.MapSpan.MapSpan(Microsoft.Maui.Devices.Sensors.Location! center, double latitudeDegrees, double longitudeDegrees) -> void
+Microsoft.Maui.Maps.MapSpan.Radius.get -> Microsoft.Maui.Maps.Distance
+Microsoft.Maui.Maps.MapSpan.WithZoom(double zoomFactor) -> Microsoft.Maui.Maps.MapSpan!
+Microsoft.Maui.Maps.MapType
+Microsoft.Maui.Maps.MapType.Hybrid = 2 -> Microsoft.Maui.Maps.MapType
+Microsoft.Maui.Maps.MapType.Satellite = 1 -> Microsoft.Maui.Maps.MapType
+Microsoft.Maui.Maps.MapType.Street = 0 -> Microsoft.Maui.Maps.MapType
+Microsoft.Maui.Maps.Platform.MauiMKMapView
+Microsoft.Maui.Maps.Platform.MauiMKMapView.MauiMKMapView(Microsoft.Maui.Maps.Handlers.IMapHandler! handler) -> void
+override Microsoft.Maui.Maps.Distance.Equals(object? obj) -> bool
+override Microsoft.Maui.Maps.Distance.GetHashCode() -> int
+override Microsoft.Maui.Maps.Handlers.MapElementHandler.CreatePlatformElement() -> MapKit.MKOverlayRenderer!
+override Microsoft.Maui.Maps.Handlers.MapHandler.ConnectHandler(Microsoft.Maui.Maps.Platform.MauiMKMapView! platformView) -> void
+override Microsoft.Maui.Maps.Handlers.MapHandler.CreatePlatformView() -> Microsoft.Maui.Maps.Platform.MauiMKMapView!
+override Microsoft.Maui.Maps.Handlers.MapHandler.DisconnectHandler(Microsoft.Maui.Maps.Platform.MauiMKMapView! platformView) -> void
+override Microsoft.Maui.Maps.Handlers.MapPinHandler.CreatePlatformElement() -> MapKit.IMKAnnotation!
+override Microsoft.Maui.Maps.MapSpan.Equals(object? obj) -> bool
+override Microsoft.Maui.Maps.MapSpan.GetHashCode() -> int
+override Microsoft.Maui.Maps.MapSpan.ToString() -> string!
+override Microsoft.Maui.Maps.Platform.MauiMKMapView.MovedToWindow() -> void
+static Microsoft.Maui.Maps.Distance.BetweenPositions(Microsoft.Maui.Devices.Sensors.Location! position1, Microsoft.Maui.Devices.Sensors.Location! position2) -> Microsoft.Maui.Maps.Distance
+static Microsoft.Maui.Maps.Distance.FromKilometers(double kilometers) -> Microsoft.Maui.Maps.Distance
+static Microsoft.Maui.Maps.Distance.FromMeters(double meters) -> Microsoft.Maui.Maps.Distance
+static Microsoft.Maui.Maps.Distance.FromMiles(double miles) -> Microsoft.Maui.Maps.Distance
+static Microsoft.Maui.Maps.Distance.operator !=(Microsoft.Maui.Maps.Distance left, Microsoft.Maui.Maps.Distance right) -> bool
+static Microsoft.Maui.Maps.Distance.operator ==(Microsoft.Maui.Maps.Distance left, Microsoft.Maui.Maps.Distance right) -> bool
+static Microsoft.Maui.Maps.GeographyUtils.ToCircumferencePositions(this Microsoft.Maui.Maps.ICircleMapElement! circle) -> System.Collections.Generic.List!
+static Microsoft.Maui.Maps.GeographyUtils.ToDegrees(this double radians) -> double
+static Microsoft.Maui.Maps.GeographyUtils.ToRadians(this double degrees) -> double
+static Microsoft.Maui.Maps.Handlers.MapElementHandler.MapFill(Microsoft.Maui.Maps.Handlers.IMapElementHandler! handler, Microsoft.Maui.Maps.IMapElement! mapElement) -> void
+static Microsoft.Maui.Maps.Handlers.MapElementHandler.Mapper -> Microsoft.Maui.IPropertyMapper!
+static Microsoft.Maui.Maps.Handlers.MapElementHandler.MapStroke(Microsoft.Maui.Maps.Handlers.IMapElementHandler! handler, Microsoft.Maui.Maps.IMapElement! mapElement) -> void
+static Microsoft.Maui.Maps.Handlers.MapElementHandler.MapStrokeThickness(Microsoft.Maui.Maps.Handlers.IMapElementHandler! handler, Microsoft.Maui.Maps.IMapElement! mapElement) -> void
+static Microsoft.Maui.Maps.Handlers.MapHandler.CommandMapper -> Microsoft.Maui.CommandMapper!
+static Microsoft.Maui.Maps.Handlers.MapHandler.MapElements(Microsoft.Maui.Maps.Handlers.IMapHandler! handler, Microsoft.Maui.Maps.IMap! map) -> void
+static Microsoft.Maui.Maps.Handlers.MapHandler.MapIsScrollEnabled(Microsoft.Maui.Maps.Handlers.IMapHandler! handler, Microsoft.Maui.Maps.IMap! map) -> void
+static Microsoft.Maui.Maps.Handlers.MapHandler.MapIsTrafficEnabled(Microsoft.Maui.Maps.Handlers.IMapHandler! handler, Microsoft.Maui.Maps.IMap! map) -> void
+static Microsoft.Maui.Maps.Handlers.MapHandler.MapIsZoomEnabled(Microsoft.Maui.Maps.Handlers.IMapHandler! handler, Microsoft.Maui.Maps.IMap! map) -> void
+static Microsoft.Maui.Maps.Handlers.MapHandler.MapIsShowingUser(Microsoft.Maui.Maps.Handlers.IMapHandler! handler, Microsoft.Maui.Maps.IMap! map) -> void
+static Microsoft.Maui.Maps.Handlers.MapHandler.MapMapType(Microsoft.Maui.Maps.Handlers.IMapHandler! handler, Microsoft.Maui.Maps.IMap! map) -> void
+static Microsoft.Maui.Maps.Handlers.MapHandler.MapMoveToRegion(Microsoft.Maui.Maps.Handlers.IMapHandler! handler, Microsoft.Maui.Maps.IMap! map, object? arg) -> void
+static Microsoft.Maui.Maps.Handlers.MapHandler.Mapper -> Microsoft.Maui.IPropertyMapper!
+static Microsoft.Maui.Maps.Handlers.MapHandler.MapPins(Microsoft.Maui.Maps.Handlers.IMapHandler! handler, Microsoft.Maui.Maps.IMap! map) -> void
+static Microsoft.Maui.Maps.Handlers.MapHandler.MapUpdateMapElement(Microsoft.Maui.Maps.Handlers.IMapHandler! handler, Microsoft.Maui.Maps.IMap! map, object? arg) -> void
+static Microsoft.Maui.Maps.Handlers.MapPinHandler.MapAddress(Microsoft.Maui.Maps.Handlers.IMapPinHandler! handler, Microsoft.Maui.Maps.IMapPin! mapPin) -> void
+static Microsoft.Maui.Maps.Handlers.MapPinHandler.MapLabel(Microsoft.Maui.Maps.Handlers.IMapPinHandler! handler, Microsoft.Maui.Maps.IMapPin! mapPin) -> void
+static Microsoft.Maui.Maps.Handlers.MapPinHandler.MapLocation(Microsoft.Maui.Maps.Handlers.IMapPinHandler! handler, Microsoft.Maui.Maps.IMapPin! mapPin) -> void
+static Microsoft.Maui.Maps.Handlers.MapPinHandler.Mapper -> Microsoft.Maui.IPropertyMapper!
+static Microsoft.Maui.Maps.MapSpan.FromCenterAndRadius(Microsoft.Maui.Devices.Sensors.Location! center, Microsoft.Maui.Maps.Distance radius) -> Microsoft.Maui.Maps.MapSpan!
+static Microsoft.Maui.Maps.MapSpan.operator !=(Microsoft.Maui.Maps.MapSpan? left, Microsoft.Maui.Maps.MapSpan? right) -> bool
+static Microsoft.Maui.Maps.MapSpan.operator ==(Microsoft.Maui.Maps.MapSpan? left, Microsoft.Maui.Maps.MapSpan? right) -> bool
+virtual Microsoft.Maui.Maps.Platform.MauiMKMapView.GetViewForOverlayDelegate(MapKit.MKMapView! mapview, MapKit.IMKOverlay! overlay) -> MapKit.MKOverlayRenderer!
\ No newline at end of file
diff --git a/src/Core/maps/src/PublicAPI/net-tizen/PublicAPI.Shipped.txt b/src/Core/maps/src/PublicAPI/net-tizen/PublicAPI.Shipped.txt
new file mode 100644
index 000000000000..ab058de62d44
--- /dev/null
+++ b/src/Core/maps/src/PublicAPI/net-tizen/PublicAPI.Shipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Core/maps/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt b/src/Core/maps/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
new file mode 100644
index 000000000000..e6e8b77673fc
--- /dev/null
+++ b/src/Core/maps/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
@@ -0,0 +1,115 @@
+#nullable enable
+Microsoft.Maui.Maps.Distance
+Microsoft.Maui.Maps.Distance.Distance() -> void
+Microsoft.Maui.Maps.Distance.Distance(double meters) -> void
+Microsoft.Maui.Maps.Distance.Equals(Microsoft.Maui.Maps.Distance other) -> bool
+Microsoft.Maui.Maps.Distance.Kilometers.get -> double
+Microsoft.Maui.Maps.Distance.Meters.get -> double
+Microsoft.Maui.Maps.Distance.Miles.get -> double
+Microsoft.Maui.Maps.GeographyUtils
+Microsoft.Maui.Maps.Handlers.IMapElementHandler
+Microsoft.Maui.Maps.Handlers.IMapElementHandler.PlatformView.get -> ElmSharp.EvasObject!
+Microsoft.Maui.Maps.Handlers.IMapElementHandler.VirtualView.get -> Microsoft.Maui.Maps.IMapElement!
+Microsoft.Maui.Maps.Handlers.IMapHandler
+Microsoft.Maui.Maps.Handlers.IMapHandler.PlatformView.get -> ElmSharp.EvasObject!
+Microsoft.Maui.Maps.Handlers.IMapHandler.UpdateMapElement(Microsoft.Maui.Maps.IMapElement! element) -> void
+Microsoft.Maui.Maps.Handlers.IMapHandler.VirtualView.get -> Microsoft.Maui.Maps.IMap!
+Microsoft.Maui.Maps.Handlers.IMapPinHandler
+Microsoft.Maui.Maps.Handlers.IMapPinHandler.PlatformView.get -> ElmSharp.EvasObject!
+Microsoft.Maui.Maps.Handlers.IMapPinHandler.VirtualView.get -> Microsoft.Maui.Maps.IMapPin!
+Microsoft.Maui.Maps.Handlers.MapElementHandler
+Microsoft.Maui.Maps.Handlers.MapElementHandler.MapElementHandler() -> void
+Microsoft.Maui.Maps.Handlers.MapElementHandler.MapElementHandler(Microsoft.Maui.IPropertyMapper? mapper = null) -> void
+Microsoft.Maui.Maps.Handlers.MapElementHandlerUpdate
+Microsoft.Maui.Maps.Handlers.MapElementHandlerUpdate.Index.get -> int
+Microsoft.Maui.Maps.Handlers.MapElementHandlerUpdate.Index.init -> void
+Microsoft.Maui.Maps.Handlers.MapElementHandlerUpdate.MapElement.get -> Microsoft.Maui.Maps.IMapElement!
+Microsoft.Maui.Maps.Handlers.MapElementHandlerUpdate.MapElement.init -> void
+Microsoft.Maui.Maps.Handlers.MapElementHandlerUpdate.MapElementHandlerUpdate(int Index, Microsoft.Maui.Maps.IMapElement! MapElement) -> void
+Microsoft.Maui.Maps.Handlers.MapHandler
+Microsoft.Maui.Maps.Handlers.MapHandler.MapHandler() -> void
+Microsoft.Maui.Maps.Handlers.MapHandler.MapHandler(Microsoft.Maui.IPropertyMapper? mapper = null, Microsoft.Maui.CommandMapper? commandMapper = null) -> void
+Microsoft.Maui.Maps.Handlers.MapHandler.UpdateMapElement(Microsoft.Maui.Maps.IMapElement! element) -> void
+Microsoft.Maui.Maps.Handlers.MapPinHandler
+Microsoft.Maui.Maps.Handlers.MapPinHandler.MapPinHandler() -> void
+Microsoft.Maui.Maps.Handlers.MapPinHandler.MapPinHandler(Microsoft.Maui.IPropertyMapper? mapper = null) -> void
+Microsoft.Maui.Maps.ICircleMapElement
+Microsoft.Maui.Maps.ICircleMapElement.Center.get -> Microsoft.Maui.Devices.Sensors.Location!
+Microsoft.Maui.Maps.ICircleMapElement.Radius.get -> Microsoft.Maui.Maps.Distance
+Microsoft.Maui.Maps.IFilledMapElement
+Microsoft.Maui.Maps.IFilledMapElement.Fill.get -> Microsoft.Maui.Graphics.Paint?
+Microsoft.Maui.Maps.IGeoPathMapElement
+Microsoft.Maui.Maps.IMap
+Microsoft.Maui.Maps.IMap.Clicked(Microsoft.Maui.Devices.Sensors.Location! position) -> void
+Microsoft.Maui.Maps.IMap.Elements.get -> System.Collections.Generic.IList!
+Microsoft.Maui.Maps.IMap.IsScrollEnabled.get -> bool
+Microsoft.Maui.Maps.IMap.IsTrafficEnabled.get -> bool
+Microsoft.Maui.Maps.IMap.IsZoomEnabled.get -> bool
+Microsoft.Maui.Maps.IMap.IsShowingUser.get -> bool
+Microsoft.Maui.Maps.IMap.MapType.get -> Microsoft.Maui.Maps.MapType
+Microsoft.Maui.Maps.IMap.MoveToRegion(Microsoft.Maui.Maps.MapSpan! region) -> void
+Microsoft.Maui.Maps.IMap.Pins.get -> System.Collections.Generic.IList!
+Microsoft.Maui.Maps.IMap.VisibleRegion.get -> Microsoft.Maui.Maps.MapSpan?
+Microsoft.Maui.Maps.IMap.VisibleRegion.set -> void
+Microsoft.Maui.Maps.IMapElement
+Microsoft.Maui.Maps.IMapElement.MapElementId.get -> object?
+Microsoft.Maui.Maps.IMapElement.MapElementId.set -> void
+Microsoft.Maui.Maps.IMapPin
+Microsoft.Maui.Maps.IMapPin.Address.get -> string!
+Microsoft.Maui.Maps.IMapPin.Label.get -> string!
+Microsoft.Maui.Maps.IMapPin.Location.get -> Microsoft.Maui.Devices.Sensors.Location!
+Microsoft.Maui.Maps.IMapPin.MarkerId.get -> object?
+Microsoft.Maui.Maps.IMapPin.MarkerId.set -> void
+Microsoft.Maui.Maps.IMapPin.SendInfoWindowClick() -> bool
+Microsoft.Maui.Maps.IMapPin.SendMarkerClick() -> bool
+Microsoft.Maui.Maps.MapSpan
+Microsoft.Maui.Maps.MapSpan.Center.get -> Microsoft.Maui.Devices.Sensors.Location!
+Microsoft.Maui.Maps.MapSpan.ClampLatitude(double north, double south) -> Microsoft.Maui.Maps.MapSpan!
+Microsoft.Maui.Maps.MapSpan.LatitudeDegrees.get -> double
+Microsoft.Maui.Maps.MapSpan.LongitudeDegrees.get -> double
+Microsoft.Maui.Maps.MapSpan.MapSpan(Microsoft.Maui.Devices.Sensors.Location! center, double latitudeDegrees, double longitudeDegrees) -> void
+Microsoft.Maui.Maps.MapSpan.Radius.get -> Microsoft.Maui.Maps.Distance
+Microsoft.Maui.Maps.MapSpan.WithZoom(double zoomFactor) -> Microsoft.Maui.Maps.MapSpan!
+Microsoft.Maui.Maps.MapType
+Microsoft.Maui.Maps.MapType.Hybrid = 2 -> Microsoft.Maui.Maps.MapType
+Microsoft.Maui.Maps.MapType.Satellite = 1 -> Microsoft.Maui.Maps.MapType
+Microsoft.Maui.Maps.MapType.Street = 0 -> Microsoft.Maui.Maps.MapType
+override Microsoft.Maui.Maps.Distance.Equals(object? obj) -> bool
+override Microsoft.Maui.Maps.Distance.GetHashCode() -> int
+override Microsoft.Maui.Maps.Handlers.MapElementHandler.CreatePlatformElement() -> ElmSharp.EvasObject!
+override Microsoft.Maui.Maps.Handlers.MapHandler.CreatePlatformView() -> ElmSharp.EvasObject!
+override Microsoft.Maui.Maps.Handlers.MapPinHandler.CreatePlatformElement() -> ElmSharp.EvasObject!
+override Microsoft.Maui.Maps.MapSpan.Equals(object? obj) -> bool
+override Microsoft.Maui.Maps.MapSpan.GetHashCode() -> int
+override Microsoft.Maui.Maps.MapSpan.ToString() -> string!
+static Microsoft.Maui.Maps.Distance.BetweenPositions(Microsoft.Maui.Devices.Sensors.Location! position1, Microsoft.Maui.Devices.Sensors.Location! position2) -> Microsoft.Maui.Maps.Distance
+static Microsoft.Maui.Maps.Distance.FromKilometers(double kilometers) -> Microsoft.Maui.Maps.Distance
+static Microsoft.Maui.Maps.Distance.FromMeters(double meters) -> Microsoft.Maui.Maps.Distance
+static Microsoft.Maui.Maps.Distance.FromMiles(double miles) -> Microsoft.Maui.Maps.Distance
+static Microsoft.Maui.Maps.Distance.operator !=(Microsoft.Maui.Maps.Distance left, Microsoft.Maui.Maps.Distance right) -> bool
+static Microsoft.Maui.Maps.Distance.operator ==(Microsoft.Maui.Maps.Distance left, Microsoft.Maui.Maps.Distance right) -> bool
+static Microsoft.Maui.Maps.GeographyUtils.ToCircumferencePositions(this Microsoft.Maui.Maps.ICircleMapElement! circle) -> System.Collections.Generic.List!
+static Microsoft.Maui.Maps.GeographyUtils.ToDegrees(this double radians) -> double
+static Microsoft.Maui.Maps.GeographyUtils.ToRadians(this double degrees) -> double
+static Microsoft.Maui.Maps.Handlers.MapElementHandler.MapFill(Microsoft.Maui.Maps.Handlers.IMapElementHandler! handler, Microsoft.Maui.Maps.IMapElement! mapElement) -> void
+static Microsoft.Maui.Maps.Handlers.MapElementHandler.Mapper -> Microsoft.Maui.IPropertyMapper!
+static Microsoft.Maui.Maps.Handlers.MapElementHandler.MapStroke(Microsoft.Maui.Maps.Handlers.IMapElementHandler! handler, Microsoft.Maui.Maps.IMapElement! mapElement) -> void
+static Microsoft.Maui.Maps.Handlers.MapElementHandler.MapStrokeThickness(Microsoft.Maui.Maps.Handlers.IMapElementHandler! handler, Microsoft.Maui.Maps.IMapElement! mapElement) -> void
+static Microsoft.Maui.Maps.Handlers.MapHandler.CommandMapper -> Microsoft.Maui.CommandMapper!
+static Microsoft.Maui.Maps.Handlers.MapHandler.MapElements(Microsoft.Maui.Maps.Handlers.IMapHandler! handler, Microsoft.Maui.Maps.IMap! map) -> void
+static Microsoft.Maui.Maps.Handlers.MapHandler.MapIsScrollEnabled(Microsoft.Maui.Maps.Handlers.IMapHandler! handler, Microsoft.Maui.Maps.IMap! map) -> void
+static Microsoft.Maui.Maps.Handlers.MapHandler.MapIsTrafficEnabled(Microsoft.Maui.Maps.Handlers.IMapHandler! handler, Microsoft.Maui.Maps.IMap! map) -> void
+static Microsoft.Maui.Maps.Handlers.MapHandler.MapIsZoomEnabled(Microsoft.Maui.Maps.Handlers.IMapHandler! handler, Microsoft.Maui.Maps.IMap! map) -> void
+static Microsoft.Maui.Maps.Handlers.MapHandler.MapIsShowingUser(Microsoft.Maui.Maps.Handlers.IMapHandler! handler, Microsoft.Maui.Maps.IMap! map) -> void
+static Microsoft.Maui.Maps.Handlers.MapHandler.MapMapType(Microsoft.Maui.Maps.Handlers.IMapHandler! handler, Microsoft.Maui.Maps.IMap! map) -> void
+static Microsoft.Maui.Maps.Handlers.MapHandler.MapMoveToRegion(Microsoft.Maui.Maps.Handlers.IMapHandler! handler, Microsoft.Maui.Maps.IMap! map, object? arg) -> void
+static Microsoft.Maui.Maps.Handlers.MapHandler.Mapper -> Microsoft.Maui.IPropertyMapper!
+static Microsoft.Maui.Maps.Handlers.MapHandler.MapPins(Microsoft.Maui.Maps.Handlers.IMapHandler! handler, Microsoft.Maui.Maps.IMap! map) -> void
+static Microsoft.Maui.Maps.Handlers.MapHandler.MapUpdateMapElement(Microsoft.Maui.Maps.Handlers.IMapHandler! handler, Microsoft.Maui.Maps.IMap! map, object? arg) -> void
+static Microsoft.Maui.Maps.Handlers.MapPinHandler.MapAddress(Microsoft.Maui.Maps.Handlers.IMapPinHandler! handler, Microsoft.Maui.Maps.IMapPin! mapPin) -> void
+static Microsoft.Maui.Maps.Handlers.MapPinHandler.MapLabel(Microsoft.Maui.Maps.Handlers.IMapPinHandler! handler, Microsoft.Maui.Maps.IMapPin! mapPin) -> void
+static Microsoft.Maui.Maps.Handlers.MapPinHandler.MapLocation(Microsoft.Maui.Maps.Handlers.IMapPinHandler! handler, Microsoft.Maui.Maps.IMapPin! mapPin) -> void
+static Microsoft.Maui.Maps.Handlers.MapPinHandler.Mapper -> Microsoft.Maui.IPropertyMapper!
+static Microsoft.Maui.Maps.MapSpan.FromCenterAndRadius(Microsoft.Maui.Devices.Sensors.Location! center, Microsoft.Maui.Maps.Distance radius) -> Microsoft.Maui.Maps.MapSpan!
+static Microsoft.Maui.Maps.MapSpan.operator !=(Microsoft.Maui.Maps.MapSpan? left, Microsoft.Maui.Maps.MapSpan? right) -> bool
+static Microsoft.Maui.Maps.MapSpan.operator ==(Microsoft.Maui.Maps.MapSpan? left, Microsoft.Maui.Maps.MapSpan? right) -> bool
\ No newline at end of file
diff --git a/src/Core/maps/src/PublicAPI/net-windows/PublicAPI.Shipped.txt b/src/Core/maps/src/PublicAPI/net-windows/PublicAPI.Shipped.txt
new file mode 100644
index 000000000000..ab058de62d44
--- /dev/null
+++ b/src/Core/maps/src/PublicAPI/net-windows/PublicAPI.Shipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Core/maps/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt b/src/Core/maps/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt
new file mode 100644
index 000000000000..fe0ae3f07473
--- /dev/null
+++ b/src/Core/maps/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt
@@ -0,0 +1,115 @@
+#nullable enable
+Microsoft.Maui.Maps.Distance
+Microsoft.Maui.Maps.Distance.Distance() -> void
+Microsoft.Maui.Maps.Distance.Distance(double meters) -> void
+Microsoft.Maui.Maps.Distance.Equals(Microsoft.Maui.Maps.Distance other) -> bool
+Microsoft.Maui.Maps.Distance.Kilometers.get -> double
+Microsoft.Maui.Maps.Distance.Meters.get -> double
+Microsoft.Maui.Maps.Distance.Miles.get -> double
+Microsoft.Maui.Maps.GeographyUtils
+Microsoft.Maui.Maps.Handlers.IMapElementHandler
+Microsoft.Maui.Maps.Handlers.IMapElementHandler.PlatformView.get -> object!
+Microsoft.Maui.Maps.Handlers.IMapElementHandler.VirtualView.get -> Microsoft.Maui.Maps.IMapElement!
+Microsoft.Maui.Maps.Handlers.IMapHandler
+Microsoft.Maui.Maps.Handlers.IMapHandler.PlatformView.get -> Microsoft.UI.Xaml.FrameworkElement!
+Microsoft.Maui.Maps.Handlers.IMapHandler.UpdateMapElement(Microsoft.Maui.Maps.IMapElement! element) -> void
+Microsoft.Maui.Maps.Handlers.IMapHandler.VirtualView.get -> Microsoft.Maui.Maps.IMap!
+Microsoft.Maui.Maps.Handlers.IMapPinHandler
+Microsoft.Maui.Maps.Handlers.IMapPinHandler.PlatformView.get -> object!
+Microsoft.Maui.Maps.Handlers.IMapPinHandler.VirtualView.get -> Microsoft.Maui.Maps.IMapPin!
+Microsoft.Maui.Maps.Handlers.MapElementHandler
+Microsoft.Maui.Maps.Handlers.MapElementHandler.MapElementHandler() -> void
+Microsoft.Maui.Maps.Handlers.MapElementHandler.MapElementHandler(Microsoft.Maui.IPropertyMapper? mapper = null) -> void
+Microsoft.Maui.Maps.Handlers.MapElementHandlerUpdate
+Microsoft.Maui.Maps.Handlers.MapElementHandlerUpdate.Index.get -> int
+Microsoft.Maui.Maps.Handlers.MapElementHandlerUpdate.Index.init -> void
+Microsoft.Maui.Maps.Handlers.MapElementHandlerUpdate.MapElement.get -> Microsoft.Maui.Maps.IMapElement!
+Microsoft.Maui.Maps.Handlers.MapElementHandlerUpdate.MapElement.init -> void
+Microsoft.Maui.Maps.Handlers.MapElementHandlerUpdate.MapElementHandlerUpdate(int Index, Microsoft.Maui.Maps.IMapElement! MapElement) -> void
+Microsoft.Maui.Maps.Handlers.MapHandler
+Microsoft.Maui.Maps.Handlers.MapHandler.MapHandler() -> void
+Microsoft.Maui.Maps.Handlers.MapHandler.MapHandler(Microsoft.Maui.IPropertyMapper? mapper = null, Microsoft.Maui.CommandMapper? commandMapper = null) -> void
+Microsoft.Maui.Maps.Handlers.MapHandler.UpdateMapElement(Microsoft.Maui.Maps.IMapElement! element) -> void
+Microsoft.Maui.Maps.Handlers.MapPinHandler
+Microsoft.Maui.Maps.Handlers.MapPinHandler.MapPinHandler() -> void
+Microsoft.Maui.Maps.Handlers.MapPinHandler.MapPinHandler(Microsoft.Maui.IPropertyMapper? mapper = null) -> void
+Microsoft.Maui.Maps.ICircleMapElement
+Microsoft.Maui.Maps.ICircleMapElement.Center.get -> Microsoft.Maui.Devices.Sensors.Location!
+Microsoft.Maui.Maps.ICircleMapElement.Radius.get -> Microsoft.Maui.Maps.Distance
+Microsoft.Maui.Maps.IFilledMapElement
+Microsoft.Maui.Maps.IFilledMapElement.Fill.get -> Microsoft.Maui.Graphics.Paint?
+Microsoft.Maui.Maps.IGeoPathMapElement
+Microsoft.Maui.Maps.IMap
+Microsoft.Maui.Maps.IMap.Clicked(Microsoft.Maui.Devices.Sensors.Location! position) -> void
+Microsoft.Maui.Maps.IMap.Elements.get -> System.Collections.Generic.IList!
+Microsoft.Maui.Maps.IMap.IsScrollEnabled.get -> bool
+Microsoft.Maui.Maps.IMap.IsTrafficEnabled.get -> bool
+Microsoft.Maui.Maps.IMap.IsZoomEnabled.get -> bool
+Microsoft.Maui.Maps.IMap.IsShowingUser.get -> bool
+Microsoft.Maui.Maps.IMap.MapType.get -> Microsoft.Maui.Maps.MapType
+Microsoft.Maui.Maps.IMap.MoveToRegion(Microsoft.Maui.Maps.MapSpan! region) -> void
+Microsoft.Maui.Maps.IMap.Pins.get -> System.Collections.Generic.IList!
+Microsoft.Maui.Maps.IMap.VisibleRegion.get -> Microsoft.Maui.Maps.MapSpan?
+Microsoft.Maui.Maps.IMap.VisibleRegion.set -> void
+Microsoft.Maui.Maps.IMapElement
+Microsoft.Maui.Maps.IMapElement.MapElementId.get -> object?
+Microsoft.Maui.Maps.IMapElement.MapElementId.set -> void
+Microsoft.Maui.Maps.IMapPin
+Microsoft.Maui.Maps.IMapPin.Address.get -> string!
+Microsoft.Maui.Maps.IMapPin.Label.get -> string!
+Microsoft.Maui.Maps.IMapPin.Location.get -> Microsoft.Maui.Devices.Sensors.Location!
+Microsoft.Maui.Maps.IMapPin.MarkerId.get -> object?
+Microsoft.Maui.Maps.IMapPin.MarkerId.set -> void
+Microsoft.Maui.Maps.IMapPin.SendInfoWindowClick() -> bool
+Microsoft.Maui.Maps.IMapPin.SendMarkerClick() -> bool
+Microsoft.Maui.Maps.MapSpan
+Microsoft.Maui.Maps.MapSpan.Center.get -> Microsoft.Maui.Devices.Sensors.Location!
+Microsoft.Maui.Maps.MapSpan.ClampLatitude(double north, double south) -> Microsoft.Maui.Maps.MapSpan!
+Microsoft.Maui.Maps.MapSpan.LatitudeDegrees.get -> double
+Microsoft.Maui.Maps.MapSpan.LongitudeDegrees.get -> double
+Microsoft.Maui.Maps.MapSpan.MapSpan(Microsoft.Maui.Devices.Sensors.Location! center, double latitudeDegrees, double longitudeDegrees) -> void
+Microsoft.Maui.Maps.MapSpan.Radius.get -> Microsoft.Maui.Maps.Distance
+Microsoft.Maui.Maps.MapSpan.WithZoom(double zoomFactor) -> Microsoft.Maui.Maps.MapSpan!
+Microsoft.Maui.Maps.MapType
+Microsoft.Maui.Maps.MapType.Hybrid = 2 -> Microsoft.Maui.Maps.MapType
+Microsoft.Maui.Maps.MapType.Satellite = 1 -> Microsoft.Maui.Maps.MapType
+Microsoft.Maui.Maps.MapType.Street = 0 -> Microsoft.Maui.Maps.MapType
+override Microsoft.Maui.Maps.Distance.Equals(object? obj) -> bool
+override Microsoft.Maui.Maps.Distance.GetHashCode() -> int
+override Microsoft.Maui.Maps.Handlers.MapElementHandler.CreatePlatformElement() -> object!
+override Microsoft.Maui.Maps.Handlers.MapHandler.CreatePlatformView() -> Microsoft.UI.Xaml.FrameworkElement!
+override Microsoft.Maui.Maps.Handlers.MapPinHandler.CreatePlatformElement() -> object!
+override Microsoft.Maui.Maps.MapSpan.Equals(object? obj) -> bool
+override Microsoft.Maui.Maps.MapSpan.GetHashCode() -> int
+override Microsoft.Maui.Maps.MapSpan.ToString() -> string!
+static Microsoft.Maui.Maps.Distance.BetweenPositions(Microsoft.Maui.Devices.Sensors.Location! position1, Microsoft.Maui.Devices.Sensors.Location! position2) -> Microsoft.Maui.Maps.Distance
+static Microsoft.Maui.Maps.Distance.FromKilometers(double kilometers) -> Microsoft.Maui.Maps.Distance
+static Microsoft.Maui.Maps.Distance.FromMeters(double meters) -> Microsoft.Maui.Maps.Distance
+static Microsoft.Maui.Maps.Distance.FromMiles(double miles) -> Microsoft.Maui.Maps.Distance
+static Microsoft.Maui.Maps.Distance.operator !=(Microsoft.Maui.Maps.Distance left, Microsoft.Maui.Maps.Distance right) -> bool
+static Microsoft.Maui.Maps.Distance.operator ==(Microsoft.Maui.Maps.Distance left, Microsoft.Maui.Maps.Distance right) -> bool
+static Microsoft.Maui.Maps.GeographyUtils.ToCircumferencePositions(this Microsoft.Maui.Maps.ICircleMapElement! circle) -> System.Collections.Generic.List!
+static Microsoft.Maui.Maps.GeographyUtils.ToDegrees(this double radians) -> double
+static Microsoft.Maui.Maps.GeographyUtils.ToRadians(this double degrees) -> double
+static Microsoft.Maui.Maps.Handlers.MapElementHandler.MapFill(Microsoft.Maui.Maps.Handlers.IMapElementHandler! handler, Microsoft.Maui.Maps.IMapElement! mapElement) -> void
+static Microsoft.Maui.Maps.Handlers.MapElementHandler.Mapper -> Microsoft.Maui.IPropertyMapper!
+static Microsoft.Maui.Maps.Handlers.MapElementHandler.MapStroke(Microsoft.Maui.Maps.Handlers.IMapElementHandler! handler, Microsoft.Maui.Maps.IMapElement! mapElement) -> void
+static Microsoft.Maui.Maps.Handlers.MapElementHandler.MapStrokeThickness(Microsoft.Maui.Maps.Handlers.IMapElementHandler! handler, Microsoft.Maui.Maps.IMapElement! mapElement) -> void
+static Microsoft.Maui.Maps.Handlers.MapHandler.CommandMapper -> Microsoft.Maui.CommandMapper!
+static Microsoft.Maui.Maps.Handlers.MapHandler.MapElements(Microsoft.Maui.Maps.Handlers.IMapHandler! handler, Microsoft.Maui.Maps.IMap! map) -> void
+static Microsoft.Maui.Maps.Handlers.MapHandler.MapIsScrollEnabled(Microsoft.Maui.Maps.Handlers.IMapHandler! handler, Microsoft.Maui.Maps.IMap! map) -> void
+static Microsoft.Maui.Maps.Handlers.MapHandler.MapIsTrafficEnabled(Microsoft.Maui.Maps.Handlers.IMapHandler! handler, Microsoft.Maui.Maps.IMap! map) -> void
+static Microsoft.Maui.Maps.Handlers.MapHandler.MapIsZoomEnabled(Microsoft.Maui.Maps.Handlers.IMapHandler! handler, Microsoft.Maui.Maps.IMap! map) -> void
+static Microsoft.Maui.Maps.Handlers.MapHandler.MapIsShowingUser(Microsoft.Maui.Maps.Handlers.IMapHandler! handler, Microsoft.Maui.Maps.IMap! map) -> void
+static Microsoft.Maui.Maps.Handlers.MapHandler.MapMapType(Microsoft.Maui.Maps.Handlers.IMapHandler! handler, Microsoft.Maui.Maps.IMap! map) -> void
+static Microsoft.Maui.Maps.Handlers.MapHandler.MapMoveToRegion(Microsoft.Maui.Maps.Handlers.IMapHandler! handler, Microsoft.Maui.Maps.IMap! map, object? arg) -> void
+static Microsoft.Maui.Maps.Handlers.MapHandler.Mapper -> Microsoft.Maui.IPropertyMapper!
+static Microsoft.Maui.Maps.Handlers.MapHandler.MapPins(Microsoft.Maui.Maps.Handlers.IMapHandler! handler, Microsoft.Maui.Maps.IMap! map) -> void
+static Microsoft.Maui.Maps.Handlers.MapHandler.MapUpdateMapElement(Microsoft.Maui.Maps.Handlers.IMapHandler! handler, Microsoft.Maui.Maps.IMap! map, object? arg) -> void
+static Microsoft.Maui.Maps.Handlers.MapPinHandler.MapAddress(Microsoft.Maui.Maps.Handlers.IMapPinHandler! handler, Microsoft.Maui.Maps.IMapPin! mapPin) -> void
+static Microsoft.Maui.Maps.Handlers.MapPinHandler.MapLabel(Microsoft.Maui.Maps.Handlers.IMapPinHandler! handler, Microsoft.Maui.Maps.IMapPin! mapPin) -> void
+static Microsoft.Maui.Maps.Handlers.MapPinHandler.MapLocation(Microsoft.Maui.Maps.Handlers.IMapPinHandler! handler, Microsoft.Maui.Maps.IMapPin! mapPin) -> void
+static Microsoft.Maui.Maps.Handlers.MapPinHandler.Mapper -> Microsoft.Maui.IPropertyMapper!
+static Microsoft.Maui.Maps.MapSpan.FromCenterAndRadius(Microsoft.Maui.Devices.Sensors.Location! center, Microsoft.Maui.Maps.Distance radius) -> Microsoft.Maui.Maps.MapSpan!
+static Microsoft.Maui.Maps.MapSpan.operator !=(Microsoft.Maui.Maps.MapSpan? left, Microsoft.Maui.Maps.MapSpan? right) -> bool
+static Microsoft.Maui.Maps.MapSpan.operator ==(Microsoft.Maui.Maps.MapSpan? left, Microsoft.Maui.Maps.MapSpan? right) -> bool
\ No newline at end of file
diff --git a/src/Core/maps/src/PublicAPI/net/PublicAPI.Shipped.txt b/src/Core/maps/src/PublicAPI/net/PublicAPI.Shipped.txt
new file mode 100644
index 000000000000..ab058de62d44
--- /dev/null
+++ b/src/Core/maps/src/PublicAPI/net/PublicAPI.Shipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Core/maps/src/PublicAPI/net/PublicAPI.Unshipped.txt b/src/Core/maps/src/PublicAPI/net/PublicAPI.Unshipped.txt
new file mode 100644
index 000000000000..84371d053723
--- /dev/null
+++ b/src/Core/maps/src/PublicAPI/net/PublicAPI.Unshipped.txt
@@ -0,0 +1,115 @@
+#nullable enable
+Microsoft.Maui.Maps.Distance
+Microsoft.Maui.Maps.Distance.Distance() -> void
+Microsoft.Maui.Maps.Distance.Distance(double meters) -> void
+Microsoft.Maui.Maps.Distance.Equals(Microsoft.Maui.Maps.Distance other) -> bool
+Microsoft.Maui.Maps.Distance.Kilometers.get -> double
+Microsoft.Maui.Maps.Distance.Meters.get -> double
+Microsoft.Maui.Maps.Distance.Miles.get -> double
+Microsoft.Maui.Maps.GeographyUtils
+Microsoft.Maui.Maps.Handlers.IMapElementHandler
+Microsoft.Maui.Maps.Handlers.IMapElementHandler.PlatformView.get -> object!
+Microsoft.Maui.Maps.Handlers.IMapElementHandler.VirtualView.get -> Microsoft.Maui.Maps.IMapElement!
+Microsoft.Maui.Maps.Handlers.IMapHandler
+Microsoft.Maui.Maps.Handlers.IMapHandler.PlatformView.get -> object!
+Microsoft.Maui.Maps.Handlers.IMapHandler.UpdateMapElement(Microsoft.Maui.Maps.IMapElement! element) -> void
+Microsoft.Maui.Maps.Handlers.IMapHandler.VirtualView.get -> Microsoft.Maui.Maps.IMap!
+Microsoft.Maui.Maps.Handlers.IMapPinHandler
+Microsoft.Maui.Maps.Handlers.IMapPinHandler.PlatformView.get -> object!
+Microsoft.Maui.Maps.Handlers.IMapPinHandler.VirtualView.get -> Microsoft.Maui.Maps.IMapPin!
+Microsoft.Maui.Maps.Handlers.MapElementHandler
+Microsoft.Maui.Maps.Handlers.MapElementHandler.MapElementHandler() -> void
+Microsoft.Maui.Maps.Handlers.MapElementHandler.MapElementHandler(Microsoft.Maui.IPropertyMapper? mapper = null) -> void
+Microsoft.Maui.Maps.Handlers.MapElementHandlerUpdate
+Microsoft.Maui.Maps.Handlers.MapElementHandlerUpdate.Index.get -> int
+Microsoft.Maui.Maps.Handlers.MapElementHandlerUpdate.Index.init -> void
+Microsoft.Maui.Maps.Handlers.MapElementHandlerUpdate.MapElement.get -> Microsoft.Maui.Maps.IMapElement!
+Microsoft.Maui.Maps.Handlers.MapElementHandlerUpdate.MapElement.init -> void
+Microsoft.Maui.Maps.Handlers.MapElementHandlerUpdate.MapElementHandlerUpdate(int Index, Microsoft.Maui.Maps.IMapElement! MapElement) -> void
+Microsoft.Maui.Maps.Handlers.MapHandler
+Microsoft.Maui.Maps.Handlers.MapHandler.MapHandler() -> void
+Microsoft.Maui.Maps.Handlers.MapHandler.MapHandler(Microsoft.Maui.IPropertyMapper? mapper = null, Microsoft.Maui.CommandMapper? commandMapper = null) -> void
+Microsoft.Maui.Maps.Handlers.MapHandler.UpdateMapElement(Microsoft.Maui.Maps.IMapElement! element) -> void
+Microsoft.Maui.Maps.Handlers.MapPinHandler
+Microsoft.Maui.Maps.Handlers.MapPinHandler.MapPinHandler() -> void
+Microsoft.Maui.Maps.Handlers.MapPinHandler.MapPinHandler(Microsoft.Maui.IPropertyMapper? mapper = null) -> void
+Microsoft.Maui.Maps.ICircleMapElement
+Microsoft.Maui.Maps.ICircleMapElement.Center.get -> Microsoft.Maui.Devices.Sensors.Location!
+Microsoft.Maui.Maps.ICircleMapElement.Radius.get -> Microsoft.Maui.Maps.Distance
+Microsoft.Maui.Maps.IFilledMapElement
+Microsoft.Maui.Maps.IFilledMapElement.Fill.get -> Microsoft.Maui.Graphics.Paint?
+Microsoft.Maui.Maps.IGeoPathMapElement
+Microsoft.Maui.Maps.IMap
+Microsoft.Maui.Maps.IMap.Clicked(Microsoft.Maui.Devices.Sensors.Location! position) -> void
+Microsoft.Maui.Maps.IMap.Elements.get -> System.Collections.Generic.IList!
+Microsoft.Maui.Maps.IMap.IsScrollEnabled.get -> bool
+Microsoft.Maui.Maps.IMap.IsTrafficEnabled.get -> bool
+Microsoft.Maui.Maps.IMap.IsZoomEnabled.get -> bool
+Microsoft.Maui.Maps.IMap.IsShowingUser.get -> bool
+Microsoft.Maui.Maps.IMap.MapType.get -> Microsoft.Maui.Maps.MapType
+Microsoft.Maui.Maps.IMap.MoveToRegion(Microsoft.Maui.Maps.MapSpan! region) -> void
+Microsoft.Maui.Maps.IMap.Pins.get -> System.Collections.Generic.IList!
+Microsoft.Maui.Maps.IMap.VisibleRegion.get -> Microsoft.Maui.Maps.MapSpan?
+Microsoft.Maui.Maps.IMap.VisibleRegion.set -> void
+Microsoft.Maui.Maps.IMapElement
+Microsoft.Maui.Maps.IMapElement.MapElementId.get -> object?
+Microsoft.Maui.Maps.IMapElement.MapElementId.set -> void
+Microsoft.Maui.Maps.IMapPin
+Microsoft.Maui.Maps.IMapPin.Address.get -> string!
+Microsoft.Maui.Maps.IMapPin.Label.get -> string!
+Microsoft.Maui.Maps.IMapPin.Location.get -> Microsoft.Maui.Devices.Sensors.Location!
+Microsoft.Maui.Maps.IMapPin.MarkerId.get -> object?
+Microsoft.Maui.Maps.IMapPin.MarkerId.set -> void
+Microsoft.Maui.Maps.IMapPin.SendInfoWindowClick() -> bool
+Microsoft.Maui.Maps.IMapPin.SendMarkerClick() -> bool
+Microsoft.Maui.Maps.MapSpan
+Microsoft.Maui.Maps.MapSpan.Center.get -> Microsoft.Maui.Devices.Sensors.Location!
+Microsoft.Maui.Maps.MapSpan.ClampLatitude(double north, double south) -> Microsoft.Maui.Maps.MapSpan!
+Microsoft.Maui.Maps.MapSpan.LatitudeDegrees.get -> double
+Microsoft.Maui.Maps.MapSpan.LongitudeDegrees.get -> double
+Microsoft.Maui.Maps.MapSpan.MapSpan(Microsoft.Maui.Devices.Sensors.Location! center, double latitudeDegrees, double longitudeDegrees) -> void
+Microsoft.Maui.Maps.MapSpan.Radius.get -> Microsoft.Maui.Maps.Distance
+Microsoft.Maui.Maps.MapSpan.WithZoom(double zoomFactor) -> Microsoft.Maui.Maps.MapSpan!
+Microsoft.Maui.Maps.MapType
+Microsoft.Maui.Maps.MapType.Hybrid = 2 -> Microsoft.Maui.Maps.MapType
+Microsoft.Maui.Maps.MapType.Satellite = 1 -> Microsoft.Maui.Maps.MapType
+Microsoft.Maui.Maps.MapType.Street = 0 -> Microsoft.Maui.Maps.MapType
+override Microsoft.Maui.Maps.Distance.Equals(object? obj) -> bool
+override Microsoft.Maui.Maps.Distance.GetHashCode() -> int
+override Microsoft.Maui.Maps.Handlers.MapElementHandler.CreatePlatformElement() -> object!
+override Microsoft.Maui.Maps.Handlers.MapHandler.CreatePlatformView() -> object!
+override Microsoft.Maui.Maps.Handlers.MapPinHandler.CreatePlatformElement() -> object!
+override Microsoft.Maui.Maps.MapSpan.Equals(object? obj) -> bool
+override Microsoft.Maui.Maps.MapSpan.GetHashCode() -> int
+override Microsoft.Maui.Maps.MapSpan.ToString() -> string!
+static Microsoft.Maui.Maps.Distance.BetweenPositions(Microsoft.Maui.Devices.Sensors.Location! position1, Microsoft.Maui.Devices.Sensors.Location! position2) -> Microsoft.Maui.Maps.Distance
+static Microsoft.Maui.Maps.Distance.FromKilometers(double kilometers) -> Microsoft.Maui.Maps.Distance
+static Microsoft.Maui.Maps.Distance.FromMeters(double meters) -> Microsoft.Maui.Maps.Distance
+static Microsoft.Maui.Maps.Distance.FromMiles(double miles) -> Microsoft.Maui.Maps.Distance
+static Microsoft.Maui.Maps.Distance.operator !=(Microsoft.Maui.Maps.Distance left, Microsoft.Maui.Maps.Distance right) -> bool
+static Microsoft.Maui.Maps.Distance.operator ==(Microsoft.Maui.Maps.Distance left, Microsoft.Maui.Maps.Distance right) -> bool
+static Microsoft.Maui.Maps.GeographyUtils.ToCircumferencePositions(this Microsoft.Maui.Maps.ICircleMapElement! circle) -> System.Collections.Generic.List!
+static Microsoft.Maui.Maps.GeographyUtils.ToDegrees(this double radians) -> double
+static Microsoft.Maui.Maps.GeographyUtils.ToRadians(this double degrees) -> double
+static Microsoft.Maui.Maps.Handlers.MapElementHandler.MapFill(Microsoft.Maui.Maps.Handlers.IMapElementHandler! handler, Microsoft.Maui.Maps.IMapElement! mapElement) -> void
+static Microsoft.Maui.Maps.Handlers.MapElementHandler.Mapper -> Microsoft.Maui.IPropertyMapper!
+static Microsoft.Maui.Maps.Handlers.MapElementHandler.MapStroke(Microsoft.Maui.Maps.Handlers.IMapElementHandler! handler, Microsoft.Maui.Maps.IMapElement! mapElement) -> void
+static Microsoft.Maui.Maps.Handlers.MapElementHandler.MapStrokeThickness(Microsoft.Maui.Maps.Handlers.IMapElementHandler! handler, Microsoft.Maui.Maps.IMapElement! mapElement) -> void
+static Microsoft.Maui.Maps.Handlers.MapHandler.CommandMapper -> Microsoft.Maui.CommandMapper!
+static Microsoft.Maui.Maps.Handlers.MapHandler.MapElements(Microsoft.Maui.Maps.Handlers.IMapHandler! handler, Microsoft.Maui.Maps.IMap! map) -> void
+static Microsoft.Maui.Maps.Handlers.MapHandler.MapIsScrollEnabled(Microsoft.Maui.Maps.Handlers.IMapHandler! handler, Microsoft.Maui.Maps.IMap! map) -> void
+static Microsoft.Maui.Maps.Handlers.MapHandler.MapIsTrafficEnabled(Microsoft.Maui.Maps.Handlers.IMapHandler! handler, Microsoft.Maui.Maps.IMap! map) -> void
+static Microsoft.Maui.Maps.Handlers.MapHandler.MapIsZoomEnabled(Microsoft.Maui.Maps.Handlers.IMapHandler! handler, Microsoft.Maui.Maps.IMap! map) -> void
+static Microsoft.Maui.Maps.Handlers.MapHandler.MapIsShowingUser(Microsoft.Maui.Maps.Handlers.IMapHandler! handler, Microsoft.Maui.Maps.IMap! map) -> void
+static Microsoft.Maui.Maps.Handlers.MapHandler.MapMapType(Microsoft.Maui.Maps.Handlers.IMapHandler! handler, Microsoft.Maui.Maps.IMap! map) -> void
+static Microsoft.Maui.Maps.Handlers.MapHandler.MapMoveToRegion(Microsoft.Maui.Maps.Handlers.IMapHandler! handler, Microsoft.Maui.Maps.IMap! map, object? arg) -> void
+static Microsoft.Maui.Maps.Handlers.MapHandler.Mapper -> Microsoft.Maui.IPropertyMapper!
+static Microsoft.Maui.Maps.Handlers.MapHandler.MapPins(Microsoft.Maui.Maps.Handlers.IMapHandler! handler, Microsoft.Maui.Maps.IMap! map) -> void
+static Microsoft.Maui.Maps.Handlers.MapHandler.MapUpdateMapElement(Microsoft.Maui.Maps.Handlers.IMapHandler! handler, Microsoft.Maui.Maps.IMap! map, object? arg) -> void
+static Microsoft.Maui.Maps.Handlers.MapPinHandler.MapAddress(Microsoft.Maui.Maps.Handlers.IMapPinHandler! handler, Microsoft.Maui.Maps.IMapPin! mapPin) -> void
+static Microsoft.Maui.Maps.Handlers.MapPinHandler.MapLabel(Microsoft.Maui.Maps.Handlers.IMapPinHandler! handler, Microsoft.Maui.Maps.IMapPin! mapPin) -> void
+static Microsoft.Maui.Maps.Handlers.MapPinHandler.MapLocation(Microsoft.Maui.Maps.Handlers.IMapPinHandler! handler, Microsoft.Maui.Maps.IMapPin! mapPin) -> void
+static Microsoft.Maui.Maps.Handlers.MapPinHandler.Mapper -> Microsoft.Maui.IPropertyMapper!
+static Microsoft.Maui.Maps.MapSpan.FromCenterAndRadius(Microsoft.Maui.Devices.Sensors.Location! center, Microsoft.Maui.Maps.Distance radius) -> Microsoft.Maui.Maps.MapSpan!
+static Microsoft.Maui.Maps.MapSpan.operator !=(Microsoft.Maui.Maps.MapSpan? left, Microsoft.Maui.Maps.MapSpan? right) -> bool
+static Microsoft.Maui.Maps.MapSpan.operator ==(Microsoft.Maui.Maps.MapSpan? left, Microsoft.Maui.Maps.MapSpan? right) -> bool
\ No newline at end of file
diff --git a/src/Core/maps/src/PublicAPI/netstandard/PublicAPI.Shipped.txt b/src/Core/maps/src/PublicAPI/netstandard/PublicAPI.Shipped.txt
new file mode 100644
index 000000000000..ab058de62d44
--- /dev/null
+++ b/src/Core/maps/src/PublicAPI/netstandard/PublicAPI.Shipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Core/maps/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt b/src/Core/maps/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt
new file mode 100644
index 000000000000..84371d053723
--- /dev/null
+++ b/src/Core/maps/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt
@@ -0,0 +1,115 @@
+#nullable enable
+Microsoft.Maui.Maps.Distance
+Microsoft.Maui.Maps.Distance.Distance() -> void
+Microsoft.Maui.Maps.Distance.Distance(double meters) -> void
+Microsoft.Maui.Maps.Distance.Equals(Microsoft.Maui.Maps.Distance other) -> bool
+Microsoft.Maui.Maps.Distance.Kilometers.get -> double
+Microsoft.Maui.Maps.Distance.Meters.get -> double
+Microsoft.Maui.Maps.Distance.Miles.get -> double
+Microsoft.Maui.Maps.GeographyUtils
+Microsoft.Maui.Maps.Handlers.IMapElementHandler
+Microsoft.Maui.Maps.Handlers.IMapElementHandler.PlatformView.get -> object!
+Microsoft.Maui.Maps.Handlers.IMapElementHandler.VirtualView.get -> Microsoft.Maui.Maps.IMapElement!
+Microsoft.Maui.Maps.Handlers.IMapHandler
+Microsoft.Maui.Maps.Handlers.IMapHandler.PlatformView.get -> object!
+Microsoft.Maui.Maps.Handlers.IMapHandler.UpdateMapElement(Microsoft.Maui.Maps.IMapElement! element) -> void
+Microsoft.Maui.Maps.Handlers.IMapHandler.VirtualView.get -> Microsoft.Maui.Maps.IMap!
+Microsoft.Maui.Maps.Handlers.IMapPinHandler
+Microsoft.Maui.Maps.Handlers.IMapPinHandler.PlatformView.get -> object!
+Microsoft.Maui.Maps.Handlers.IMapPinHandler.VirtualView.get -> Microsoft.Maui.Maps.IMapPin!
+Microsoft.Maui.Maps.Handlers.MapElementHandler
+Microsoft.Maui.Maps.Handlers.MapElementHandler.MapElementHandler() -> void
+Microsoft.Maui.Maps.Handlers.MapElementHandler.MapElementHandler(Microsoft.Maui.IPropertyMapper? mapper = null) -> void
+Microsoft.Maui.Maps.Handlers.MapElementHandlerUpdate
+Microsoft.Maui.Maps.Handlers.MapElementHandlerUpdate.Index.get -> int
+Microsoft.Maui.Maps.Handlers.MapElementHandlerUpdate.Index.init -> void
+Microsoft.Maui.Maps.Handlers.MapElementHandlerUpdate.MapElement.get -> Microsoft.Maui.Maps.IMapElement!
+Microsoft.Maui.Maps.Handlers.MapElementHandlerUpdate.MapElement.init -> void
+Microsoft.Maui.Maps.Handlers.MapElementHandlerUpdate.MapElementHandlerUpdate(int Index, Microsoft.Maui.Maps.IMapElement! MapElement) -> void
+Microsoft.Maui.Maps.Handlers.MapHandler
+Microsoft.Maui.Maps.Handlers.MapHandler.MapHandler() -> void
+Microsoft.Maui.Maps.Handlers.MapHandler.MapHandler(Microsoft.Maui.IPropertyMapper? mapper = null, Microsoft.Maui.CommandMapper? commandMapper = null) -> void
+Microsoft.Maui.Maps.Handlers.MapHandler.UpdateMapElement(Microsoft.Maui.Maps.IMapElement! element) -> void
+Microsoft.Maui.Maps.Handlers.MapPinHandler
+Microsoft.Maui.Maps.Handlers.MapPinHandler.MapPinHandler() -> void
+Microsoft.Maui.Maps.Handlers.MapPinHandler.MapPinHandler(Microsoft.Maui.IPropertyMapper? mapper = null) -> void
+Microsoft.Maui.Maps.ICircleMapElement
+Microsoft.Maui.Maps.ICircleMapElement.Center.get -> Microsoft.Maui.Devices.Sensors.Location!
+Microsoft.Maui.Maps.ICircleMapElement.Radius.get -> Microsoft.Maui.Maps.Distance
+Microsoft.Maui.Maps.IFilledMapElement
+Microsoft.Maui.Maps.IFilledMapElement.Fill.get -> Microsoft.Maui.Graphics.Paint?
+Microsoft.Maui.Maps.IGeoPathMapElement
+Microsoft.Maui.Maps.IMap
+Microsoft.Maui.Maps.IMap.Clicked(Microsoft.Maui.Devices.Sensors.Location! position) -> void
+Microsoft.Maui.Maps.IMap.Elements.get -> System.Collections.Generic.IList!
+Microsoft.Maui.Maps.IMap.IsScrollEnabled.get -> bool
+Microsoft.Maui.Maps.IMap.IsTrafficEnabled.get -> bool
+Microsoft.Maui.Maps.IMap.IsZoomEnabled.get -> bool
+Microsoft.Maui.Maps.IMap.IsShowingUser.get -> bool
+Microsoft.Maui.Maps.IMap.MapType.get -> Microsoft.Maui.Maps.MapType
+Microsoft.Maui.Maps.IMap.MoveToRegion(Microsoft.Maui.Maps.MapSpan! region) -> void
+Microsoft.Maui.Maps.IMap.Pins.get -> System.Collections.Generic.IList!
+Microsoft.Maui.Maps.IMap.VisibleRegion.get -> Microsoft.Maui.Maps.MapSpan?
+Microsoft.Maui.Maps.IMap.VisibleRegion.set -> void
+Microsoft.Maui.Maps.IMapElement
+Microsoft.Maui.Maps.IMapElement.MapElementId.get -> object?
+Microsoft.Maui.Maps.IMapElement.MapElementId.set -> void
+Microsoft.Maui.Maps.IMapPin
+Microsoft.Maui.Maps.IMapPin.Address.get -> string!
+Microsoft.Maui.Maps.IMapPin.Label.get -> string!
+Microsoft.Maui.Maps.IMapPin.Location.get -> Microsoft.Maui.Devices.Sensors.Location!
+Microsoft.Maui.Maps.IMapPin.MarkerId.get -> object?
+Microsoft.Maui.Maps.IMapPin.MarkerId.set -> void
+Microsoft.Maui.Maps.IMapPin.SendInfoWindowClick() -> bool
+Microsoft.Maui.Maps.IMapPin.SendMarkerClick() -> bool
+Microsoft.Maui.Maps.MapSpan
+Microsoft.Maui.Maps.MapSpan.Center.get -> Microsoft.Maui.Devices.Sensors.Location!
+Microsoft.Maui.Maps.MapSpan.ClampLatitude(double north, double south) -> Microsoft.Maui.Maps.MapSpan!
+Microsoft.Maui.Maps.MapSpan.LatitudeDegrees.get -> double
+Microsoft.Maui.Maps.MapSpan.LongitudeDegrees.get -> double
+Microsoft.Maui.Maps.MapSpan.MapSpan(Microsoft.Maui.Devices.Sensors.Location! center, double latitudeDegrees, double longitudeDegrees) -> void
+Microsoft.Maui.Maps.MapSpan.Radius.get -> Microsoft.Maui.Maps.Distance
+Microsoft.Maui.Maps.MapSpan.WithZoom(double zoomFactor) -> Microsoft.Maui.Maps.MapSpan!
+Microsoft.Maui.Maps.MapType
+Microsoft.Maui.Maps.MapType.Hybrid = 2 -> Microsoft.Maui.Maps.MapType
+Microsoft.Maui.Maps.MapType.Satellite = 1 -> Microsoft.Maui.Maps.MapType
+Microsoft.Maui.Maps.MapType.Street = 0 -> Microsoft.Maui.Maps.MapType
+override Microsoft.Maui.Maps.Distance.Equals(object? obj) -> bool
+override Microsoft.Maui.Maps.Distance.GetHashCode() -> int
+override Microsoft.Maui.Maps.Handlers.MapElementHandler.CreatePlatformElement() -> object!
+override Microsoft.Maui.Maps.Handlers.MapHandler.CreatePlatformView() -> object!
+override Microsoft.Maui.Maps.Handlers.MapPinHandler.CreatePlatformElement() -> object!
+override Microsoft.Maui.Maps.MapSpan.Equals(object? obj) -> bool
+override Microsoft.Maui.Maps.MapSpan.GetHashCode() -> int
+override Microsoft.Maui.Maps.MapSpan.ToString() -> string!
+static Microsoft.Maui.Maps.Distance.BetweenPositions(Microsoft.Maui.Devices.Sensors.Location! position1, Microsoft.Maui.Devices.Sensors.Location! position2) -> Microsoft.Maui.Maps.Distance
+static Microsoft.Maui.Maps.Distance.FromKilometers(double kilometers) -> Microsoft.Maui.Maps.Distance
+static Microsoft.Maui.Maps.Distance.FromMeters(double meters) -> Microsoft.Maui.Maps.Distance
+static Microsoft.Maui.Maps.Distance.FromMiles(double miles) -> Microsoft.Maui.Maps.Distance
+static Microsoft.Maui.Maps.Distance.operator !=(Microsoft.Maui.Maps.Distance left, Microsoft.Maui.Maps.Distance right) -> bool
+static Microsoft.Maui.Maps.Distance.operator ==(Microsoft.Maui.Maps.Distance left, Microsoft.Maui.Maps.Distance right) -> bool
+static Microsoft.Maui.Maps.GeographyUtils.ToCircumferencePositions(this Microsoft.Maui.Maps.ICircleMapElement! circle) -> System.Collections.Generic.List!
+static Microsoft.Maui.Maps.GeographyUtils.ToDegrees(this double radians) -> double
+static Microsoft.Maui.Maps.GeographyUtils.ToRadians(this double degrees) -> double
+static Microsoft.Maui.Maps.Handlers.MapElementHandler.MapFill(Microsoft.Maui.Maps.Handlers.IMapElementHandler! handler, Microsoft.Maui.Maps.IMapElement! mapElement) -> void
+static Microsoft.Maui.Maps.Handlers.MapElementHandler.Mapper -> Microsoft.Maui.IPropertyMapper!
+static Microsoft.Maui.Maps.Handlers.MapElementHandler.MapStroke(Microsoft.Maui.Maps.Handlers.IMapElementHandler! handler, Microsoft.Maui.Maps.IMapElement! mapElement) -> void
+static Microsoft.Maui.Maps.Handlers.MapElementHandler.MapStrokeThickness(Microsoft.Maui.Maps.Handlers.IMapElementHandler! handler, Microsoft.Maui.Maps.IMapElement! mapElement) -> void
+static Microsoft.Maui.Maps.Handlers.MapHandler.CommandMapper -> Microsoft.Maui.CommandMapper!
+static Microsoft.Maui.Maps.Handlers.MapHandler.MapElements(Microsoft.Maui.Maps.Handlers.IMapHandler! handler, Microsoft.Maui.Maps.IMap! map) -> void
+static Microsoft.Maui.Maps.Handlers.MapHandler.MapIsScrollEnabled(Microsoft.Maui.Maps.Handlers.IMapHandler! handler, Microsoft.Maui.Maps.IMap! map) -> void
+static Microsoft.Maui.Maps.Handlers.MapHandler.MapIsTrafficEnabled(Microsoft.Maui.Maps.Handlers.IMapHandler! handler, Microsoft.Maui.Maps.IMap! map) -> void
+static Microsoft.Maui.Maps.Handlers.MapHandler.MapIsZoomEnabled(Microsoft.Maui.Maps.Handlers.IMapHandler! handler, Microsoft.Maui.Maps.IMap! map) -> void
+static Microsoft.Maui.Maps.Handlers.MapHandler.MapIsShowingUser(Microsoft.Maui.Maps.Handlers.IMapHandler! handler, Microsoft.Maui.Maps.IMap! map) -> void
+static Microsoft.Maui.Maps.Handlers.MapHandler.MapMapType(Microsoft.Maui.Maps.Handlers.IMapHandler! handler, Microsoft.Maui.Maps.IMap! map) -> void
+static Microsoft.Maui.Maps.Handlers.MapHandler.MapMoveToRegion(Microsoft.Maui.Maps.Handlers.IMapHandler! handler, Microsoft.Maui.Maps.IMap! map, object? arg) -> void
+static Microsoft.Maui.Maps.Handlers.MapHandler.Mapper -> Microsoft.Maui.IPropertyMapper!
+static Microsoft.Maui.Maps.Handlers.MapHandler.MapPins(Microsoft.Maui.Maps.Handlers.IMapHandler! handler, Microsoft.Maui.Maps.IMap! map) -> void
+static Microsoft.Maui.Maps.Handlers.MapHandler.MapUpdateMapElement(Microsoft.Maui.Maps.Handlers.IMapHandler! handler, Microsoft.Maui.Maps.IMap! map, object? arg) -> void
+static Microsoft.Maui.Maps.Handlers.MapPinHandler.MapAddress(Microsoft.Maui.Maps.Handlers.IMapPinHandler! handler, Microsoft.Maui.Maps.IMapPin! mapPin) -> void
+static Microsoft.Maui.Maps.Handlers.MapPinHandler.MapLabel(Microsoft.Maui.Maps.Handlers.IMapPinHandler! handler, Microsoft.Maui.Maps.IMapPin! mapPin) -> void
+static Microsoft.Maui.Maps.Handlers.MapPinHandler.MapLocation(Microsoft.Maui.Maps.Handlers.IMapPinHandler! handler, Microsoft.Maui.Maps.IMapPin! mapPin) -> void
+static Microsoft.Maui.Maps.Handlers.MapPinHandler.Mapper -> Microsoft.Maui.IPropertyMapper!
+static Microsoft.Maui.Maps.MapSpan.FromCenterAndRadius(Microsoft.Maui.Devices.Sensors.Location! center, Microsoft.Maui.Maps.Distance radius) -> Microsoft.Maui.Maps.MapSpan!
+static Microsoft.Maui.Maps.MapSpan.operator !=(Microsoft.Maui.Maps.MapSpan? left, Microsoft.Maui.Maps.MapSpan? right) -> bool
+static Microsoft.Maui.Maps.MapSpan.operator ==(Microsoft.Maui.Maps.MapSpan? left, Microsoft.Maui.Maps.MapSpan? right) -> bool
\ No newline at end of file
diff --git a/src/Essentials/src/PublicAPI/net-android/PublicAPI.Unshipped.txt b/src/Essentials/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
index ab058de62d44..47042d23f092 100644
--- a/src/Essentials/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
+++ b/src/Essentials/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
@@ -1 +1,5 @@
#nullable enable
+override Microsoft.Maui.Devices.Sensors.Location.GetHashCode() -> int
+~override Microsoft.Maui.Devices.Sensors.Location.Equals(object obj) -> bool
+~static Microsoft.Maui.Devices.Sensors.Location.operator !=(Microsoft.Maui.Devices.Sensors.Location left, Microsoft.Maui.Devices.Sensors.Location right) -> bool
+~static Microsoft.Maui.Devices.Sensors.Location.operator ==(Microsoft.Maui.Devices.Sensors.Location left, Microsoft.Maui.Devices.Sensors.Location right) -> bool
diff --git a/src/Essentials/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt b/src/Essentials/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt
index ab058de62d44..47042d23f092 100644
--- a/src/Essentials/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt
+++ b/src/Essentials/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt
@@ -1 +1,5 @@
#nullable enable
+override Microsoft.Maui.Devices.Sensors.Location.GetHashCode() -> int
+~override Microsoft.Maui.Devices.Sensors.Location.Equals(object obj) -> bool
+~static Microsoft.Maui.Devices.Sensors.Location.operator !=(Microsoft.Maui.Devices.Sensors.Location left, Microsoft.Maui.Devices.Sensors.Location right) -> bool
+~static Microsoft.Maui.Devices.Sensors.Location.operator ==(Microsoft.Maui.Devices.Sensors.Location left, Microsoft.Maui.Devices.Sensors.Location right) -> bool
diff --git a/src/Essentials/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt b/src/Essentials/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
index ab058de62d44..47042d23f092 100644
--- a/src/Essentials/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
+++ b/src/Essentials/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
@@ -1 +1,5 @@
#nullable enable
+override Microsoft.Maui.Devices.Sensors.Location.GetHashCode() -> int
+~override Microsoft.Maui.Devices.Sensors.Location.Equals(object obj) -> bool
+~static Microsoft.Maui.Devices.Sensors.Location.operator !=(Microsoft.Maui.Devices.Sensors.Location left, Microsoft.Maui.Devices.Sensors.Location right) -> bool
+~static Microsoft.Maui.Devices.Sensors.Location.operator ==(Microsoft.Maui.Devices.Sensors.Location left, Microsoft.Maui.Devices.Sensors.Location right) -> bool
diff --git a/src/Essentials/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt b/src/Essentials/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
index ab058de62d44..47042d23f092 100644
--- a/src/Essentials/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
+++ b/src/Essentials/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
@@ -1 +1,5 @@
#nullable enable
+override Microsoft.Maui.Devices.Sensors.Location.GetHashCode() -> int
+~override Microsoft.Maui.Devices.Sensors.Location.Equals(object obj) -> bool
+~static Microsoft.Maui.Devices.Sensors.Location.operator !=(Microsoft.Maui.Devices.Sensors.Location left, Microsoft.Maui.Devices.Sensors.Location right) -> bool
+~static Microsoft.Maui.Devices.Sensors.Location.operator ==(Microsoft.Maui.Devices.Sensors.Location left, Microsoft.Maui.Devices.Sensors.Location right) -> bool
diff --git a/src/Essentials/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt b/src/Essentials/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt
index ab058de62d44..47042d23f092 100644
--- a/src/Essentials/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt
+++ b/src/Essentials/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt
@@ -1 +1,5 @@
#nullable enable
+override Microsoft.Maui.Devices.Sensors.Location.GetHashCode() -> int
+~override Microsoft.Maui.Devices.Sensors.Location.Equals(object obj) -> bool
+~static Microsoft.Maui.Devices.Sensors.Location.operator !=(Microsoft.Maui.Devices.Sensors.Location left, Microsoft.Maui.Devices.Sensors.Location right) -> bool
+~static Microsoft.Maui.Devices.Sensors.Location.operator ==(Microsoft.Maui.Devices.Sensors.Location left, Microsoft.Maui.Devices.Sensors.Location right) -> bool
diff --git a/src/Essentials/src/PublicAPI/net/PublicAPI.Unshipped.txt b/src/Essentials/src/PublicAPI/net/PublicAPI.Unshipped.txt
index ab058de62d44..47042d23f092 100644
--- a/src/Essentials/src/PublicAPI/net/PublicAPI.Unshipped.txt
+++ b/src/Essentials/src/PublicAPI/net/PublicAPI.Unshipped.txt
@@ -1 +1,5 @@
#nullable enable
+override Microsoft.Maui.Devices.Sensors.Location.GetHashCode() -> int
+~override Microsoft.Maui.Devices.Sensors.Location.Equals(object obj) -> bool
+~static Microsoft.Maui.Devices.Sensors.Location.operator !=(Microsoft.Maui.Devices.Sensors.Location left, Microsoft.Maui.Devices.Sensors.Location right) -> bool
+~static Microsoft.Maui.Devices.Sensors.Location.operator ==(Microsoft.Maui.Devices.Sensors.Location left, Microsoft.Maui.Devices.Sensors.Location right) -> bool
diff --git a/src/Essentials/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt b/src/Essentials/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt
index ab058de62d44..47042d23f092 100644
--- a/src/Essentials/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt
+++ b/src/Essentials/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt
@@ -1 +1,5 @@
#nullable enable
+override Microsoft.Maui.Devices.Sensors.Location.GetHashCode() -> int
+~override Microsoft.Maui.Devices.Sensors.Location.Equals(object obj) -> bool
+~static Microsoft.Maui.Devices.Sensors.Location.operator !=(Microsoft.Maui.Devices.Sensors.Location left, Microsoft.Maui.Devices.Sensors.Location right) -> bool
+~static Microsoft.Maui.Devices.Sensors.Location.operator ==(Microsoft.Maui.Devices.Sensors.Location left, Microsoft.Maui.Devices.Sensors.Location right) -> bool
diff --git a/src/Essentials/src/Types/Location.shared.cs b/src/Essentials/src/Types/Location.shared.cs
index 9e3c9ad9b45a..3db7d42bdfe4 100644
--- a/src/Essentials/src/Types/Location.shared.cs
+++ b/src/Essentials/src/Types/Location.shared.cs
@@ -38,8 +38,8 @@ public Location()
///
public Location(double latitude, double longitude)
{
- Latitude = latitude;
- Longitude = longitude;
+ Latitude = Math.Min(Math.Max(latitude, -90.0), 90.0);
+ Longitude = Math.Min(Math.Max(longitude, -180.0), 180.0);
Timestamp = DateTimeOffset.UtcNow;
}
@@ -152,5 +152,35 @@ public override string ToString() =>
$"{nameof(Speed)}: {Speed}, " +
$"{nameof(Course)}: {Course}, " +
$"{nameof(Timestamp)}: {Timestamp}";
+
+ public override bool Equals(object obj)
+ {
+ if (ReferenceEquals(null, obj))
+ return false;
+ if (obj.GetType() != GetType())
+ return false;
+ var other = (Location)obj;
+ return Latitude == other.Latitude && Longitude == other.Longitude;
+ }
+
+ public override int GetHashCode()
+ {
+ unchecked
+ {
+ int hashCode = Latitude.GetHashCode();
+ hashCode = (hashCode * 397) ^ Longitude.GetHashCode();
+ return hashCode;
+ }
+ }
+
+ public static bool operator ==(Location left, Location right)
+ {
+ return Equals(left, right);
+ }
+
+ public static bool operator !=(Location left, Location right)
+ {
+ return !Equals(left, right);
+ }
}
}