Gracefully catch tile not found (#1937)

* Gracefully catch tile not found

* Fix flake8

Author: webb-ben

pygeoapi/api/tiles.py

@@ -49,6 +49,7 @@
 from pygeoapi.provider.base import (
     ProviderGenericError, ProviderTypeError
 )
+from pygeoapi.provider.tile import ProviderTileNotFoundError
 
 from pygeoapi.util import (
     get_provider_by_type, to_json, filter_dict_by_key_value,
@@ -256,6 +257,10 @@ def get_collection_tiles_data(
         return api.get_exception(
             HTTPStatus.BAD_REQUEST, headers, format_,
             'InvalidParameterValue', msg)
+    except ProviderTileNotFoundError:
+        msg = 'Tile not found'
+        LOGGER.info(msg)
+        return headers, HTTPStatus.NOT_FOUND, msg
     except ProviderGenericError as err:
         return api.get_exception(
             err.http_status_code, headers, request.format,

pygeoapi/provider/mvt_elastic.py

@@ -35,6 +35,7 @@
 from pygeoapi.provider.base import (ProviderConnectionError,
                                     ProviderGenericError,
                                     ProviderInvalidQueryError)
+from pygeoapi.provider.tile import ProviderTileNotFoundError
 from pygeoapi.models.provider.base import (
     TileSetMetadata, TileMatrixSetEnum, LinkType)
 from pygeoapi.util import is_url, url_join
@@ -176,6 +177,10 @@ def get_tiles(self, layer=None, tileset=None,
                     data = {'fields': ['*']}
                     session.get(base_url)
                     resp = session.get(f'{base_url}/{layer}/{z}/{y}/{x}{url_query}', json=data)  # noqa
+
+                    if resp.status_code == 404:
+                        raise ProviderTileNotFoundError
+
                     resp.raise_for_status()
                     return resp.content
             except requests.exceptions.RequestException as e:

pygeoapi/provider/mvt_proxy.py

@@ -35,6 +35,7 @@
 from pygeoapi.provider.base import (ProviderConnectionError,
                                     ProviderGenericError,
                                     ProviderInvalidQueryError)
+from pygeoapi.provider.tile import ProviderTileNotFoundError
 from pygeoapi.models.provider.base import (
     TileSetMetadata, LinkType)
 from pygeoapi.util import is_url, url_join
@@ -173,6 +174,9 @@ def get_tiles(self, layer=None, tileset=None,
                     else:
                         resp = session.get(f'{base_url}/{layer}/{z}/{y}/{x}{url_query}')  # noqa
 
+                    if resp.status_code == 404:
+                        raise ProviderTileNotFoundError
+
                     resp.raise_for_status()
                     return resp.content
             except requests.exceptions.RequestException as e:

pygeoapi/provider/mvt_tippecanoe.py

@@ -186,6 +186,10 @@ def get_tiles_from_url(self, layer=None, tileset=None,
             with requests.Session() as session:
                 session.get(base_url)
                 resp = session.get(f'{base_url}/{layer}/{z}/{y}/{x}{extension}')  # noqa
+
+                if resp.status_code == 404:
+                    raise ProviderTileNotFoundError
+
                 resp.raise_for_status()
                 return resp.content
         except requests.exceptions.RequestException as e: