Merge pull request #415 from PDOK/remove-bbox-index-and-intersects

fix(features_search): we only need to intersect on the geom, not the bbox

Author: rkettelerij

internal/ogc/features/datasources/postgres/postgres.go

@@ -236,7 +236,7 @@ func (pg *Postgres) SearchFeaturesAcrossCollections(ctx context.Context, criteri
 		criteria.OutputSRID = d.WGS84SRIDPostgis
 	}
 
-	bboxFilter, bboxQueryArgs, err := bboxToSQL(criteria.Bbox, criteria.InputSRID, "r."+searchGeomColumn, "r."+searchBboxColumn)
+	bboxFilter, bboxQueryArgs, err := bboxToSQL(criteria.Bbox, criteria.InputSRID, "r."+searchGeomColumn)
 	if err != nil {
 		return nil, err
 	}
@@ -313,7 +313,7 @@ func (pg *Postgres) makeFeaturesQuery(propConfig *config.FeatureProperties, rela
 	var bboxNamedParams map[string]any
 	if criteria.Bbox != nil {
 		var err error
-		bboxClause, bboxNamedParams, err = bboxToSQL(criteria.Bbox, criteria.InputSRID, table.GeometryColumnName, "")
+		bboxClause, bboxNamedParams, err = bboxToSQL(criteria.Bbox, criteria.InputSRID, table.GeometryColumnName)
 		if err != nil {
 			return "", nil, err
 		}
@@ -488,21 +488,14 @@ func makeSearchQuery(index string, bboxFilter string, axisOrder d.AxisOrder) str
 	LIMIT (@lm::int)`, index, selectGeom, selectBbox, bboxFilter) // don't add user input here, use named params for user input!
 }
 
-func bboxToSQL(bbox *geom.Bounds, bboxSRID d.SRID, geomColumn string, bboxColumn string) (string, map[string]any, error) {
+func bboxToSQL(bbox *geom.Bounds, bboxSRID d.SRID, geomColumn string) (string, map[string]any, error) {
 	var bboxFilter, bboxWkt string
 	var bboxNamedParams map[string]any
 	var err error
 	if bbox != nil {
-		if bboxColumn == "" {
-			bboxFilter = fmt.Sprintf(`and
+		bboxFilter = fmt.Sprintf(`and
 				st_intersects(st_transform(%[1]s, @bboxSrid::int), st_geomfromtext(@bboxWkt::text, @bboxSrid::int))
 			`, geomColumn)
-		} else {
-			bboxFilter = fmt.Sprintf(`and
-				(st_intersects(st_transform(%[1]s, @bboxSrid::int), st_geomfromtext(@bboxWkt::text, @bboxSrid::int)) or
-				st_intersects(st_transform(%[2]s, @bboxSrid::int), st_geomfromtext(@bboxWkt::text, @bboxSrid::int)))
-			`, geomColumn, bboxColumn)
-		}
 		bboxWkt, err = wkt.Marshal(bbox.Polygon())
 		if err != nil {
 			return "", nil, err

internal/ogc/features_search/etl/load/postgres_ddl.go

@@ -12,14 +12,13 @@ import (
 const (
 	indexNameFullText = "ts_idx"
 	indexNameGeometry = "geometry_idx"
-	indexNameBbox     = "bbox_idx"
 	indexNamePreRank  = "pre_rank_idx"
 )
 
 var (
 	postgresExtensions = []string{"postgis", "unaccent", "pg_prewarm", "pg_buffercache"}
 
-	indexNames = []string{indexNameFullText, indexNameGeometry, indexNameBbox, indexNamePreRank}
+	indexNames = []string{indexNameFullText, indexNameGeometry, indexNamePreRank}
 
 	//nolint:dupword
 	tableDefinition = `
@@ -217,16 +216,6 @@ func (p *Postgres) createIndexes(table string, usePrefix bool) error {
 		return fmt.Errorf("error creating geometry GIST index: %w", err)
 	}
 
-	// GIST indexes for bbox column to support search within a bounding box
-	indexName = indexNameBbox
-	if usePrefix {
-		indexName = fmt.Sprintf("%s_%s", table, indexNameBbox)
-	}
-	_, err = p.db.Exec(context.Background(), fmt.Sprintf(`create index if not exists %[2]s on only %[1]s using gist(bbox);`, table, indexName))
-	if err != nil {
-		return fmt.Errorf("error creating bbox GIST index: %w", err)
-	}
-
 	// index used to pre-rank results when generic search terms are used
 	indexName = indexNamePreRank
 	if usePrefix {