CatalogueRevamping
/
spatial-d4science
14
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean up and consolidate solr based searches

This commit is contained in:
amercader 2022-09-05 15:40:32 +02:00
parent 244b2ba20f
commit a358afce5c
1 changed files with 28 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
ckanext/spatial/plugin/__init__.py
View File

@ -264,7 +264,6 @@ class SpatialQuery(SpatialQueryMixin, p.SingletonPlugin):
log.error('Wrong geometry, not indexing') log.error('Wrong geometry, not indexing')
return pkg_dict return pkg_dict
if shape.bounds[0] < -180 or shape.bounds[2] > 180: if shape.bounds[0] < -180 or shape.bounds[2] > 180:
import ipdb; ipdb.set_trace()
log.error(""" log.error("""
Geometries outside the -180, -90, 180, 90 boundaries are not supported, Geometries outside the -180, -90, 180, 90 boundaries are not supported,
you need to split the geometry in order to fit the parts. Not indexing""") you need to split the geometry in order to fit the parts. Not indexing""")
@ -290,47 +289,36 @@ you need to split the geometry in order to fit the parts. Not indexing""")
search_backend = self._get_search_backend() search_backend = self._get_search_backend()
if search_params.get('extras', None) and search_params['extras'].get('ext_bbox', None): input_bbox = search_params.get('extras', {}).get('ext_bbox', None)
bbox = normalize_bbox(search_params['extras']['ext_bbox']) if input_bbox:
bbox = normalize_bbox(input_bbox)
if not bbox: if not bbox:
raise SearchError('Wrong bounding box provided') raise SearchError('Wrong bounding box provided')
if search_backend == 'solr': if search_backend in ('solr', 'solr-spatial-field'):
bbox = fit_bbox(bbox) bbox = fit_bbox(bbox)
if not search_params.get("fq_list"): if not search_params.get("fq_list"):
search_params["fq_list"] = [] search_params["fq_list"] = []
spatial_field = "spatial_bbox" if search_backend == "solr" else "spatial_geom"
search_params["fq_list"].append( search_params["fq_list"].append(
"{{!field f=spatial_bbox}}Intersects(ENVELOPE({minx}, {maxx}, {maxy}, {miny}))".format( "{{!field f={spatial_field}}}Intersects(ENVELOPE({minx}, {maxx}, {maxy}, {miny}))".format(
**bbox) spatial_field=spatial_field, **bbox)
) )
elif search_backend == 'solr-spatial-field':
bbox = fit_bbox(bbox)
search_params = self._params_for_solr_spatial_field_search(bbox, search_params)
elif search_backend == 'postgis': elif search_backend == 'postgis':
search_params = self._params_for_postgis_search(bbox, search_params) search_params = self._params_for_postgis_search(bbox, search_params)
return search_params
def _params_for_solr_spatial_field_search(self, bbox, search_params):
'''
This will add an fq filter with the form:
+spatial_geom:"Intersects(ENVELOPE({minx}, {miny}, {maxx}, {maxy}))
'''
search_params['fq_list'] = search_params.get('fq_list', [])
search_params['fq_list'].append('+spatial_geom:"Intersects(ENVELOPE({minx}, {maxx}, {maxy}, {miny}))"'
.format(minx=bbox['minx'], miny=bbox['miny'], maxx=bbox['maxx'], maxy=bbox['maxy']))
return search_params return search_params
def _params_for_postgis_search(self, bbox, search_params): def _params_for_postgis_search(self, bbox, search_params):
"""
Note: The PostGIS search functionality will be removed in future versions
"""
from ckanext.spatial.postgis.model import bbox_query, bbox_query_ordered from ckanext.spatial.postgis.model import bbox_query, bbox_query_ordered
from ckan.lib.search import SearchError from ckan.lib.search import SearchError
@ -389,20 +377,25 @@ you need to split the geometry in order to fit the parts. Not indexing""")
return search_params return search_params
def after_dataset_search(self, search_results, search_params): def after_dataset_search(self, search_results, search_params):
"""
Note: The PostGIS search functionality will be removed in future versions
"""
from ckan.lib.search import PackageSearchQuery from ckan.lib.search import PackageSearchQuery
# Note: This will be deprecated at some point in favour of the search_backend = self._get_search_backend()
# Solr 4 spatial sorting capabilities if search_backend == "postgis":
if search_params.get('extras', {}).get('ext_spatial') and \ # Note: This will be deprecated at some point in favour of the
tk.asbool(config.get('ckanext.spatial.use_postgis_sorting', 'False')): # Solr 4 spatial sorting capabilities
# Apply the spatial sort if search_params.get('extras', {}).get('ext_spatial') and \
querier = PackageSearchQuery() tk.asbool(config.get('ckanext.spatial.use_postgis_sorting', 'False')):
pkgs = [] # Apply the spatial sort
for package_id, spatial_ranking in search_params['extras']['ext_spatial']: querier = PackageSearchQuery()
# get package from SOLR pkgs = []
pkg = querier.get_index(package_id)['data_dict'] for package_id, spatial_ranking in search_params['extras']['ext_spatial']:
pkgs.append(json.loads(pkg)) # get package from SOLR
search_results['results'] = pkgs pkg = querier.get_index(package_id)['data_dict']
pkgs.append(json.loads(pkg))
search_results['results'] = pkgs
return search_results return search_results