fix: choropleth statistics query with map bounds

hub/graphql/types/model_types.py

@@ -1591,6 +1591,7 @@ def statistics_for_choropleth(
     # they're gonna all be geo-joined for now.
     stats_config: stats.StatisticsConfig,
     choropleth_config: Optional[stats.ChoroplethConfig] = None,
+    map_bounds: Optional[stats.MapBounds] = None,
 ) -> List[GroupedDataCount]:
     choropleth_config = choropleth_config or stats.ChoroplethConfig()
 
@@ -1625,9 +1626,7 @@ def statistics_for_choropleth(
 
     return (
         stats.statistics(
-            stats_config,
-            choropleth_config,
-            as_grouped_data=True,
+            stats_config, choropleth_config, as_grouped_data=True, map_bounds=map_bounds
         )
         or []
     )  # Convert None to empty list for better front-end integration

hub/graphql/types/stats.py

@@ -182,14 +182,14 @@ class ChoroplethConfig:
     category_key: Optional[str] = None
     count_key: Optional[str] = None
     is_count_key_percentage: Optional[bool] = False
-    map_bounds: Optional[MapBounds] = None
 
 
 def statistics(
     conf: StatisticsConfig,
     choropleth_config: Optional[ChoroplethConfig] = None,
     as_grouped_data: bool = False,
     return_numeric_keys_only: Optional[bool] = False,
+    map_bounds: Optional[MapBounds] = None,
 ):
     choropleth_config = choropleth_config or ChoroplethConfig()
 
@@ -227,8 +227,7 @@ def statistics(
 
     # Actual SELECT statement is manually constructed below
     qs = models.GenericData.objects.values_list("id")
-    if choropleth_config.map_bounds:
-        map_bounds = choropleth_config.map_bounds
+    if map_bounds:
         bbox_coords = (
             (map_bounds.west, map_bounds.north),  # Top left
             (map_bounds.east, map_bounds.north),  # Top right

nextjs/src/app/reports/[id]/useDataByBoundary.ts

@@ -46,12 +46,12 @@ const useDataByBoundary = ({
     STATISTICS_QUERY,
     {
       variables: {
+        mapBounds,
         config: {
           ...(view?.mapOptions?.choropleth.advancedStatisticsConfig! || {}),
           groupByArea: tileset.analyticalAreaType!,
         },
         choroplethConfig: {
-          mapBounds,
           categoryKey:
             view?.mapOptions?.choropleth.dataType ===
             StatisticalDataType.Nominal
@@ -126,10 +126,12 @@ export const STATISTICS_QUERY = gql`
   query Statistics(
     $config: StatisticsConfig!
     $choroplethConfig: ChoroplethConfig!
+    $mapBounds: MapBounds
   ) {
     statisticsForChoropleth(
       statsConfig: $config
       choroplethConfig: $choroplethConfig
+      mapBounds: $mapBounds
     ) {
       label
       gss