Feature/map pin cluster

CHANGELOG.md

@@ -4,6 +4,19 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [0.3.0] 2023-05-12
+
+### Added
+Map Clustering for IOS and Android
+
+## [0.2.0] 2022-12-08
+
+### Added
+Source link support
+
+### update
+bump uno to 4.4.20
+
 ## [0.1.1] 2022-04-10
 
 ### Added

Samples/Samples/Samples.Shared/DynamicMapMenuPage.xaml

@@ -31,6 +31,13 @@
                 <!-- Show DynamicMap_PushpinsPage button -->
                 <Button Content="Show overview of DynamicMap features"
 						Command="{Binding GotoDynamicMap_FeaturesPage}"
+                        Style="{StaticResource BasicButtonStyle}"
+						HorizontalAlignment="Stretch"
+						Margin="0,20" /> 
+
+                <!-- Show DynamicMap_PushpinsPage button -->
+                <Button Content="Show DynamicMap Clustering sample"
+                        Command="{Binding GotoDynamicMap_WithClustering_FeaturesPage}"
                         Style="{StaticResource BasicButtonStyle}"
 						HorizontalAlignment="Stretch"
 						Margin="0,20" />

Samples/Samples/Samples.Shared/DynamicMap_FeaturesPage.xaml

@@ -22,7 +22,8 @@
             <converters:FromNullableBoolToVisibilityConverter x:Key="IsTrueToVisible" />
 
             <converters:FromNullableBoolToVisibilityConverter x:Key="IsTrueToCollapsed"
-															  VisibilityIfTrue="Collapsed" />
+                                                              VisibilityIfTrue="Collapsed" />
+
         </ResourceDictionary>
     </Page.Resources>
 
@@ -112,6 +113,7 @@
                 <dynamicMap:MapControl ViewModel="{Binding}"
 									   SelectionMode="Single"
 									   AutolocateButtonVisibility="Collapsed"
+                                       IsClusterEnabled="{Binding IsClusterEnabled}"
 									   dynamicMap:MapControlBehavior.DisableRotation="True"
 									   dynamicMap:MapControlBehavior.PushpinImageSelector="{StaticResource PushpinEntityToMapPin}"
                                        dynamicMap:MapControlBehavior.IconWidth="36"

Samples/Samples/Samples.Shared/Presentation/DynamicMapMenuViewModel.cs

@@ -26,6 +26,11 @@ public DynamicMapMenuViewModel()
             await _sectionsNavigator.Navigate(ct, () => new DynamicMap_FeaturesPageViewModel());
         });
 
