perf(map): simplify preclipped area queries

2026-07-21 23:30:52 +02:00
parent 17d0d85778
commit 80df5e70c9
2 changed files with 80 additions and 3 deletions
@@ -633,16 +633,17 @@ def select_vector_features(
            payload.bbox.model_dump(),
            selection_area.geometry,
        )
-        full_dataset_area = covers_full_area and VectorFeatureService.can_use_full_area_fast_path(
+        dataset_is_preclipped_to_area = VectorFeatureService.can_use_full_area_fast_path(
            dataset,
            selection_area.id,
        )
+        full_dataset_area = covers_full_area and dataset_is_preclipped_to_area
        preclipped_partition_filter = VectorFeatureService.preclipped_partition_filter(
            dataset,
            getattr(selection_area, "name", None),
        )
        selection_kwargs.update(
-            selection_geometry=selection_geometry,
+            selection_geometry=None if dataset_is_preclipped_to_area else selection_geometry,
            selection_area_id=selection_area.id,
            full_dataset_area=full_dataset_area,
            preclipped_partition_filter=preclipped_partition_filter,
@@ -655,7 +656,7 @@ def select_vector_features(
            "total_feature_count": result.get("total_feature_count"),
        }
        if selection_area is not None:
-            summary_kwargs["selection_geometry"] = selection_geometry
+            summary_kwargs["selection_geometry"] = None if dataset_is_preclipped_to_area else selection_geometry
            summary_kwargs["full_dataset_area"] = full_dataset_area
            summary_kwargs["preclipped_partition_filter"] = preclipped_partition_filter
        result["summary"] = VectorFeatureService.summarize_features_by_bbox(db, **summary_kwargs)