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

Jump to bottom

Return a 400 status code for an "out-of-range" get tile request #1503

Merged
merged 3 commits into from
Jan 31, 2024
Merged

Return a 400 status code for an "out-of-range" get tile request #1503

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cbf687c
- return a 400 error, when the MVT_elastic provider receives a reques…
doublebyte1 Jan 17, 2024
1e17dbb
-Catching errors on get_tile requests for mvt-elastic provider:
doublebyte1 Jan 18, 2024
3b09f4f
- updated condition on tiles request (mvt-provider), to exclude respo…
doublebyte1 Jan 18, 2024
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: 14 additions & 6 deletions pygeoapi/provider/mvt_elastic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,9 @@
from urllib.parse import urlparse

from pygeoapi.provider.base_mvt import BaseMVTProvider
from pygeoapi.provider.base import ProviderConnectionError
from pygeoapi.provider.base import (ProviderConnectionError,
ProviderGenericError,
ProviderInvalidQueryError)
from pygeoapi.models.provider.base import (
TileSetMetadata, LinkType)
from pygeoapi.util import is_url, url_join
Expand Down Expand Up @@ -162,11 +164,17 @@ def get_tiles(self, layer=None, tileset=None,
else:
url_query = ''

with requests.Session() as session:
session.get(base_url)
resp = session.get(f'{base_url}/{layer}/{z}/{y}/{x}{url_query}') # noqa
resp.raise_for_status()
return resp.content
try:
with requests.Session() as session:
session.get(base_url)
resp = session.get(f'{base_url}/{layer}/{z}/{y}/{x}{url_query}') # noqa
resp.raise_for_status()
return resp.content
except requests.exceptions.RequestException as e:
LOGGER.debug(e)
if resp.status_code < 500:
raise ProviderInvalidQueryError # Client is sending an invalid request # noqa
raise ProviderGenericError # Server error
else:
msg = 'Wrong input format for Elasticsearch MVT'
LOGGER.error(msg)
Expand Down
Loading