fix: minor clustering fixes (#2845)

* fix: fixed clustering disabling of pois and favorites * set default values for zoom levels
decentraland · Nov 21, 2024 · 7df9776 · 7df9776
1 parent d765283
commit 7df9776
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 12 deletions.
diff --git a/...ets/DCL/MapRenderer/MapLayers/Categories/CategoryControllers/CategoryMarkersController.cs b/...ets/DCL/MapRenderer/MapLayers/Categories/CategoryControllers/CategoryMarkersController.cs
@@ -36,9 +36,9 @@ internal delegate IClusterMarker ClusterMarkerBuilder(
 
         private Vector2Int decodePointer;
         private bool isEnabled;
-        private int zoomLevel;
-        private float baseZoom;
-        private float zoom;
+        private int zoomLevel = 1;
+        private float baseZoom = 1;
+        private float zoom = 1;
         private bool arePlacesLoaded;
 
         public CategoryMarkersController(
@@ -101,7 +101,7 @@ public void ApplyCameraZoom(float baseZoom, float zoom, int zoomLevel)
             this.zoom = zoom;
             this.zoomLevel = zoomLevel;
 
-            if(isEnabled)
+            if (isEnabled)
                 clusterController.UpdateClusters(zoomLevel, baseZoom, zoom, markers);
 
             foreach (ICategoryMarker marker in markers.Values)

diff --git a/Explorer/Assets/DCL/MapRenderer/MapLayers/Favorites/FavoritesMarkerController.cs b/Explorer/Assets/DCL/MapRenderer/MapLayers/Favorites/FavoritesMarkerController.cs
@@ -27,9 +27,9 @@ internal delegate IFavoritesMarker FavoritesMarkerBuilder(
         private readonly Dictionary<Vector2Int, IClusterableMarker> markers = new ();
 
         private bool isEnabled;
-        private int zoomLevel;
-        private float baseZoom;
-        private float zoom;
+        private int zoomLevel = 1;
+        private float baseZoom = 1;
+        private float zoom = 1;
 
         public FavoritesMarkerController(
             IPlacesAPIService placesAPIService,
@@ -83,7 +83,7 @@ public void ApplyCameraZoom(float baseZoom, float zoom, int zoomLevel)
             foreach (IFavoritesMarker marker in markers.Values)
                 marker.SetZoom(coordsUtils.ParcelSize, baseZoom, zoom);
 
-            if(isEnabled)
+            if (isEnabled)
                 clusterController.UpdateClusters(zoomLevel, baseZoom, zoom, markers);
 
             clusterController.ApplyCameraZoom(baseZoom, zoom);
@@ -161,6 +161,7 @@ public UniTask Disable(CancellationToken cancellationToken)
                 mapCullingController.StopTracking(marker);
                 marker.OnBecameInvisible();
             }
+            clusterController.Disable();
 
             isEnabled = false;
 

diff --git a/...er/Assets/DCL/MapRenderer/MapLayers/PointsOfInterest/ScenesOfInterestMarkersController.cs b/...er/Assets/DCL/MapRenderer/MapLayers/PointsOfInterest/ScenesOfInterestMarkersController.cs
@@ -37,9 +37,9 @@ internal delegate ISceneOfInterestMarker SceneOfInterestMarkerBuilder(
         private Vector2Int decodePointer;
 
         private bool isEnabled;
-        private int zoomLevel;
-        private float baseZoom;
-        private float zoom;
+        private int zoomLevel = 1;
+        private float baseZoom = 1;
+        private float zoom = 1;
 
         public ScenesOfInterestMarkersController(
             IPlacesAPIService placesAPIService,
@@ -155,7 +155,7 @@ public void ApplyCameraZoom(float baseZoom, float zoom, int zoomLevel)
             foreach (ISceneOfInterestMarker marker in markers.Values)
                 marker.SetZoom(coordsUtils.ParcelSize, baseZoom, zoom);
 
-            if(isEnabled)
+            if (isEnabled)
                 clusterController.UpdateClusters(zoomLevel, baseZoom, zoom, markers);
 
             clusterController.ApplyCameraZoom(baseZoom, zoom);
@@ -176,6 +176,7 @@ public UniTask Disable(CancellationToken cancellationToken)
                 marker.OnBecameInvisible();
             }
 
+            clusterController.Disable();
             isEnabled = false;
 
             return UniTask.CompletedTask;