- align with new native APIs for iOS

Author: tuyen-vuduc

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

@@ -61,7 +61,7 @@
 		<RepositoryUrl>https://github.com/tuyen-vuduc/mapbox-maui</RepositoryUrl>
 		<PackageProjectUrl>https://mapbox.tuyen-vuduc.tech</PackageProjectUrl>
 		<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
-		<PackageVersion>11.5.0-alpha03</PackageVersion>
+		<PackageVersion>11.5.1-alpha01</PackageVersion>
 		<PackageReadmeFile>README.md</PackageReadmeFile>
 		<PackageLicenseFile>LICENSE</PackageLicenseFile>
 		<PackageIcon>tv-mapbox.png</PackageIcon>
@@ -94,7 +94,7 @@
 		<PackageReference Include="Xamarin.AndroidX.Annotation" Version="1.8.0.1" />
 	</ItemGroup>
 	<ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">
-		<PackageReference Include="MapboxMapsObjC.iOS" Version="11.5.2" />
+		<PackageReference Include="MapboxMapsObjC.iOS" Version="11.5.2.2" />
 		<PackageReference Include="MapboxMaps.iOS" Version="11.5.2" />
 	</ItemGroup>
 	<ItemGroup>

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

@@ -293,9 +293,15 @@ private static void HandleMapboxStyleChanged(MapboxViewHandler handler, IMapboxV
 
         mapView.MapboxMap().LoadStyleWithUri(styleUri, null, (error) =>
         {
-            if (error == null) return;
+            if (error is not null)
+            {
+                System.Diagnostics.Debug.WriteLine(error.LocalizedDescription);
+                return;
+            }
+
+            if (handler.VirtualView is not MapboxView mapboxView) return;
 
-            System.Diagnostics.Debug.WriteLine(error.LocalizedDescription);
+            mapboxView.InvokeStyleLoaded();
         });
     }
 

src/libs/Mapbox.Maui/Platforms/iOS/Viewport/ViewportExtensions.cs

@@ -1,4 +1,5 @@
 using MapboxMapsObjC;
+using ObjCRuntime;
 using X = MapboxMaui.Viewport;
 
 namespace MapboxMaui;
@@ -112,12 +113,16 @@ public static TMBOverviewViewportStateOptions ToNative(
     }
 
     public static X.IViewportState ToX(this ITMBViewportState state)
-        => state switch
+    {
+        try
         {
-            TMBFollowPuckViewportState followPuckViewportState => followPuckViewportState.ToX(),
-            TMBOverviewViewportState overviewViewportState => overviewViewportState.ToX(),
-            _ => throw new NotSupportedException("Invalid ViewportState"),
-        };
+            return Runtime.GetNSObject<TMBOverviewViewportState>(state.Handle).ToX();
+        }
+        catch
+        {
+            return Runtime.GetNSObject<TMBFollowPuckViewportState>(state.Handle).ToX();
+        }
+    }
     public static X.IFollowPuckViewportState ToX(this TMBFollowPuckViewportState state)
         => new XFollowPuckViewPortState(state);
     public static X.IOverviewViewportState ToX(this TMBOverviewViewportState state)

src/qs/MapboxMauiQs/Examples/Camera/69.AdvancedViewportGestures/AdvancedViewportGesturesExample.cs

@@ -24,7 +24,6 @@ public AdvancedViewportGesturesExample()
 
         map.MapReady += Map_MapReady;
         map.MapLoaded += Map_MapLoaded;
-        map.StyleLoaded += Map_StyleLoaded;
     }
 
     public void ApplyQueryAttributes(IDictionary<string, object> query)
@@ -44,8 +43,6 @@ private async void Map_MapReady(object sender, EventArgs e)
         //};
 
         //map.CameraOptions = cameraOptions;
-        map.MapboxStyle = MapboxStyle.TRAFFIC_DAY;
-
         followPuckViewportState = map.Viewport.MakeFollowPuckViewportState(new FollowPuckViewportStateOptions
         {
             Bearing = 0,
@@ -73,6 +70,10 @@ private async void Map_MapReady(object sender, EventArgs e)
         };
         map.Sources = [geojsonSource];
         map.Layers = [lineLayer];
+
+        map.StyleLoaded += Map_StyleLoaded;
+        map.MapboxStyle = MapboxStyle.TRAFFIC_DAY;
+
     }
 
     private void Map_MapTapped(object sender, MapTappedEventArgs e)

src/qs/MapboxMauiQs/MapboxMauiQs.csproj

@@ -106,7 +106,7 @@
 		</Compile>
 	</ItemGroup>
 	<ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">
-		<PackageReference Include="MapboxMapsObjC.iOS" Version="11.5.2" />
+		<PackageReference Include="MapboxMapsObjC.iOS" Version="11.5.2.2" />
 		<PackageReference Include="MapboxMaps.iOS" Version="11.5.2" />
 
 		<Compile Include="..\..\libs\Mapbox.Maui\Platforms\iOS\**\**\*.cs">