- use latest Mapbox Android SDK

Author: tuyen-vuduc

README.md

@@ -117,8 +117,27 @@ NOTE: A handy command to generate a new example
 dotnet cake -- --name SymbolClustering --index 58 --group Annotations --title "Add Cluster Symbol Annotations" --subtitle "Show fire hydrants in Washington DC area in a cluster using a symbol layer."
 ````
 
-# Known issues
-- The library is not yet able to build to run on iOS real device. [Issue](https://github.com/xamarin/xamarin-macios/issues/8917)
+# NOTES
+
+1) Failed to delete `.gradle` folder
+Due to Java process not killed gratefully.
+```
+taskkill -F -im java.exe
+```
+
+2) Xamarin.Build.Download
+Xamarin.Build.Download is a tool to help download artifacts from remote URL to avoid embedding the native artifacts within the NuGet package with advantages
+- Very thin and lightweight NuGet package
+- Avoid any license viloation if the owner of the native lib doesn't want us to redistribute their lib
+
+The downloaded artifact will be located at
+- MacOS: `~/Library/Caches/XamarinBuildDownload`
+- Windows: `%USERPROFILE%/AppData/Local/XamarinBuildDownloadCache`
+
+3) Kill all .NET processes
+```
+taskkill -F -im dotnet.exe
+```
 
 # Maintainer
 This project is maintained by [tuyen-vuduc](https://github.com/tuyen-vuduc) in his spare time and/or when requested.<br>

build.sh

@@ -1,8 +1,4 @@
 dotnet nuget locals -c all
 
-# Build to trigger gradle process
-dotnet build -t:Clean,Rebuild src/qs/MapboxMauiQs/MapboxMauiQs.csproj \
-    -property:MAPBOX_DOWNLOADS_TOKEN=$MAPBOX_DOWNLOADS_TOKEN
-
 dotnet pack -c Release -t:Clean,Rebuild src/libs/Mapbox.Maui/Mapbox.Maui.csproj \
     --output $PWD/nugets

src/libs/Mapbox.Maui/Mapbox.Maui.csproj

@@ -1,4 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
+	<Import Condition="EXISTS('Mapbox.Maui.props')" Project="Mapbox.Maui.props" />
+	<Import Condition="EXISTS('Mapbox.Maui.targets')" Project="Mapbox.Maui.targets" />
 	<Target Name="_CleanAarOutputPath" AfterTargets="_CreateAar" BeforeTargets="_IncludeAarInNuGetPackage">
 		<Delete Files="$(_AarOutputPath)" />
 	</Target>
@@ -42,6 +44,12 @@
 		<Compile Remove="**\**\*.iOS.cs" />
 	</ItemGroup>
 
+	<PropertyGroup>
+	  <AndroidTargetSdkVersion>34</AndroidTargetSdkVersion>
+	  <AndroidSdkDirectory Condition=" '$(OS)' == 'Unix' ">$(Home)/Library/Android/sdk</AndroidSdkDirectory>
+	  <AndroidSdkDirectory Condition=" '$(OS)' != 'Unix' ">$(UserProfile)/AppData/Local/Android/sdk</AndroidSdkDirectory>
+	</PropertyGroup>  
+
 	<PropertyGroup>
 		<PackageId>Mapbox.Maui</PackageId>
 		<Title>Mapbox SDK for .NET MAUI</Title>
@@ -53,7 +61,7 @@
 		<RepositoryUrl>https://github.com/tuyen-vuduc/mapbox-maui</RepositoryUrl>
 		<PackageProjectUrl>https://mapbox.tuyen-vuduc.tech</PackageProjectUrl>
 		<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
-		<PackageVersion>11.4.0-alpha02</PackageVersion>
+		<PackageVersion>11.5.0-alpha01</PackageVersion>
 		<PackageReadmeFile>README.md</PackageReadmeFile>
 		<PackageLicenseFile>LICENSE</PackageLicenseFile>
 		<PackageIcon>tv-mapbox.png</PackageIcon>
@@ -72,12 +80,13 @@
 		<PackageReference Include="Microsoft.Maui.Controls" Version="8.0.40" />
 	</ItemGroup>
 	<ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">
-		<PackageReference Include="Com.Mapbox.Maps.Android" Version="11.4.1" />
+		<PackageReference Include="Com.Mapbox.Maps.Android" Version="11.5.0" />
 		<PackageReference Include="Xamarin.AndroidX.AppCompat" Version="1.6.1.10" />
     	<PackageReference Include="Xamarin.AndroidX.Fragment " Version="1.7.0.2" />
 		<PackageReference Include="Xamarin.AndroidX.Fragment.Ktx" Version="1.7.0.2" />
 		<PackageReference Include="Xamarin.Kotlin.StdLib" Version="1.9.23.3" PrivateAssets="none" />
 		<PackageReference Include="Xamarin.Kotlin.StdLib.Common" Version="1.9.23.3" PrivateAssets="none" />
+		<PackageReference Include="Dependencies.Gradle" Version="8.6.0.1" />
 	</ItemGroup>
 	<ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">
 		<PackageReference Include="MapboxMapsObjC.iOS" Version="11.4.0.2" />
@@ -113,4 +122,10 @@
 	<ItemGroup>
 	  <PackageReference Update="Microsoft.Maui.Controls.Compatibility" Version="8.0.40" />
 	</ItemGroup>
+
+  <Target 
+    Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'"
+    Name="_GradleDependencyResolverTrigger"
+    DependsOnTargets="_GradleSync"
+    BeforeTargets="CoreCompile" />
 </Project>

src/libs/Mapbox.Maui/Mapbox.Maui.targets

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+	<ItemGroup>
+		<GradleRepository Include="https://api.mapbox.com/downloads/v2/releases/maven">
+			<Repository>
+				maven {
+					url = uri("https://api.mapbox.com/downloads/v2/releases/maven")
+					authentication {
+						create&lt;BasicAuthentication&gt;("basic")
+					}
+					credentials {
+						// Do not change the username below.
+						// This should always be `mapbox` (not your username).
+						username = "mapbox"
+						// Use the secret token you stored in gradle.properties as the password
+						password = providers.gradleProperty("MAPBOX_DOWNLOADS_TOKEN").get()
+					}
+				}
+			</Repository>
+		</GradleRepository>
+	</ItemGroup>
+</Project>

src/libs/Mapbox.Maui/Models/Annotations/ClusterOptions.cs

@@ -22,12 +22,15 @@ public class ClusterOptions
 
     /// Radius of each cluster if clustering is enabled. A value of 512 indicates a radius equal
     /// to the width of a tile, 50 by default. Value must be greater than or equal to 0.
-    public double ClusterRadius { get; set; }
+    public double ClusterRadius { get; set; } = 50;
 
     /// Max zoom on which to cluster points if clustering is enabled. Defaults to one zoom less
     /// than maxzoom (so that last zoom features are not clustered). Clusters are re-evaluated at integer zoom
     /// levels so setting clusterMaxZoom to 14 means the clusters will be displayed until z15.
-    public double ClusterMaxZoom { get; set; }
+    public double ClusterMaxZoom { get; set; } = 14;
+
+    /// Minimum number of points necessary to form a cluster if clustering is enabled. Defaults to `2`.
+    public double ClusterMinPoints { get; set; } = 2;
 
     /// An object defining custom properties on the generated clusters if clustering is enabled, aggregating values from
     /// clustered points. Has the form `{"property_name": [operator, map_expression]}`.

src/libs/Mapbox.Maui/Platforms/Android/ClusterOptionsExtensions.cs

@@ -20,6 +20,7 @@ public static class ClusterOptionsExtensions
                 clusterOptions.TextSize?.GetConstant(12.0) ?? 12.0,
                 clusterOptions.TextField?.Expression?.ToPlatformValue(),
                 (long)clusterOptions.ClusterMaxZoom,
+                (long)clusterOptions.ClusterMinPoints,
                 new List<Kotlin.Pair> {
                     new Kotlin.Pair(new Java.Lang.Integer(250), new Java.Lang.Integer(Color.LightPink)),
                     new Kotlin.Pair(new Java.Lang.Integer(150), new Java.Lang.Integer(Color.Orange)),

src/qs/MapboxMauiQs/MapboxMauiQs.csproj

@@ -89,11 +89,11 @@
 		<PackageReference Include="Microsoft.Maui.Controls" Version="8.0.40" />
 		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
 		<PackageReference Include="Xamarin.Build.Download" Version="0.11.4" />
-    <PackageReference Include="GeoJSON.Text" Version="1.0.2" />
+    	<PackageReference Include="GeoJSON.Text" Version="1.0.2" />
 	</ItemGroup>
 
 	<ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">
-		<PackageReference Include="Com.Mapbox.Maps.Android" Version="11.4.1" />
+		<PackageReference Include="Com.Mapbox.Maps.Android" Version="11.5.0" />
 		<PackageReference Include="Xamarin.AndroidX.AppCompat" Version="1.6.1.10" />
     	<PackageReference Include="Xamarin.AndroidX.Fragment " Version="1.7.0.2" />
 		<PackageReference Include="Xamarin.AndroidX.Fragment.Ktx" Version="1.7.0.2" />