- fix event hookup

Author: tuyen-vuduc

src/libs/Mapbox.Maui/MauiAppBuilderExtensions.cs

@@ -11,6 +11,14 @@
 
 public static class MauiAppBuilderExtensions
 {
+    public static void Add<T>(this HashSet<T> set, params T[] items)
+    {
+        foreach (var item in items)
+        {
+            set.Add(item);
+        }
+    }
+
     public static MauiAppBuilder UseMapbox(
         this MauiAppBuilder builder,
         string accessToken = default)

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

@@ -11,9 +11,12 @@ partial class MapboxViewHandler
     private UITapGestureRecognizer mapTapGestureRecognizer;
     private UILongPressGestureRecognizer mapLongPressGestureRecognizer;
     private XViewportStatusObserver viewportStatusObserver;
+    private HashSet<TMBCancelable> cancelables;
 
     void RegisterEvents(PlatformView platformView)
     {
+        cancelables ??= new HashSet<TMBCancelable>();
+
         var mapboxView = VirtualView as MapboxView;
         if (mapboxView is not null)
         {
@@ -31,22 +34,24 @@ void RegisterEvents(PlatformView platformView)
 
         var mapboxMap = mapView.MapboxMap();
 
-        mapboxMap.OnCameraChanged(data =>
-        {
-            mapboxView?.InvokeCameraChanged(data.CameraState.ToX());
-        });
-        mapboxMap.OnMapLoaded(_ =>
-        {
-            mapboxView?.InvokeMapLoaded();
-        });
-        mapboxMap.OnMapLoadingError(_ =>
-        {
-            mapboxView?.InvokeMapLoadingError();
-        });
-        mapboxMap.OnStyleLoaded(_ =>
-        {
-            mapboxView?.InvokeStyleLoaded();
-        });
+        cancelables.Add(
+            mapboxMap.OnCameraChanged(data =>
+            {
+                mapboxView?.InvokeCameraChanged(data.CameraState.ToX());
+            }),
+            mapboxMap.OnMapLoaded(_ =>
+            {
+                mapboxView?.InvokeMapLoaded();
+            }),
+            mapboxMap.OnMapLoadingError(_ =>
+            {
+                mapboxView?.InvokeMapLoadingError();
+            }),
+            mapboxMap.OnStyleLoaded(_ =>
+            {
+                mapboxView?.InvokeStyleLoaded();
+            })
+        );
 
         mapTapGestureRecognizer = new UITapGestureRecognizer(HandleMapTapped);
         mapView.AddGestureRecognizer(mapTapGestureRecognizer);
@@ -61,8 +66,10 @@ void RegisterEvents(PlatformView platformView)
 
         mapView.Gestures().WeakDelegate = new XTMBGestureManagerDelegate(mapboxView);
 
-        mapView.Location().OnLocationChangeWithHandler(HandleLocationChanged);
-        mapView.Location().OnHeadingChangeWithHandler(HandleHeadingChanged);
+        cancelables.Add(
+            mapView.Location().OnLocationChangeWithHandler(HandleLocationChanged),
+            mapView.Location().OnHeadingChangeWithHandler(HandleHeadingChanged)
+        );
     }
 
     private void HandleHeadingChanged(TMBHeading heading)
@@ -97,6 +104,12 @@ void UnRegisterEvents(PlatformView platformView)
             mapboxView.Viewport = null;
         }
 
+        foreach (var cancelable in cancelables)
+        {
+            cancelable?.Dispose();
+        }
+        cancelables.Clear();
+
         var mapView = platformView.MapView;
         if (mapView == null) return;
 

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

@@ -307,7 +307,7 @@ private static void HandleMapboxStyleChanged(MapboxViewHandler handler, IMapboxV
 
     protected override PlatformView CreatePlatformView()
         => new PlatformView(ACCESS_TOKEN);
-
+    
     protected override void DisconnectHandler(PlatformView platformView)
     {
         UnRegisterEvents(platformView);

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

@@ -35,45 +35,6 @@ public void ApplyQueryAttributes(IDictionary<string, object> query)
 
     private async void Map_MapReady(object sender, EventArgs e)
     {
-        //var centerLocation = new MapPosition(37.3230, -122.0322); // Cupertino
-        //var cameraOptions = new CameraOptions
-        //{
-        //    Center = centerLocation,
-        //    Zoom = 14,
-        //};
-
-        //map.CameraOptions = cameraOptions;
-        followPuckViewportState = map.Viewport.MakeFollowPuckViewportState(new FollowPuckViewportStateOptions
-        {
-            Bearing = 0,
-            Padding = new Thickness(200, 0, 0, 0),
-        });
-
-        routePoints = await LoadGeojson();
-        overviewViewportState = map.Viewport.MakeOverviewViewportState(new OverviewViewportStateOptions
-        {
-            Geometry = routePoints,
-            Padding = 100,
-        });
-
-        var geojsonSource = new GeoJSONSource(GEOJSON_SOURCE_ID)
-        {
-            Data = routePoints
-        };
-        var lineLayer = new LineLayer(ROUTE_LINE_LAYER_ID)
-        {
-            Source = GEOJSON_SOURCE_ID,
-            LineColor = MAPBOX_BLUE,
-            LineWidth = 10.0,
-            LineCap = MapboxMaui.LineCap.Round,
-            LineJoin = MapboxMaui.LineJoin.Round,
-        };
-        map.Sources = [geojsonSource];
-        map.Layers = [lineLayer];
-
-        map.StyleLoaded += Map_StyleLoaded;
-        map.MapboxStyle = MapboxStyle.TRAFFIC_DAY;
-
     }
 
     private void Map_MapTapped(object sender, MapTappedEventArgs e)
@@ -156,9 +117,48 @@ private void ClearAdvancedGesturesForFollowPuckViewportState()
         //map.GestureShoved -= HandleGestureShoved;
     }
 
-    private void Map_MapLoaded(object sender, EventArgs e)
+    private async void Map_MapLoaded(object sender, EventArgs e)
     {
         // Setup Styles, Annotations, etc here
+
+        //var centerLocation = new MapPosition(37.3230, -122.0322); // Cupertino
+        //var cameraOptions = new CameraOptions
+        //{
+        //    Center = centerLocation,
+        //    Zoom = 14,
+        //};
+
+        //map.CameraOptions = cameraOptions;
+        followPuckViewportState = map.Viewport.MakeFollowPuckViewportState(new FollowPuckViewportStateOptions
+        {
+            Bearing = 0,
+            Padding = new Thickness(200, 0, 0, 0),
+        });
+
+        routePoints = await LoadGeojson();
+        overviewViewportState = map.Viewport.MakeOverviewViewportState(new OverviewViewportStateOptions
+        {
+            Geometry = routePoints,
+            Padding = 100,
+        });
+
+        var geojsonSource = new GeoJSONSource(GEOJSON_SOURCE_ID)
+        {
+            Data = routePoints
+        };
+        var lineLayer = new LineLayer(ROUTE_LINE_LAYER_ID)
+        {
+            Source = GEOJSON_SOURCE_ID,
+            LineColor = MAPBOX_BLUE,
+            LineWidth = 10.0,
+            LineCap = MapboxMaui.LineCap.Round,
+            LineJoin = MapboxMaui.LineJoin.Round,
+        };
+        map.Sources = [geojsonSource];
+        map.Layers = [lineLayer];
+
+        map.StyleLoaded += Map_StyleLoaded;
+        map.MapboxStyle = MapboxStyle.TRAFFIC_DAY;
     }
 
     async static Task<LineString> LoadGeojson()

src/qs/MapboxMauiQs/Examples/Lab/67.AddRemoveAnnotations/AddRemoveAnnotationsExample.cs

@@ -172,12 +172,13 @@ private void Map_MapReady(object sender, EventArgs e)
             Zoom = 14,
         };
 
-        map.MapboxStyle = MapboxStyle.MAPBOX_STREETS;
         map.CameraOptions = cameraOptions;
     }
 
     private void Map_MapLoaded(object sender, EventArgs e)
     {
+        map.MapboxStyle = MapboxStyle.MAPBOX_STREETS;
+
         // Setup Styles, Annotations, etc here
         map.Images = [
             new ResolvedImage(markerIconId, "red_marker"),