- use latest iOS SDK v11.5.1

tuyen-vuduc · tuyen-vuduc · commit edac50492326 · 2024-07-12T07:26:07.000+07:00
- use new functions to add/remove annotations for iOS
diff --git a/src/libs/Mapbox.Maui/Mapbox.Maui.csproj b/src/libs/Mapbox.Maui/Mapbox.Maui.csproj
@@ -89,8 +89,8 @@
 		<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" />
-		<PackageReference Include="MapboxMaps.iOS" Version="11.4.0.1" />
+		<PackageReference Include="MapboxMapsObjC.iOS" Version="11.5.1" />
+		<PackageReference Include="MapboxMaps.iOS" Version="11.5.1" />
 	</ItemGroup>
 	<ItemGroup>
 	  <Folder Include="Models\Styles\" />
diff --git a/src/libs/Mapbox.Maui/Platforms/iOS/Annotations/CircleAnnotationManager.cs b/src/libs/Mapbox.Maui/Platforms/iOS/Annotations/CircleAnnotationManager.cs
@@ -49,31 +49,21 @@ public override void AddAnnotations(params CircleAnnotation[] xitems)
     {
         var items = xitems
             .Select(x => x.ToPlatformValue())
-            .ToList();
-
-        nativeManager.Annotations = nativeManager.Annotations
-            .Union(items)
             .ToArray();
+
+        nativeManager.AddAnnotations(items);
     }
 
     public override void RemoveAllAnnotations()
     {
-        nativeManager.Annotations = Array.Empty<TMBCircleAnnotation>();
+        nativeManager.RemoveAllAnnotations();
     }
 
     public override void RemoveAnnotations(params string[] annotationIDs)
     {
         for (int i = 0; i < annotationIDs.Length; i++)
         {
-            var item = nativeManager.Annotations.FirstOrDefault(
-                    x => x.Id == annotationIDs[i]
-                );
-            if (item == null) continue;
-
-            var annotations = new List<TMBCircleAnnotation>(nativeManager.Annotations);
-            annotations.Remove(item);
-
-            nativeManager.Annotations = annotations.ToArray();
+            nativeManager.RemoveAnnotationById(annotationIDs[i]);
         }
     }
 }
diff --git a/src/libs/Mapbox.Maui/Platforms/iOS/Annotations/PointAnnotationManager.cs b/src/libs/Mapbox.Maui/Platforms/iOS/Annotations/PointAnnotationManager.cs
@@ -170,31 +170,21 @@ public override void AddAnnotations(params PointAnnotation[] xitems)
     {
         var items = xitems
             .Select(x => x.ToPlatformValue())
-            .ToList();
-
-        nativeManager.Annotations = nativeManager.Annotations
-            .Union(items)
             .ToArray();
+
+        nativeManager.AddAnnotations(items);
     }
 
     public override void RemoveAllAnnotations()
     {
-        nativeManager.Annotations = Array.Empty<TMBPointAnnotation>();
+        nativeManager.RemoveAllAnnotations();
     }
 
     public override void RemoveAnnotations(params string[] annotationIDs)
     {
         for (int i = 0; i < annotationIDs.Length; i++)
         {
-            var item = nativeManager.Annotations.FirstOrDefault(
-                    x => x.Id == annotationIDs[i]
-                );
-            if (item == null) continue;
-
-            var annotations = new List<TMBPointAnnotation>(nativeManager.Annotations);
-            annotations.Remove(item);
-
-            nativeManager.Annotations = annotations.ToArray();
+            nativeManager.RemoveAnnotationById(annotationIDs[i]);
         }
     }
 }
