Skip to content

Improve handling of invalid parameter inputs for RDPA requests issue-1478 #515

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

Open
JustAProjectacc wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Improve handling of invalid parameter inputs for RDPA requests issue-1478 #515

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 17 additions & 3 deletions msc_pygeoapi/provider/rdpa_rasterio.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@
from rasterio.io import MemoryFile
import rasterio.mask

from msc_pygeoapi.util import remove_z_from_bbox

from pygeoapi.provider.base import (BaseProvider,
ProviderConnectionError,
ProviderQueryError)
Expand Down Expand Up @@ -129,6 +131,7 @@ def query(self, properties=[1], subsets={}, bbox=[],
raise ProviderQueryError(msg)

if len(bbox) > 0:
bbox = remove_z_from_bbox(bbox)
minx, miny, maxx, maxy = bbox

crs_src = CRS.from_epsg(4326)
Expand Down Expand Up @@ -255,7 +258,11 @@ def query(self, properties=[1], subsets={}, bbox=[],
indexes=args['indexes'])
except ValueError as err:
LOGGER.error(err)
raise ProviderQueryError(err)
user_msg = (
'Encountered error when applying spatial '
'subset with provided bbox.'
)
raise ProviderQueryError(err, user_msg=user_msg)

out_meta.update({'driver': self.native_format,
'height': out_image.shape[1],
Expand Down Expand Up @@ -300,7 +307,7 @@ def query(self, properties=[1], subsets={}, bbox=[],
if date_file_list:
err = 'Date range not yet supported for CovJSON output'
LOGGER.error(err)
raise ProviderQueryError(err)
raise ProviderQueryError(err, user_msg=err)
else:
LOGGER.debug('Creating output in CoverageJSON')
out_meta['bands'] = [1]
Expand Down Expand Up @@ -329,7 +336,14 @@ def query(self, properties=[1], subsets={}, bbox=[],
indexes=args['indexes'])
except ValueError as err:
LOGGER.error(err)
raise ProviderQueryError(err)
user_msg = (
'Encountered error when '
'applying spatial '
'subset with provided bbox.'
)
raise ProviderQueryError(
err, user_msg=user_msg
)
else:
out_image = src1.read(
indexes=args['indexes'])
Expand Down
Loading