+        public IDynamicCommand GotoDynamicMap_WithClustering_FeaturesPage => this.GetCommandFromTask(async ct =>
+        {
+            await _sectionsNavigator.Navigate(ct, () => new DynamicMap_FeaturesPageViewModel(isClusterEnabled: true));
+        });
+
         public IDynamicCommand GotoDynamicMap_MoveSearchPage => this.GetCommandFromTask(async ct =>
         {
             await _sectionsNavigator.Navigate(ct, () => new DynamicMap_MoveSearchPageViewModel());

Samples/Samples/Samples.Shared/Presentation/DynamicMap_FeaturesPageViewModel.cs

@@ -1,21 +1,18 @@
-using Chinook.DynamicMvvm;
-using Uno.Extensions;
+using Cartography.DynamicMap;
+using Chinook.DynamicMvvm;
+using Chinook.SectionsNavigation;
+using GeolocatorService;
+using Samples.Entities;
 using System;
+using System.Collections.Generic;
 using System.Linq;
-using System.Reactive;
+using System.Reactive.Concurrency;
 using System.Reactive.Linq;
-using System.Reactive.Threading.Tasks;
 using System.Threading;
 using System.Threading.Tasks;
-using Cartography.DynamicMap;
-using GeolocatorService;
+using Uno.Extensions;
 using Uno.Logging;
-using Samples.Entities;
-using System.Collections.Generic;
-using Uno;
 using Windows.Devices.Geolocation;
-using Chinook.SectionsNavigation;
-using System.Reactive.Concurrency;
 
 namespace Samples.Presentation
 {
@@ -32,8 +29,9 @@ public class DynamicMap_FeaturesPageViewModel : ViewModel, IDynamicMapComponent
         private ISectionsNavigator _sectionsNavigator;
         private readonly IDispatcherScheduler _dispatcherScheduler;
 
-        public DynamicMap_FeaturesPageViewModel()
+        public DynamicMap_FeaturesPageViewModel(bool isClusterEnabled = false)
         {
+            IsClusterEnabled = isClusterEnabled;
             _geolocatorService = this.GetService<IGeolocatorService>();
             _sectionsNavigator = this.GetService<ISectionsNavigator>();
             _dispatcherScheduler = this.GetService<IDispatcherScheduler>();
@@ -179,6 +177,12 @@ public bool IsUserDragging
             set => this.Set(value);
         }
 
+        public bool IsClusterEnabled
+        {
+            get => this.Get<bool>(initialValue: false);
+            set => this.Set(value);
+        }
+
         public LocationResult UserLocation
         {
             get => this.Get<LocationResult>();
@@ -292,17 +296,57 @@ private PushpinEntity[] GetInitialPushpins()
                     new PushpinEntity
                     {
                         Name = "Pushpin 1",
-                        Coordinates = new Geopoint(new BasicGeoposition{Latitude = 46.3938717, Longitude = -72.0921769})
+                        Coordinates = new Geopoint(new BasicGeoposition { Latitude = 45.5040713, Longitude = -73.5587092 })
                     },
                     new PushpinEntity
                     {
                         Name = "Pushpin 2",
-                        Coordinates = new Geopoint(new BasicGeoposition { Latitude = 45.5502838, Longitude = -73.2801901 })
+                        Coordinates = new Geopoint(new BasicGeoposition { Latitude = 45.5041113, Longitude = -73.5584092 })
                     },
                     new PushpinEntity
                     {
                         Name = "Pushpin 3",
-                        Coordinates = new Geopoint(new BasicGeoposition { Latitude = 45.5502838, Longitude = -72.0921769 })
+                        Coordinates = new Geopoint(new BasicGeoposition { Latitude = 45.5035613, Longitude = -73.5587392 })
+                    },
+                    new PushpinEntity
+                    {
+                        Name = "Pushpin 4",
+                        Coordinates = new Geopoint(new BasicGeoposition { Latitude = 45.5043413, Longitude = -73.5567092 })
+                    },
+                    new PushpinEntity
+                    {
+                        Name = "Pushpin 5",
+                        Coordinates = new Geopoint(new BasicGeoposition { Latitude = 45.5040713, Longitude = -73.5547092 })
+                    },
+                    new PushpinEntity
+                    {
+                        Name = "Pushpin 6",
+                        Coordinates = new Geopoint(new BasicGeoposition { Latitude = 45.5042713, Longitude = -73.5583092 })
+                    },
+                    new PushpinEntity
+                    {
+                        Name = "Pushpin 7",
+                        Coordinates = new Geopoint(new BasicGeoposition { Latitude = 45.5046513, Longitude = -73.5587492 })
+                    },
+                    new PushpinEntity
+                    {
+                        Name = "Pushpin 8",
+                        Coordinates = new Geopoint(new BasicGeoposition { Latitude = 45.5042313, Longitude = -73.5583562 })
+                    },
+                    new PushpinEntity
+                    {
+                        Name = "Pushpin 9",
+                        Coordinates = new Geopoint(new BasicGeoposition { Latitude = 45.5040313, Longitude = -73.5584322 })
+                    },
+                    new PushpinEntity
+                    {
+                        Name = "Pushpin 10",
+                        Coordinates = new Geopoint(new BasicGeoposition { Latitude = 45.5502338, Longitude = -73.2801901 })
+                    },
+                    new PushpinEntity
+                    {
+                        Name = "Pushpin 11",
+                        Coordinates = new Geopoint(new BasicGeoposition { Latitude = 45.5501838, Longitude = -72.0921769 })
                     },
                 };
         }
@@ -387,7 +431,7 @@ private async Task<GeoViewPort> GetUserCoordinates(CancellationToken ct)
             var newPushpin = await CreatePushpinAtCenter(ct);
 
             var list = pushpins.ToList();
-            list.Add((IGeoLocated)newPushpin);
+            list.Add(newPushpin);
 
             Pushpins = list.ToArray();
         });

