Skip to content

Commit

Permalink
EDR: fix parameter-name parameter (#1642) (#1647)
Browse files Browse the repository at this point in the history
  • Loading branch information
tomkralidis committed May 11, 2024
1 parent 737b1bd commit fd92861
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions pygeoapi/api/environmental_data_retrieval.py
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,8 @@ def get_collection_edr_query(api: API, request: APIRequest,
HTTPStatus.BAD_REQUEST, headers, request.format,
'InvalidParameterValue', msg)

LOGGER.debug('Processing parameter_names parameter')
parameternames = request.params.get('parameter_names') or []
LOGGER.debug('Processing parameter-name parameter')
parameternames = request.params.get('parameter-name') or []
if isinstance(parameternames, str):
parameternames = parameternames.split(',')

Expand Down Expand Up @@ -167,7 +167,7 @@ def get_collection_edr_query(api: API, request: APIRequest,

if parameternames and not any((fld in parameternames)
for fld in p.get_fields().keys()):
msg = 'Invalid parameter_names'
msg = 'Invalid parameter-name'
return api.get_exception(
HTTPStatus.BAD_REQUEST, headers, request.format,
'InvalidParameterValue', msg)
Expand Down
8 changes: 4 additions & 4 deletions tests/api/test_environmental_data_retrieval.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,9 @@ def test_get_collection_edr_query(config, api_):
api_, req, 'icoads-sst', None, 'position')
assert code == HTTPStatus.BAD_REQUEST

# bad parameter_names parameter
# bad parameter-name parameter
req = mock_api_request({
'coords': 'POINT(11 11)', 'parameter_names': 'bad'
'coords': 'POINT(11 11)', 'parameter-name': 'bad'
})
rsp_headers, code, response = get_collection_edr_query(
api_, req, 'icoads-sst', None, 'position')
Expand Down Expand Up @@ -100,7 +100,7 @@ def test_get_collection_edr_query(config, api_):

# single parameter
req = mock_api_request({
'coords': 'POINT(11 11)', 'parameter_names': 'SST'
'coords': 'POINT(11 11)', 'parameter-name': 'SST'
})
rsp_headers, code, response = get_collection_edr_query(
api_, req, 'icoads-sst', None, 'position')
Expand Down Expand Up @@ -217,7 +217,7 @@ def test_get_collection_edr_query(config, api_):
# cube decreasing latitude coords and S3
req = mock_api_request({
'bbox': '-100,40,-99,45',
'parameter_names': 'tmn',
'parameter-name': 'tmn',
'datetime': '1994-01-01/1994-12-31',
})

Expand Down

0 comments on commit fd92861

Please sign in to comment.