improve typings

visgl · Sep 20, 2024 · 12ee0f8 · 12ee0f8
1 parent 33a1f87
commit 12ee0f8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/modules/carto/src/layers/cluster-tile-layer.ts b/modules/carto/src/layers/cluster-tile-layer.ts
@@ -106,7 +106,7 @@ class ClusterGeoJsonLayer<
     clusterIds: bigint[];
     hoveredFeatureId: bigint | number | null;
     highlightColor: number[];
-    aggregationCache: WeakMap<any, Map<number, any>>; // tile.content => Record<number, aggregationResultWhateverItIs>
+    aggregationCache: WeakMap<any, Map<number, ClusteredFeaturePropertiesT<FeaturePropertiesT>[]>>;
   };
 
   initializeState() {
@@ -148,7 +148,7 @@ class ClusterGeoJsonLayer<
         getWeight
       );
       needsUpdate ||= didAggregate;
-      data.push(...tileAggregationCache.get(aggregationLevels));
+      data.push(...tileAggregationCache.get(aggregationLevels)!);
     }
 
     data.sort((a, b) => Number(b.count - a.count));

diff --git a/modules/carto/src/layers/cluster-utils.ts b/modules/carto/src/layers/cluster-utils.ts
@@ -23,7 +23,7 @@ export type ParsedQuadbinTile<FeaturePropertiesT> = ParsedQuadbinCell<FeaturePro
  */
 export function aggregateTile<FeaturePropertiesT>(
   tile: Tile2DHeader<ParsedQuadbinTile<FeaturePropertiesT>>,
-  tileAggregationCache: Map<number, any>,
+  tileAggregationCache: Map<number, ClusteredFeaturePropertiesT<FeaturePropertiesT>[]>,
   aggregationLevels: number,
   properties: AggregationProperties<FeaturePropertiesT> = [],
   getPosition: Accessor<ParsedQuadbinCell<FeaturePropertiesT>, [number, number]>,
@@ -42,7 +42,7 @@ export function aggregateTile<FeaturePropertiesT>(
     }
 
     // Aggregated properties have changed, re-aggregate
-    tileAggregationCache.clear()
+    tileAggregationCache.clear();
   }
 
   const out: Record<number, any> = {};