Implement .NET MAUI Maps

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}"
@@ -542,6 +544,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
@@ -718,6 +724,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}

_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}

eng/Versions.props

@@ -45,6 +45,8 @@
  <_XamarinAndroidGlideVersion>4.13.2.1</_XamarinAndroidGlideVersion>
  <_XamarinAndroidXSecurityVersion>1.1.0-alpha03</_XamarinAndroidXSecurityVersion>
  <_XamarinGoogleCryptoTinkAndroidVersion>1.6.1.7</_XamarinGoogleCryptoTinkAndroidVersion>
+ <!-- Android Maps -->
+ <XamarinGooglePlayServicesMaps>117.0.0</XamarinGooglePlayServicesMaps>
  <!--
  SKIASHARP & HARFBUZZSHARP - the various things must be kept in sync with maui graphics:
  - NuGet versions below

src/Compatibility/ControlGallery/src/Core/GalleryPages/MapElementsGallery.xaml.cs

@@ -3,6 +3,7 @@
 using Microsoft.Maui.Controls.Maps;
 using Microsoft.Maui.Controls.Xaml;
 using Microsoft.Maui.Graphics;
+using Microsoft.Maui.Maps;
 using Map = Microsoft.Maui.Controls.Maps;
 
 namespace Microsoft.Maui.Controls.Compatibility.ControlGallery.GalleryPages
@@ -31,7 +32,7 @@ public MapElementsGallery()
 
  Map.MoveToRegion(
  MapSpan.FromCenterAndRadius(
- new Position(39.828152, -98.569817),
+ new Devices.Sensors.Location(39.828152, -98.569817),
  Distance.FromMiles(1681)));
 
  _polyline = new Maps.Polyline

src/Compatibility/ControlGallery/src/Core/GalleryPages/MapGallery.xaml.cs

@@ -9,13 +9,15 @@
 using Microsoft.Maui.Controls.Internals;
 using Microsoft.Maui.Controls.Maps;
 using Microsoft.Maui.Controls.Xaml;
