- check and fix iOS binding

tuyen-vuduc · Aug 14, 2024 · 10d8004 · 10d8004
1 parent 8004443
commit 10d8004
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 11 deletions.
diff --git a/src/libs/Mapbox.Maui/IMapboxView.cs b/src/libs/Mapbox.Maui/IMapboxView.cs
@@ -87,14 +87,14 @@ public interface IMapboxController
     CoordinateBounds GetCoordinateBoundsForCamera(CameraOptions cameraOptions);
     ScreenPosition GetScreenPosition(IPosition position);
     CameraOptions? CameraForCoordinates(
-        IEnumerable<MapPosition> coordinates,
+        IEnumerable<IPosition> coordinates,
         CameraOptions? cameraOptions = default,
         Thickness? coordinatesPadding = default,
         double? maxZoom = default,
         ScreenPosition? offset = default
     );
     void CameraForCoordinates(
-        IEnumerable<MapPosition> coordinates,
+        IEnumerable<IPosition> coordinates,
         Action<CameraOptions?> completion,
         CameraOptions? cameraOptions = default,
         Thickness? coordinatesPadding = default,

diff --git a/src/libs/Mapbox.Maui/Platforms/Android/MapboxViewHandler.Controller.cs b/src/libs/Mapbox.Maui/Platforms/Android/MapboxViewHandler.Controller.cs
@@ -59,7 +59,7 @@ public ScreenPosition GetScreenPosition(IPosition position)
     *  Also empty [CameraOptions] are returned in case of an internal error.
     */
     public CameraOptions? CameraForCoordinates(
-        IEnumerable<MapPosition> coordinates,
+        IEnumerable<IPosition> coordinates,
         CameraOptions? cameraOptions = null,
         Thickness? coordinatesPadding = null,
         double? maxZoom = null,
@@ -71,7 +71,7 @@ public ScreenPosition GetScreenPosition(IPosition position)
 
         var result = mapView.MapboxMap.CameraForCoordinates(
             coordinates?.Select(x => x.ToGeoPoint()).ToList(),
-            cameraOptions?.ToNative(),
+            (cameraOptions?? new()).ToNative(),
             coordinatesPadding?.ToNative(),
             maxZoom?.ToNative(),
             offset?.ToScreenCoordinate()
@@ -91,7 +91,7 @@ public ScreenPosition GetScreenPosition(IPosition position)
     * @param completion Callback returning the [CameraOptions] object representing the provided parameters. Those [CameraOptions] always take into account actual MapView size and may return empty ([CameraOptions.isEmpty]) options only if an internal error has occurred.
     */
     public void CameraForCoordinates(
-        IEnumerable<MapPosition> coordinates,
+        IEnumerable<IPosition> coordinates,
         Action<CameraOptions?> completion,
         CameraOptions? cameraOptions = null,
         Thickness? coordinatesPadding = null,
@@ -108,7 +108,7 @@ public void CameraForCoordinates(
 
         mapView.MapboxMap.CameraForCoordinates(
             coordinates?.Select(x => x.ToGeoPoint()).ToList(),
-            cameraOptions?.ToNative(),
+            (cameraOptions??new()).ToNative(),
             coordinatesPadding?.ToNative(),
             maxZoom?.ToNative(),
             offset?.ToScreenCoordinate(),

diff --git a/src/libs/Mapbox.Maui/Platforms/iOS/MapboxViewHandler.Controller.cs b/src/libs/Mapbox.Maui/Platforms/iOS/MapboxViewHandler.Controller.cs
@@ -60,7 +60,7 @@ public ScreenPosition GetScreenPosition(IPosition position)
     *  Also empty [CameraOptions] are returned in case of an internal error.
     */
     public CameraOptions? CameraForCoordinates(
-        IEnumerable<MapPosition> coordinates,
+        IEnumerable<IPosition> coordinates,
         CameraOptions? cameraOptions = null,
         Thickness? coordinatesPadding = null,
         double? maxZoom = null,
@@ -73,7 +73,7 @@ public ScreenPosition GetScreenPosition(IPosition position)
         TMBCameraOptions? xresult = null;
         mapView.MapboxMap().CameraFor(
             coordinates?.Select(x => x.ToNSValue()).ToArray(),
-            cameraOptions?.ToNative(),
+            (cameraOptions?? new()).ToNative(),
             coordinatesPadding?.ToNSValue(),
             maxZoom?.ToNSNumber(),
             offset?.ToNSValue(),
@@ -96,7 +96,7 @@ public ScreenPosition GetScreenPosition(IPosition position)
     * @param completion Callback returning the [CameraOptions] object representing the provided parameters. Those [CameraOptions] always take into account actual MapView size and may return empty ([CameraOptions.isEmpty]) options only if an internal error has occurred.
     */
     public void CameraForCoordinates(
-        IEnumerable<MapPosition> coordinates,
+        IEnumerable<IPosition> coordinates,
         Action<CameraOptions?> completion,
         CameraOptions? cameraOptions = null,
         Thickness? coordinatesPadding = null,
@@ -114,7 +114,7 @@ public void CameraForCoordinates(
 
         mapView.MapboxMap().CameraFor(
             coordinates?.Select(x => x.ToNSValue()).ToArray(),
-            cameraOptions?.ToNative(),
+            (cameraOptions?? new()).ToNative(),
             coordinatesPadding?.ToNSValue(),
             maxZoom?.ToNSNumber(),
             offset?.ToNSValue(),

diff --git a/...boxMauiQs/Examples/Lab/70.BasicLocationPulsingCircle/BasicLocationPulsingCircleExample.cs b/...boxMauiQs/Examples/Lab/70.BasicLocationPulsingCircle/BasicLocationPulsingCircleExample.cs
@@ -1,3 +1,5 @@
+using MapboxMaui;
+
 namespace MapboxMauiQs;
 
 public class BasicLocationPulsingCircleExample : ContentPage, IExamplePage, IQueryAttributable
@@ -33,7 +35,8 @@ private async void OpenSettings(object obj)
                 ? "Hide user location" : "Show user location",
             map.LocationComponent.PulsingEnabled
                 ? "Hide pulsing" : "Show pulsing",
-            "Show accuracy ring"
+            "Show accuracy ring",
+            "Change map style"
         );
 
         switch (action) { 
@@ -48,6 +51,9 @@ private async void OpenSettings(object obj)
             case "Show accuracy ring":
                 ShowPulsingAccuracyRing(action);
                 break;
+            case "Change map style":
+                ToggleMapboxStyle(action);
+                break;
         }
     }
 
@@ -118,5 +124,17 @@ private void Map_IndicatorPositionChanged(object sender, IndicatorPositionChange
         {
             FocalPoint = map.MapboxController.GetScreenPosition(e.Position),
         };
+
+        // var bounds = map.MapboxController.GetCoordinateBoundsForCamera(map.CameraController.CameraState);
+        // IEnumerable<IPosition> coords = new IPosition[] {
+        //         bounds.Southwest.ToPoint().Coordinates,
+        //         bounds.Northeast.ToPoint().Coordinates
+        //     };
+        // map.MapboxController.CameraForCoordinates(
+        //     coords
+        //     , completion: (x) =>
+        //     {
+
+        //     });
     }
 }