From 7df977684e8f1159c49b0d713c643318ab92e81c Mon Sep 17 00:00:00 2001 From: davidejensen Date: Thu, 21 Nov 2024 08:54:00 +0100 Subject: [PATCH] fix: minor clustering fixes (#2845) * fix: fixed clustering disabling of pois and favorites * set default values for zoom levels --- .../CategoryControllers/CategoryMarkersController.cs | 8 ++++---- .../MapLayers/Favorites/FavoritesMarkerController.cs | 9 +++++---- .../ScenesOfInterestMarkersController.cs | 9 +++++---- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/Explorer/Assets/DCL/MapRenderer/MapLayers/Categories/CategoryControllers/CategoryMarkersController.cs b/Explorer/Assets/DCL/MapRenderer/MapLayers/Categories/CategoryControllers/CategoryMarkersController.cs index 50fb8384dd..911a0f84dc 100644 --- a/Explorer/Assets/DCL/MapRenderer/MapLayers/Categories/CategoryControllers/CategoryMarkersController.cs +++ b/Explorer/Assets/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 index f5643df01c..4bb0e741d8 100644 --- 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 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/Explorer/Assets/DCL/MapRenderer/MapLayers/PointsOfInterest/ScenesOfInterestMarkersController.cs b/Explorer/Assets/DCL/MapRenderer/MapLayers/PointsOfInterest/ScenesOfInterestMarkersController.cs index 239ee2ee77..42714e49db 100644 --- a/Explorer/Assets/DCL/MapRenderer/MapLayers/PointsOfInterest/ScenesOfInterestMarkersController.cs +++ b/Explorer/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;