+using Microsoft.Maui.Devices.Sensors;
+using Microsoft.Maui.Maps;
 
 namespace Microsoft.Maui.Controls.Compatibility.ControlGallery
 {
  [XamlCompilation(XamlCompilationOptions.Compile)]
  public partial class MapGallery : ContentPage
  {
- readonly Geocoder _geocoder = new Geocoder();
+ //readonly Geocoder _geocoder = new Geocoder();
  readonly Map Map;
 
  public MapGallery()
@@ -25,8 +27,8 @@ public MapGallery()
  Map = MakeMap();
  Map.Pins.ToList().ForEach(pin =>
  {
- pin.MarkerClicked += MarkerClicked;
- pin.InfoWindowClicked += InfoWindowClicked;
+ (pin as Pin).MarkerClicked += MarkerClicked;
+ (pin as Pin).InfoWindowClicked += InfoWindowClicked;
  });
  Map.MapClicked += MapClicked;
 
@@ -37,29 +39,29 @@ public MapGallery()
 
  public static Map MakeMap()
  {
- return new Map(MapSpan.FromCenterAndRadius(new Position(41.890202, 12.492049), Distance.FromMiles(0.5)))
+ return new Map(MapSpan.FromCenterAndRadius(new Devices.Sensors.Location(41.890202, 12.492049), Distance.FromMiles(0.5)))
  {
  IsShowingUser = false,
  Pins =
  {
  new Pin
  {
  Type = PinType.Place,
- Position = new Position (41.890202, 12.492049),
+ Position = new Location(41.890202, 12.492049),
  Label = "Colosseum",
  Address = "Piazza del Colosseo, 00184 Rome, Province of Rome, Italy"
  },
  new Pin
  {
  Type = PinType.Place,
- Position = new Position (41.898652, 12.476831),
+ Position = new Location (41.898652, 12.476831),
  Label = "Pantheon",
  Address = "Piazza della Rotunda, 00186 Rome, Province of Rome, Italy"
  },
  new Pin
  {
  Type = PinType.Place,
- Position = new Position (41.903209, 12.454545),
+ Position = new Location (41.903209, 12.454545),
  Label = "Sistine Chapel",
  Address = "Piazza della Rotunda, 00186 Rome, Province of Rome, Italy"
  }
@@ -89,23 +91,23 @@ void InfoWindowClicked(object sender, PinClickedEventArgs e)
 
  async void SearchForAddress(object sender, EventArgs e)
  {
- var searchAddress = (SearchBar)sender;
- var addressQuery = searchAddress.Text;
- searchAddress.Text = "";
- searchAddress.Unfocus();
+ //var searchAddress = (SearchBar)sender;
+ //var addressQuery = searchAddress.Text;
+ //searchAddress.Text = "";
+ //searchAddress.Unfocus();
 
- var positions = (await _geocoder.GetPositionsForAddressAsync(addressQuery)).ToList();
- if (!positions.Any())
- return;
+ //var positions = (await _geocoder.GetPositionsForAddressAsync(addressQuery)).ToList();
+ //if (!positions.Any())
+ // return;
 
- var position = positions.First();
- Map.MoveToRegion(MapSpan.FromCenterAndRadius(position, Distance.FromMeters(4000)));
- Map.Pins.Add(new Pin
- {
- Label = addressQuery,
- Position = position,
- Address = addressQuery
- });
+ //var position = new Location(positions.First().Latitude, positions.First().Longitude);
+ //Map.MoveToRegion(MapSpan.FromCenterAndRadius(position, Distance.FromMeters(4000)));
+ //Map.Pins.Add(new Pin
+ //{
+ // Label = addressQuery,
+ // Position = position,
+ // Address = addressQuery
+ //});
  }
 
  void MapClicked(object sender, MapClickedEventArgs e)
@@ -142,32 +144,32 @@ void ZoomOutClicked(object sender, EventArgs e)
 
  async void ReverseGeocodeClicked(object sender, EventArgs e)
  {
- var addresses = await _geocoder.GetAddressesForPositionAsync(new Position(41.8902, 12.4923));
- foreach (var ad in addresses)
- Debug.WriteLine(ad);
+ //var addresses = await _geocoder.GetAddressesForPositionAsync(new Position(41.8902, 12.4923));
+ //foreach (var ad in addresses)
+ // Debug.WriteLine(ad);
  }
 
  void HomeClicked(object sender, EventArgs e)
  {
- Map.MoveToRegion(MapSpan.FromCenterAndRadius(new Position(41.890202, 12.492049), Distance.FromMiles(0.5)));
+ Map.MoveToRegion(MapSpan.FromCenterAndRadius(new Devices.Sensors.Location(41.890202, 12.492049), Distance.FromMiles(0.5)));
  }
 
  void ZoomPinClicked(object sender, EventArgs e)
  {
- var pos = new Position(41.011995, -8.642995);
+ var pos = new Devices.Sensors.Location(41.011995, -8.642995);
  Map.Pins.Clear();
  Map.Pins.Add(new Pin { Position = pos, Label = "Rui" });
  Map.MoveToRegion(MapSpan.FromCenterAndRadius(pos, Distance.FromMiles(0.5)));
  }
 
  void EditPinClicked(object sender, EventArgs e)
  {
- var pin = Map.Pins.First();
+ var pin = (Pin)Map.Pins.First();
 
  pin.Label += " Edited";
  pin.Address = "Edited";
 
- var pos = new Position(pin.Position.Latitude + 1, pin.Position.Longitude + 1);
+ var pos = new Devices.Sensors.Location(pin.Position.Latitude + 1, pin.Position.Longitude + 1);
  pin.Position = pos;
  Map.MoveToRegion(MapSpan.FromCenterAndRadius(pos, Distance.FromMiles(0.5)));
  }
@@ -186,7 +188,7 @@ void ToggleMoveToLastRegionOnLayoutChange(object sender, EventArgs e)
  void ShowTrafficToggled(object sender, ToggledEventArgs e)
  {
  var control = (Switch)sender;
- Map.TrafficEnabled = control.IsToggled;
+ Map.HasTrafficEnabled = control.IsToggled;
  }
  }
 }

src/Compatibility/ControlGallery/src/Core/GalleryPages/MapWithItemsSourceGallery.xaml.cs

@@ -8,13 +8,15 @@
 using Microsoft.Maui.Controls.Internals;
 using Microsoft.Maui.Controls.Maps;
 using Microsoft.Maui.Controls.Xaml;
+using Microsoft.Maui.Devices.Sensors;
+using Microsoft.Maui.Maps;
 
 namespace Microsoft.Maui.Controls.Compatibility.ControlGallery.GalleryPages
 {
  [XamlCompilation(XamlCompilationOptions.Compile)]
  public partial class MapWithItemsSourceGallery : ContentPage
  {
- static readonly Position startPosition = new Position(39.8283459, -98.5794797);
+ static readonly Location startPosition = new Location(39.8283459, -98.5794797);
 
  public MapWithItemsSourceGallery()
  {
@@ -41,9 +43,9 @@ class ViewModel
  public ViewModel()
  {
  _places = new ObservableCollection<Place>() {
- new Place("New York, USA", "The City That Never Sleeps", new Position(40.67, -73.94)),
- new Place("Los Angeles, USA", "City of Angels", new Position(34.11, -118.41)),
- new Place("San Francisco, USA", "Bay City ", new Position(37.77, -122.45))
+ new Place("New York, USA", "The City That Never Sleeps", new Location(40.67, -73.94)),
+ new Place("Los Angeles, USA", "City of Angels", new Location(34.11, -118.41)),
+ new Place("San Francisco, USA", "Bay City ", new Location(37.77, -122.45))
  };
 
  AddPlaceCommand = new Command(AddPlace);
@@ -85,7 +87,7 @@ await Task.Run(() =>
 
  foreach (Place place in Places)
  {
- place.Position = new Position(lastLatitude, place.Position.Longitude);
+ place.Position = new Location(lastLatitude, place.Position.Longitude);
  }
  });
  }
@@ -107,16 +109,9 @@ static class RandomPosition
  {
  static Random Random = new Random(Environment.TickCount);
 
- public static Position Next()
+ public static Location Next(Location position, double latitudeRange, double longitudeRange)
  {
- return new Position(
- latitude: Random.NextDouble() * 180 - 90,
- longitude: Random.NextDouble() * 360 - 180);
- }
-
- public static Position Next(Position position, double latitudeRange, double longitudeRange)
- {
- return new Position(
+ return new Location(
  latitude: position.Latitude + (Random.NextDouble() * 2 - 1) * latitudeRange,
  longitude: position.Longitude + (Random.NextDouble() * 2 - 1) * longitudeRange);
  }
@@ -129,22 +124,22 @@ Place NewPlace()
  return new Place(
  $"Pin {_pinCreatedCount}",
  $"Desc {_pinCreatedCount}",
-  RandomPosition.Next(startPosition, 8, 19));
+  RandomPosition.Next(startPosition, 8, 19));
  }
  }
 
  [Preserve(AllMembers = true)]
  class Place : INotifyPropertyChanged
  {
- Position _position;
+ Location _position;
 
  public event PropertyChangedEventHandler PropertyChanged;
 
  public string Address { get; }
 
  public string Description { get; }
 
- public Position Position
+ public Location Position
  {
  get => _position;
  set
@@ -157,7 +152,7 @@ public Position Position
  }
  }
 
- public Place(string address, string description, Position position)
+ public Place(string address, string description, Location position)
  {
  Address = address;
  Description = description;

src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla26171.cs

@@ -72,19 +72,19 @@ public static Map MakeMap()
  Pins = {
  (colosseum = new Pin {
  Type = PinType.Place,
- Position = new Position (41.890202, 12.492049),
+ Position = new Devices.Sensors.Location (41.890202, 12.492049),
  Label = "Colosseum",
  Address = "Piazza del Colosseo, 00184 Rome, Province of Rome, Italy"
  }),
  (pantheon = new Pin {
  Type = PinType.Place,
- Position = new Position (41.898652, 12.476831),
+ Position = new Devices.Sensors.Location (41.898652, 12.476831),
  Label = "Pantheon",
  Address = "Piazza della Rotunda, 00186 Rome, Province of Rome, Italy"
  }),
  (chapel = new Pin {
  Type = PinType.Place,
- Position = new Position (41.903209, 12.454545),
+ Position = new Devices.Sensors.Location (41.903209, 12.454545),
  Label = "Sistine Chapel",
  Address = "Piazza della Rotunda, 00186 Rome, Province of Rome, Italy"
  })

src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla29017.cs

@@ -38,7 +38,7 @@ protected override void Init()
  Text = "Add pins",
  Command = new Command (() => {
  foreach (var pin in map.Pins) {
- pin.MarkerClicked -= PinClicked;
+ (pin as Pin).MarkerClicked -= PinClicked;
  }
 
  map.Pins.Clear ();
@@ -57,7 +57,7 @@ protected override void Init()
  Address = "address",
  Label = "label",
  Type = PinType.Place,
- Position = new Position (map.VisibleRegion.Center.Latitude + lat, map.VisibleRegion.Center.Longitude + lng)
+ Position = new Devices.Sensors.Location (map.VisibleRegion.Center.Latitude + lat, map.VisibleRegion.Center.Longitude + lng)
  };
 
  pin.MarkerClicked += PinClicked;

src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla38284.cs

@@ -3,7 +3,8 @@
 using Microsoft.Maui.Controls.CustomAttributes;
 using Microsoft.Maui.Controls.Internals;
 using Microsoft.Maui.Controls.Maps;
-
+using Microsoft.Maui.Maps;
+using Microsoft.Maui.Devices.Sensors;
 
 namespace Microsoft.Maui.Controls.Compatibility.ControlGallery.Issues
 {
@@ -56,7 +57,7 @@ protected override void Init()
  public void DisplayMaps()
  {
  map2.IsVisible = false;
- var mapPinPosition = new Position(Latitude, Longitude);
+ var mapPinPosition = new Location(Latitude, Longitude);
 
  var type = MapType.Satellite;
  map1.MapType = type;