Samples/Samples/Samples.Shared/Presentation/DynamicMap_MoveSearchPageViewModel.cs

@@ -103,6 +103,12 @@ public int? AnimationDurationSeconds
             await _sectionsNavigator.Navigate(ct, () => new DynamicMapMenuViewModel());
         });
 
+        public bool IsClusterEnabled
+        {
+            get => this.Get(initialValue: false);
+            set => this.Set(value);
+        }
+
         private MapViewPort GetStartingCoordinates()
         {
             var mapViewPort = new MapViewPort(new Geopoint(new BasicGeoposition { Latitude = 45.503343, Longitude = -73.571695 }));

build/gitversion.yml

@@ -1,6 +1,6 @@
 assembly-versioning-scheme: MajorMinorPatch
 mode: ContinuousDeployment
-next-version: 0.2.0
+next-version: 0.3.0
 continuous-delivery-fallback-tag: ""
 increment: none # Disabled as it is not used. Saves time on the GitVersion step
 branches:
@@ -32,4 +32,4 @@ branches:
     source-branches: ['master']
     increment: none
 ignore:
-  sha: []
+  sha: []

src/Cartography/Cartography.DynamicMap/Cartography.DynamicMap.csproj

@@ -38,6 +38,7 @@
 
 	<ItemGroup Condition="'$(TargetFramework)' == 'xamarinios10'">
 		<PackageReference Include="Xamarin.Google.iOS.Maps" Version="3.9.0" />
+		<PackageReference Include="Xamarin.Google.Maps.Utils" Version="1.3.4" />
 	</ItemGroup>
 
 	<ItemGroup>
@@ -55,12 +56,9 @@
 	</ItemGroup>
 
 	<ItemGroup Condition="'$(TargetFramework)' == 'monoandroid12.0'">
-	  <PackageReference Include="Xamarin.GooglePlayServices.Base">
-	    <Version>117.6.0.5</Version>
-	  </PackageReference>
-	  <PackageReference Include="Xamarin.GooglePlayServices.Maps">
-	    <Version>117.0.1.5</Version>
-	  </PackageReference>
+	  <PackageReference Include="Xamarin.Google.Maps.Utils" Version="1.3.4" />
+	  <PackageReference Include="Xamarin.GooglePlayServices.Base" Version="117.6.0.5" />
+	  <PackageReference Include="Xamarin.GooglePlayServices.Maps" Version="117.0.1.5" />
 	</ItemGroup>
 
 </Project>

src/Cartography/Cartography.DynamicMap/IDynamicMapComponent.cs

@@ -11,27 +11,27 @@ namespace Cartography.DynamicMap
 	public interface IDynamicMapComponent
 	{
 		/// <summary>
-		/// Pushpins to display on map
+		/// Pushpins to display on map.
 		/// </summary>
 		IGeoLocated[] Pushpins { get; set; }
 
 		/// <summary>
-		/// Selected pushpin
+		/// Selected pushpin.
 		/// </summary>
 		IGeoLocated[] SelectedPushpins { get; set; }
 
 		/// <summary>
-		/// Groups to display on map
+		/// Groups to display on map.
 		/// </summary>
 		IGeoLocatedGrouping<IGeoLocated[]> Groups { get; set; }
 
 		/// <summary>
-		/// Min delay to wait between two map viewport update
+		/// Min delay to wait between two map viewport update.
 		/// </summary>
 		TimeSpan ViewPortUpdateMinDelay { get; set; }
 
 		/// <summary>
-		/// Equality comparer to use to filter the map viewport updates
+		/// Equality comparer to use to filter the map viewport updates.
 		/// </summary>
 		IEqualityComparer<MapViewPort> ViewPortUpdateFilter { get; set; }
 
@@ -41,48 +41,53 @@ public interface IDynamicMapComponent
 		Action<Geocoordinate> OnMapTapped { get; set; }
 
 		/// <summary>
-		/// Defines whether user tracking is enabled - READ / WRITE
+		/// Defines whether user tracking is enabled - READ / WRITE.
 		/// </summary>
 		bool IsUserTrackingCurrentlyEnabled { get; set; }
 
 		/// <summary>
-		/// Whether or not the user is currently dragging the map
+		/// Whether or not the user is currently dragging the map.
 		/// </summary>
 		bool IsUserDragging { get; set; }
 
-		/// <summary>
-		/// User location if any and if display requested, else empty value
-		/// </summary>
-		LocationResult UserLocation { get; set; }
+        /// <summary>
+        /// Whether or not the pushpin clustering is enabled.
+        /// </summary>
+        bool IsClusterEnabled { get; set; }
+
+        /// <summary>
+        /// User location if any and if display requested, else empty value.
+        /// </summary>
+        LocationResult UserLocation { get; set; }
 
 		/// <summary>
-		/// VisibleRegion of the map - READ ONLY
+		/// VisibleRegion of the map - READ ONLY.
 		/// </summary>
 		MapViewPortCoordinates ViewPortCoordinates { get; set; }
 
 		/// <summary>
-		/// ViewPort of the map - READ / WRITE - First viewport MUST be provided by VM
+		/// ViewPort of the map - READ / WRITE - First viewport MUST be provided by VM.
 		/// </summary>
 		MapViewPort ViewPort { get; set; }
 
 		/// <summary>
-		/// Sets the desired animation duration
+		/// Sets the desired animation duration.
 		/// </summary>
 		int? AnimationDurationSeconds { get; set; }
 	}
 
 	/// <summary>
-	/// The MapComponent default value for some field
+	/// The MapComponent default value for some field.
 	/// </summary>
 	public static class MapComponentDefaultValue
 	{
 		/// <summary>
-		/// Get the Default ViewPortUpdateMinDelay
+		/// Get the Default ViewPortUpdateMinDelay.
 		/// </summary>
 		public static TimeSpan DefaultViewPortUpdateMinDelay = TimeSpan.FromMilliseconds(250);
 
 		/// <summary>
-		/// Get the Default ViewPortUpdateFilter
+		/// Get the Default ViewPortUpdateFilter.
 		/// </summary>
 		public static IEqualityComparer<MapViewPort> DefaultViewPortUpdateFilter =
 			new PrettyMapViewPortEqualityComparer();

src/Cartography/Cartography.DynamicMap/MapControlBase.cs

@@ -231,9 +231,20 @@ public Point PushpinIconsPositionOrigin
 			get { return (Point)this.GetValue(PushpinsIconsPositionOriginProperty); }
 			set { this.SetValue(PushpinsIconsPositionOriginProperty, value); }
 		}
+		#endregion
+
+#region IsClusterEnabled (dp)
+		public static readonly DependencyProperty IsClusterEnabledProperty = DependencyProperty.Register(
+            "IsClusterEnabled", typeof(bool), typeof(MapControlBase), new PropertyMetadata(false));
+
+        public bool IsClusterEnabled
+        {
+            get { return (bool)this.GetValue(IsClusterEnabledProperty); }
+            set { this.SetValue(IsClusterEnabledProperty, value); }
+        }
 #endregion
 
-		private readonly SerialDisposable _configuredSourceSubscriptions = new SerialDisposable();
+        private readonly SerialDisposable _configuredSourceSubscriptions = new SerialDisposable();
 		private ViewModelBase _configuredViewModel;
 
 		private Action<Geocoordinate> _onMapTapped;
@@ -511,7 +522,7 @@ private IDisposable SyncPushpinsFrom(ViewModelBase vm)
 					vm.GetAndObservePushpins(filterOutChangesFromSource: this),
 					vm.GetAndObserveGroups(filterOutChangesFromSource: this),
 					vm.GetAndObserveSelectedPushpins(filterOutChangesFromSource: null),
-					(pushpins, groups, selected) => new
+                    (pushpins, groups, selected) => new
 					{
 						items = pushpins
 							.Concat(groups)
@@ -524,7 +535,7 @@ private IDisposable SyncPushpinsFrom(ViewModelBase vm)
 				.Do(x =>
 				{
 					UpdateMapPushpins(x.items, x.selected);
-				})
+                })
 				.ObserveOn(GetBackgroundScheduler())
 				.CombineLatest(
 					// In order to prevent the pushpins being updated when the source changes, but still making sure the pins are updated before the selection