Skip to content
Open
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
15 changes: 8 additions & 7 deletions ckanext/spatial/search/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -192,8 +192,8 @@ def index_dataset(self, dataset_dict):
return dataset_dict
wkt = shape.wkt

dataset_dict["spatial_geom"] = wkt

spatial_field_name = config.get("ckanext.spatial.field_name", "spatial_geom")
dataset_dict[spatial_field_name] = wkt
return dataset_dict

def search_params(self, bbox, search_params):
Expand All @@ -202,13 +202,14 @@ def search_params(self, bbox, search_params):

if not search_params.get("fq_list"):
search_params["fq_list"] = []

default_spatial_query = "{{!field f=spatial_geom}}Intersects(ENVELOPE({minx}, {maxx}, {maxy}, {miny}))"


spatial_field_name = config.get("ckanext.spatial.field_name", "spatial_geom")

default_spatial_query = "{{!field f={spatial_field}}}Intersects(ENVELOPE({minx}, {maxx}, {maxy}, {miny}))"
spatial_query = config.get("ckanext.spatial.solr_query", default_spatial_query)

search_params["fq_list"].append(
spatial_query.format(spatial_field="spatial_geom", **bbox)
spatial_query.format(spatial_field=spatial_field_name, **bbox)
)

return search_params
Expand Down
5 changes: 5 additions & 0 deletions doc/spatial-search.md
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,11 @@ images):
```
{{!field f=spatial_geom}}Intersects(ENVELOPE({minx}, {maxx}, {maxy}, {miny}))
```

You can also customize the Solr field name using:
```
ckanext.spatial.field_name = my_custom_geom_field
```

!!! Note
The old `postgis` search backend is no longer supported. You should
Expand Down