- iOS run ok for PointAnnotationClusteringExample

Author: tuyen-vuduc

src/libs/Mapbox.Maui/Models/Expressions/DslExpression.cs

@@ -2,7 +2,7 @@
 
 namespace MapboxMaui.Expressions;
 
-[DebuggerDisplay("{ToString()}")]
+[DebuggerDisplay("{GetString()}")]
 public class DslExpression : List<object>
 {
     public DslOperator Operator { get; }
@@ -48,11 +48,10 @@ public object[] ToObjects()
         return result.ToArray();
     }
 
-    public override string ToString()
+    private string GetString()
     {
         var items = new List<string>();
 
-
         if (!string.IsNullOrWhiteSpace(Operator.Value))
         {
             items.Add(Operator.Value);

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

@@ -11,7 +11,11 @@ internal static Expression ToPlatformValue(
         this DslExpression xvalue
     )
     {
-        var expressionBuilder = new Expression.ExpressionBuilder(xvalue.Operator.Value);
+        var @operator = string.IsNullOrWhiteSpace(xvalue.Operator.Value)
+            ? xvalue.Operator.Value
+            : xvalue.First();
+
+        var expressionBuilder = new Expression.ExpressionBuilder(@operator);
 
         foreach (var argument in xvalue)
         {

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

@@ -301,15 +301,15 @@ public IPointAnnotationManager CreatePointAnnotationManager(
                     new Kotlin.Pair(new Java.Lang.Integer(50), new Java.Lang.Integer(Color.Blue)),
                     new Kotlin.Pair(new Java.Lang.Integer(0), new Java.Lang.Integer(Color.Green)),
                 },
-                null //new Dictionary<string, Java.Lang.Object>(
-                //    clusterOptions.ClusterProperties?
-                //        .Select(
-                //            x => new KeyValuePair<string, Java.Lang.Object>(
-                //                x.Key,
-                //                x.Value.Wrap()
-                //            )
-                //        )
-                //    )
+                new Dictionary<string, Java.Lang.Object>(
+                    clusterOptions.ClusterProperties?
+                        .Select(
+                            x => new KeyValuePair<string, Java.Lang.Object>(
+                                x.Key,
+                                x.Value.ToPlatformValue()
+                            )
+                        )
+                    )
                 ));
         var nativeManager = AnnotationPluginImplKt
             .GetAnnotations(mapView)

src/libs/Mapbox.Maui/Platforms/iOS/AdditionalExtensions.cs

@@ -14,7 +14,7 @@ namespace MapboxMaui;
 
 public static partial class AdditionalExtensions
 {
-    internal static NSDictionary ToNative(this IDictionary<string, DslExpression> dictionary)
+    internal static NSDictionary<NSString, TMBExpression> ToNative(this IDictionary<string, DslExpression> dictionary)
     {
         var list = new NSMutableDictionary<NSString, TMBExpression>();
         foreach (var item in dictionary)
@@ -122,7 +122,7 @@ internal static NSObject Wrap(this object xvalue)
         var result = xvalue switch
         {
             bool value => NSNumber.FromBoolean(value),
-            int value => NSNumber.FromLong((nint)value),
+            int value => NSNumber.FromLong(value),
             long value => NSNumber.FromLong((nint)value),
             float value => NSNumber.FromDouble(value),
             double value => NSNumber.FromDouble(value),

src/libs/Mapbox.Maui/Platforms/iOS/ExpressionExtensions.cs

@@ -10,15 +10,18 @@ internal static TMBExpression ToPlatformValue(
         this DslExpression xvalue
     )
     {
-        var arguments = NSArray.FromNSObjects(xvalue.Select(x => x.Wrap()).ToArray());
+        var arguments = xvalue.Select(x => x switch {
+            DslExpression expression => expression.ToPlatformValue(),
+            _ => x.Wrap()
+        }).ToArray() ?? Array.Empty<NSObject>();
 
         return string.IsNullOrWhiteSpace(xvalue.Operator.Value)
             ? TMBExpression.CreateWithArguments(
-                arguments
+                NSArray.FromObjects(arguments)
             )
             : TMBExpression.CreateWithOperator(
                 xvalue.Operator.ToPlatformValue(),
-                arguments
+                NSArray.FromObjects(arguments)
             );
     }
 

src/qs/MapboxMauiQs/Examples/44.PointAnnotationClustering/PointAnnotationClusteringExample.cs

@@ -99,7 +99,7 @@ void CreateClusters(PointAnnotation[] annotations)
         //   * 30 when point count is between 50 and 100
         //   * 35 when point count is greater than or equal to 100
         var circleRadiusExpression = DslExpression.step(
-            DslExpression.geometryType("point_count"),
+            DslExpression.get("point_count"),
             25,
             50,
             30,
@@ -114,7 +114,7 @@ void CreateClusters(PointAnnotation[] annotations)
         //   * orange when point count is between 150 and 250
         //   * light pink when point count is greater than or equal to 250
         var circleColorExpression = DslExpression.step(
-            DslExpression.geometryType("point_count"),
+            DslExpression.get("point_count"),
             Colors.Yellow,
             10,
             Colors.Green,
@@ -135,8 +135,9 @@ void CreateClusters(PointAnnotation[] annotations)
         var sumExpression = DslExpression.args(
             DslExpression.sum(
                 DslExpression.accumulated(),
-                DslExpression.get("sum"),
-                1)
+                DslExpression.get("sum")
+            ),
+            1
         );
 
         // Create a cluster property to add to each cluster
@@ -158,7 +159,7 @@ void CreateClusters(PointAnnotation[] annotations)
         };
 
         var pointAnnotationManager = map.AnnotationController.CreatePointAnnotationManager(
-            Guid.NewGuid().ToString(),
+            clusterLayerID,
             LayerPosition.Unknown(),
             clusterOptions
         );