Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implemented relevance #30

Merged
merged 2 commits into from
Jan 31, 2025
Merged

Implemented relevance #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f49bb03
Implemented relevance
gerdos82 Jan 31, 2025
431b6d3
Fix minor typo
gerdos82 Jan 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 28 additions & 24 deletions internal/search/datasources/postgres/postgres.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ func (p *Postgres) SearchFeaturesAcrossCollections(ctx context.Context, searchTe
query := makeSearchQuery(p.searchIndex, srid)

// Execute search query
names, ints := collections.NamesAndVersions()
rows, err := p.db.Query(queryCtx, query, limit, termsWildcardConcat, termExactConcat, names, ints)
names, versions, relevance := collections.NamesAndVersionsAndRelevance()
rows, err := p.db.Query(queryCtx, query, limit, termsWildcardConcat, termExactConcat, names, versions, relevance)
if err != nil {
return nil, fmt.Errorf("query '%s' failed: %w", query, err)
}
Expand All @@ -82,14 +82,14 @@ func makeSearchQuery(index string, srid d.SRID) string {
SELECT to_tsquery('simple', $3) query
)
SELECT
rn.display_name AS display_name,
rn.feature_id AS feature_id,
rn.collection_id AS collection_id,
rn.collection_version AS collection_version,
rn.geometry_type AS geometry_type,
rn.display_name,
rn.feature_id,
rn.collection_id,
rn.collection_version,
rn.geometry_type,
st_transform(rn.bbox, %[2]d)::geometry AS bbox,
rn.rank AS rank,
rn.highlighted_text AS highlighted_text
rn.rank,
rn.highlighted_text
FROM (
SELECT
*,
Expand All @@ -105,35 +105,39 @@ func makeSearchQuery(index string, srid d.SRID) string {
) AS row_number
FROM (
SELECT
display_name,
feature_id,
collection_id,
collection_version,
geometry_type,
bbox,
CASE WHEN display_name=suggest THEN
ts_rank(ts, (SELECT query FROM query_exact), 1) + 0.01 + ts_rank(ts, (SELECT query FROM query_wildcard), 1)
r.display_name,
r.feature_id,
r.collection_id,
r.collection_version,
r.geometry_type,
r.bbox,
CASE WHEN r.display_name=r.suggest THEN
(ts_rank(r.ts, (SELECT query FROM query_exact), 1) + 0.01 + ts_rank(r.ts, (SELECT query FROM query_wildcard), 1)) * rel.relevance
ELSE
ts_rank(ts, (SELECT query FROM query_exact), 1) + ts_rank(ts, (SELECT query FROM query_wildcard), 1)
(ts_rank(r.ts, (SELECT query FROM query_exact), 1) + ts_rank(r.ts, (SELECT query FROM query_wildcard), 1)) * rel.relevance
END AS rank,
ts_headline('simple', suggest, (SELECT query FROM query_wildcard)) AS highlighted_text
ts_headline('simple', r.suggest, (SELECT query FROM query_wildcard)) AS highlighted_text
FROM
%[1]s
%[1]s r
LEFT JOIN
(SELECT * FROM unnest($4::text[], $6::float[]) rel(collection_id,relevance)) rel
ON
rel.collection_id = r.collection_id
WHERE
ts @@ (SELECT query FROM query_wildcard) AND (collection_id, collection_version) IN (
r.ts @@ (SELECT query FROM query_wildcard) AND (r.collection_id, r.collection_version) IN (
-- make a virtual table by creating tuples from the provided arrays.
SELECT * FROM unnest($4::text[], $5::int[])
)
ORDER BY -- keep the same as outer and row_number 'order by' clause
rank DESC,
display_name ASC
r.display_name ASC
LIMIT 500
) r
) rn
WHERE rn.row_number = 1
ORDER BY
rank DESC,
display_name ASC
rn.rank DESC,
rn.display_name ASC
LIMIT $1`, index, srid) // don't add user input here, use $X params for user input!

return query
Expand Down
21 changes: 18 additions & 3 deletions internal/search/domain/search.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@ package domain
import "strconv"

const (
VersionParam = "version"
VersionParam = "version"
RelevanceParam = "relevance"
DefaultRelevance = 0.5
)

// GeoJSON properties in search response
Expand All @@ -24,7 +26,7 @@ type CollectionsWithParams map[string]CollectionParams
// CollectionParams parameter key with associated value
type CollectionParams map[string]string

func (cp CollectionsWithParams) NamesAndVersions() (names []string, versions []int) {
func (cp CollectionsWithParams) NamesAndVersionsAndRelevance() (names []string, versions []int, relevance []float64) {
for name := range cp {
version, ok := cp[name][VersionParam]
if !ok {
Expand All @@ -34,8 +36,21 @@ func (cp CollectionsWithParams) NamesAndVersions() (names []string, versions []i
if err != nil {
continue
}

relevanceRaw, ok := cp[name][RelevanceParam]
if ok {
relevanceFloat, err := strconv.ParseFloat(relevanceRaw, 64)
if err == nil && relevanceFloat >= 0 && relevanceFloat <= 1 {
relevance = append(relevance, relevanceFloat)
} else {
relevance = append(relevance, DefaultRelevance)
}
} else {
relevance = append(relevance, DefaultRelevance)
}

versions = append(versions, versionNr)
names = append(names, name)
}
return names, versions
return names, versions, relevance
}
20 changes: 10 additions & 10 deletions internal/search/testdata/expected-search-den-building-collection-wgs84.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"displayName": "Abbewaal - Den Burg 1",
"highlight": "Abbewaal <b>Den</b> Burg",
"href": "https://example.com/ogc/v1/collections/buildings/items/51?f=json",
"score": 0.0607927106320858
"score": 0.0303963553160429
},
"geometry": {
"type": "Polygon",
Expand Down Expand Up @@ -67,7 +67,7 @@
"displayName": "Abbewaal - Den Burg 1",
"highlight": "Abbewaal <b>Den</b> Burg",
"href": "https://example.com/ogc/v1/collections/buildings/items/52?f=json",
"score": 0.0607927106320858
"score": 0.0303963553160429
},
"geometry": {
"type": "Polygon",
Expand Down Expand Up @@ -115,7 +115,7 @@
"displayName": "Abbewaal - Den Burg 10",
"highlight": "Abbewaal <b>Den</b> Burg",
"href": "https://example.com/ogc/v1/collections/buildings/items/32183?f=json",
"score": 0.0607927106320858
"score": 0.0303963553160429
},
"geometry": {
"type": "Polygon",
Expand Down Expand Up @@ -163,7 +163,7 @@
"displayName": "Abbewaal - Den Burg 10",
"highlight": "Abbewaal <b>Den</b> Burg",
"href": "https://example.com/ogc/v1/collections/buildings/items/53?f=json",
"score": 0.0607927106320858
"score": 0.0303963553160429
},
"geometry": {
"type": "Polygon",
Expand Down Expand Up @@ -211,7 +211,7 @@
"displayName": "Abbewaal - Den Burg 10",
"highlight": "Abbewaal <b>Den</b> Burg",
"href": "https://example.com/ogc/v1/collections/buildings/items/32184?f=json",
"score": 0.0607927106320858
"score": 0.0303963553160429
},
"geometry": {
"type": "Polygon",
Expand Down Expand Up @@ -259,7 +259,7 @@
"displayName": "Abbewaal - Den Burg 10",
"highlight": "Abbewaal <b>Den</b> Burg",
"href": "https://example.com/ogc/v1/collections/buildings/items/54?f=json",
"score": 0.0607927106320858
"score": 0.0303963553160429
},
"geometry": {
"type": "Polygon",
Expand Down Expand Up @@ -307,7 +307,7 @@
"displayName": "Abbewaal - Den Burg 11",
"highlight": "Abbewaal <b>Den</b> Burg",
"href": "https://example.com/ogc/v1/collections/buildings/items/22549?f=json",
"score": 0.0607927106320858
"score": 0.0303963553160429
},
"geometry": {
"type": "Polygon",
Expand Down Expand Up @@ -355,7 +355,7 @@
"displayName": "Abbewaal - Den Burg 13",
"highlight": "Abbewaal <b>Den</b> Burg",
"href": "https://example.com/ogc/v1/collections/buildings/items/56?f=json",
"score": 0.0607927106320858
"score": 0.0303963553160429
},
"geometry": {
"type": "Polygon",
Expand Down Expand Up @@ -403,7 +403,7 @@
"displayName": "Abbewaal - Den Burg 13",
"highlight": "Abbewaal <b>Den</b> Burg",
"href": "https://example.com/ogc/v1/collections/buildings/items/55?f=json",
"score": 0.0607927106320858
"score": 0.0303963553160429
},
"geometry": {
"type": "Polygon",
Expand Down Expand Up @@ -451,7 +451,7 @@
"displayName": "Abbewaal - Den Burg 15",
"highlight": "Abbewaal <b>Den</b> Burg",
"href": "https://example.com/ogc/v1/collections/buildings/items/57?f=json",
"score": 0.0607927106320858
"score": 0.0303963553160429
},
"geometry": {
"type": "Polygon",
Expand Down
Loading
Loading