diff --git a/src/libs/Mapbox.Maui/Platforms/iOS/Annotations/PolygonAnnotationManager.cs b/src/libs/Mapbox.Maui/Platforms/iOS/Annotations/PolygonAnnotationManager.cs
@@ -39,31 +39,21 @@ public override void AddAnnotations(params PolygonAnnotation[] xitems)
     {
         var items = xitems
             .Select(x => x.ToPlatformValue())
-            .ToList();
-
-        nativeManager.Annotations = nativeManager.Annotations
-            .Union(items)
             .ToArray();
+
+        nativeManager.AddAnnotations(items);
     }
 
     public override void RemoveAllAnnotations()
     {
-        nativeManager.Annotations = Array.Empty<TMBPolygonAnnotation>();
+        nativeManager.RemoveAllAnnotations();
     }
 
     public override void RemoveAnnotations(params string[] annotationIDs)
     {
         for (int i = 0; i < annotationIDs.Length; i++)
         {
-            var item = nativeManager.Annotations.FirstOrDefault(
-                    x => x.Id == annotationIDs[i]
-                );
-            if (item == null) continue;
-
-            var annotations = new List<TMBPolygonAnnotation>(nativeManager.Annotations);
-            annotations.Remove(item);
-
-            nativeManager.Annotations = annotations.ToArray();
+            nativeManager.RemoveAnnotationById(annotationIDs[i]);
         }
     }
 }
diff --git a/src/libs/Mapbox.Maui/Platforms/iOS/Annotations/PolylineAnnotationManager.cs b/src/libs/Mapbox.Maui/Platforms/iOS/Annotations/PolylineAnnotationManager.cs
@@ -59,31 +59,21 @@ public override void AddAnnotations(params PolylineAnnotation[] xitems)
     {
         var items = xitems
             .Select(x => x.ToPlatformValue())
-            .ToList();
-
-        nativeManager.Annotations = nativeManager.Annotations
-            .Union(items)
             .ToArray();
+
+        nativeManager.AddAnnotations(items);
     }
 
     public override void RemoveAllAnnotations()
     {
-        nativeManager.Annotations = Array.Empty<TMBPolylineAnnotation>();
+        nativeManager.RemoveAllAnnotations();
     }
 
     public override void RemoveAnnotations(params string[] annotationIDs)
     {
         for (int i = 0; i < annotationIDs.Length; i++)
         {
-            var item = nativeManager.Annotations.FirstOrDefault(
-                    x => x.Id == annotationIDs[i]
-                );
-            if (item == null) continue;
-
-            var annotations = new List<TMBPolylineAnnotation>(nativeManager.Annotations);
-            annotations.Remove(item);
-
-            nativeManager.Annotations = annotations.ToArray();
+            nativeManager.RemoveAnnotationById(annotationIDs[i]);
         }
     }
 }
diff --git a/src/libs/Mapbox.Maui/Platforms/iOS/MapboxViewHandler.Annotations.cs b/src/libs/Mapbox.Maui/Platforms/iOS/MapboxViewHandler.Annotations.cs
@@ -58,6 +58,7 @@ public IPointAnnotationManager CreatePointAnnotationManager(
                 clusterOptions.TextField?.ToTMBValue(),
                 clusterOptions.ClusterRadius,
                 clusterOptions.ClusterMaxZoom,
+                clusterOptions.ClusterMinPoints,
                 clusterOptions.ClusterProperties?.ToNative()
             );
         }
diff --git a/src/qs/MapboxMauiQs/MapboxMauiQs.csproj b/src/qs/MapboxMauiQs/MapboxMauiQs.csproj
@@ -105,8 +105,8 @@
 		</Compile>
 	</ItemGroup>
 	<ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">
-		<PackageReference Include="MapboxMapsObjC.iOS" Version="11.4.0.2" />
-		<PackageReference Include="MapboxMaps.iOS" Version="11.4.0.1" />
+		<PackageReference Include="MapboxMapsObjC.iOS" Version="11.5.1" />
+		<PackageReference Include="MapboxMaps.iOS" Version="11.5.1" />
 
 		<Compile Include="..\..\libs\Mapbox.Maui\Platforms\iOS\**\**\*.cs">
 			<Link>Platforms\iOS\Shared\%(RecursiveDir)%(Filename)%(Extension)</Link>

Original file line number	Diff line number	Diff line change
`@@ -49,31 +49,21 @@ public override void AddAnnotations(params CircleAnnotation[] xitems)`
`49`	`49`	`{`
`50`	`50`	`var items = xitems`
`51`	`51`	`.Select(x => x.ToPlatformValue())`
`52`		`- .ToList();`
`53`		`-`
`54`		`- nativeManager.Annotations = nativeManager.Annotations`
`55`		`- .Union(items)`
`56`	`52`	`.ToArray();`
	`53`	`+`
	`54`	`+ nativeManager.AddAnnotations(items);`
`57`	`55`	`}`
`58`	`56`
`59`	`57`	`public override void RemoveAllAnnotations()`
`60`	`58`	`{`
`61`		`- nativeManager.Annotations = Array.Empty<TMBCircleAnnotation>();`
	`59`	`+ nativeManager.RemoveAllAnnotations();`
`62`	`60`	`}`
`63`	`61`
`64`	`62`	`public override void RemoveAnnotations(params string[] annotationIDs)`
`65`	`63`	`{`
`66`	`64`	`for (int i = 0; i < annotationIDs.Length; i++)`
`67`	`65`	`{`
`68`		`- var item = nativeManager.Annotations.FirstOrDefault(`
`69`		`- x => x.Id == annotationIDs[i]`
`70`		`- );`
`71`		`- if (item == null) continue;`
`72`		`-`
`73`		`- var annotations = new List<TMBCircleAnnotation>(nativeManager.Annotations);`
`74`		`- annotations.Remove(item);`
`75`		`-`
`76`		`- nativeManager.Annotations = annotations.ToArray();`
	`66`	`+ nativeManager.RemoveAnnotationById(annotationIDs[i]);`
`77`	`67`	`}`
`78`	`68`	`}`
`79`	`69`	`}`
Original file line number	Diff line number	Diff line change
`@@ -170,31 +170,21 @@ public override void AddAnnotations(params PointAnnotation[] xitems)`
`170`	`170`	`{`
`171`	`171`	`var items = xitems`
`172`	`172`	`.Select(x => x.ToPlatformValue())`
`173`		`- .ToList();`
`174`		`-`
`175`		`- nativeManager.Annotations = nativeManager.Annotations`
`176`		`- .Union(items)`
`177`	`173`	`.ToArray();`
	`174`	`+`
	`175`	`+ nativeManager.AddAnnotations(items);`
`178`	`176`	`}`
`179`	`177`
`180`	`178`	`public override void RemoveAllAnnotations()`
`181`	`179`	`{`
`182`		`- nativeManager.Annotations = Array.Empty<TMBPointAnnotation>();`
	`180`	`+ nativeManager.RemoveAllAnnotations();`
`183`	`181`	`}`
`184`	`182`
`185`	`183`	`public override void RemoveAnnotations(params string[] annotationIDs)`
`186`	`184`	`{`
`187`	`185`	`for (int i = 0; i < annotationIDs.Length; i++)`
`188`	`186`	`{`
`189`		`- var item = nativeManager.Annotations.FirstOrDefault(`
`190`		`- x => x.Id == annotationIDs[i]`
`191`		`- );`
`192`		`- if (item == null) continue;`
`193`		`-`
`194`		`- var annotations = new List<TMBPointAnnotation>(nativeManager.Annotations);`
`195`		`- annotations.Remove(item);`
`196`		`-`
`197`		`- nativeManager.Annotations = annotations.ToArray();`
	`187`	`+ nativeManager.RemoveAnnotationById(annotationIDs[i]);`
`198`	`188`	`}`
`199`	`189`	`}`
`200`	`190`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,31 +39,21 @@ public override void AddAnnotations(params PolygonAnnotation[] xitems)`
`39`	`39`	`{`
`40`	`40`	`var items = xitems`
`41`	`41`	`.Select(x => x.ToPlatformValue())`
`42`		`- .ToList();`
`43`		`-`
`44`		`- nativeManager.Annotations = nativeManager.Annotations`
`45`		`- .Union(items)`
`46`	`42`	`.ToArray();`
	`43`	`+`
	`44`	`+ nativeManager.AddAnnotations(items);`
`47`	`45`	`}`
`48`	`46`
`49`	`47`	`public override void RemoveAllAnnotations()`
`50`	`48`	`{`
`51`		`- nativeManager.Annotations = Array.Empty<TMBPolygonAnnotation>();`
	`49`	`+ nativeManager.RemoveAllAnnotations();`
`52`	`50`	`}`
`53`	`51`
`54`	`52`	`public override void RemoveAnnotations(params string[] annotationIDs)`
`55`	`53`	`{`
`56`	`54`	`for (int i = 0; i < annotationIDs.Length; i++)`
`57`	`55`	`{`
`58`		`- var item = nativeManager.Annotations.FirstOrDefault(`
`59`		`- x => x.Id == annotationIDs[i]`
`60`		`- );`
`61`		`- if (item == null) continue;`
`62`		`-`
`63`		`- var annotations = new List<TMBPolygonAnnotation>(nativeManager.Annotations);`
`64`		`- annotations.Remove(item);`
`65`		`-`
`66`		`- nativeManager.Annotations = annotations.ToArray();`
	`56`	`+ nativeManager.RemoveAnnotationById(annotationIDs[i]);`
`67`	`57`	`}`
`68`	`58`	`}`
`69`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -59,31 +59,21 @@ public override void AddAnnotations(params PolylineAnnotation[] xitems)`
`59`	`59`	`{`
`60`	`60`	`var items = xitems`
`61`	`61`	`.Select(x => x.ToPlatformValue())`
`62`		`- .ToList();`
`63`		`-`
`64`		`- nativeManager.Annotations = nativeManager.Annotations`
`65`		`- .Union(items)`
`66`	`62`	`.ToArray();`
	`63`	`+`
	`64`	`+ nativeManager.AddAnnotations(items);`
`67`	`65`	`}`
`68`	`66`
`69`	`67`	`public override void RemoveAllAnnotations()`
`70`	`68`	`{`
`71`		`- nativeManager.Annotations = Array.Empty<TMBPolylineAnnotation>();`
	`69`	`+ nativeManager.RemoveAllAnnotations();`
`72`	`70`	`}`
`73`	`71`
`74`	`72`	`public override void RemoveAnnotations(params string[] annotationIDs)`
`75`	`73`	`{`
`76`	`74`	`for (int i = 0; i < annotationIDs.Length; i++)`
`77`	`75`	`{`
`78`		`- var item = nativeManager.Annotations.FirstOrDefault(`
`79`		`- x => x.Id == annotationIDs[i]`
`80`		`- );`
`81`		`- if (item == null) continue;`
`82`		`-`
`83`		`- var annotations = new List<TMBPolylineAnnotation>(nativeManager.Annotations);`
`84`		`- annotations.Remove(item);`
`85`		`-`
`86`		`- nativeManager.Annotations = annotations.ToArray();`
	`76`	`+ nativeManager.RemoveAnnotationById(annotationIDs[i]);`
`87`	`77`	`}`
`88`	`78`	`}`
`89`	`79`	`}`
Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,7 @@ public IPointAnnotationManager CreatePointAnnotationManager(`
`58`	`58`	`clusterOptions.TextField?.ToTMBValue(),`
`59`	`59`	`clusterOptions.ClusterRadius,`
`60`	`60`	`clusterOptions.ClusterMaxZoom,`
	`61`	`+ clusterOptions.ClusterMinPoints,`
`61`	`62`	`clusterOptions.ClusterProperties?.ToNative()`
`62`	`63`	`);`
`63`	`64`	`}`