- moved function that checks the limits of the TMS to the base tile provider

- check limits of TMS in wmts provider

Author: doublebyte1

pygeoapi/provider/base_mvt.py

@@ -249,45 +249,3 @@ def get_tms_links(self):
             ]
         }
         return links
-
-    def get_tilematrixset(self, tileMatrixSetId):
-        """
-        Get tilematrixset
-
-        :param tileMatrixSetId: tilematrixsetid str
-
-        :returns: tilematrixset enum object
-        """
-
-        enums = [e.value for e in TileMatrixSetEnum]
-        enum = None
-
-        try:
-            for e in enums:
-                if tileMatrixSetId == e.tileMatrixSet:
-                    enum = e
-            if not enum:
-                raise ValueError('could not find this tilematrixset')
-            return enum
-
-        except ValueError as err:
-            LOGGER.error(err)
-
-    def is_in_limits(self, tilematrixset, z, x, y):
-        """
-        Is within the limits of the tilematrixset
-
-        :param z: tilematrix
-        :param x: x
-        :param y: y
-
-        :returns: wether this tile is within the tile matrix
-        set limits (Boolean)
-        """
-
-        try:
-            if int(x) < tilematrixset.tileMatrices[int(z)]['matrixWidth'] and int(y) < tilematrixset.tileMatrices[int(z)]['matrixHeight']: # noqa
-                return True
-            return False
-        except ValueError as err:
-            LOGGER.error(err)

pygeoapi/provider/tile.py

@@ -32,6 +32,9 @@
 import logging
 from http import HTTPStatus
 
+from pygeoapi.models.provider.base import (
+    TileMatrixSetEnum)
+
 from pygeoapi.provider.base import (
     ProviderGenericError, ProviderItemNotFoundError)
 
@@ -123,6 +126,48 @@ def get_metadata(self):
 
         raise NotImplementedError()
 
+    def is_in_limits(self, tilematrixset, z, x, y):
+        """
+        Is within the limits of the tilematrixset
+
+        :param z: tilematrix
+        :param x: x
+        :param y: y
+
+        :returns: wether this tile is within the tile matrix
+        set limits (Boolean)
+        """
+
+        try:
+            if int(x) < tilematrixset.tileMatrices[int(z)]['matrixWidth'] and int(y) < tilematrixset.tileMatrices[int(z)]['matrixHeight']: # noqa
+                return True
+            return False
+        except ValueError as err:
+            LOGGER.error(err)
+
+    def get_tilematrixset(self, tileMatrixSetId):
+        """
+        Get tilematrixset
+
+        :param tileMatrixSetId: tilematrixsetid str
+
+        :returns: tilematrixset enum object
+        """
+
+        enums = [e.value for e in TileMatrixSetEnum]
+        enum = None
+
+        try:
+            for e in enums:
+                if tileMatrixSetId == e.tileMatrixSet:
+                    enum = e
+            if not enum:
+                raise ValueError('could not find this tilematrixset')
+            return enum
+
+        except ValueError as err:
+            LOGGER.error(err)
+
 
 class ProviderTileQueryError(ProviderGenericError):
     """provider tile query error"""

pygeoapi/provider/wmts_facade.py

@@ -37,7 +37,9 @@
 
 from pygeoapi.provider.tile import (ProviderTileNotFoundError,
                                     BaseTileProvider)
-from pygeoapi.provider.base import ProviderConnectionError
+from pygeoapi.provider.base import (ProviderConnectionError,
+                                    ProviderInvalidQueryError,
+                                    ProviderGenericError)
 from pygeoapi.models.provider.base import (
     TileMatrixSetEnum, TilesMetadataFormat, TileSetMetadata, LinkType)
 from pygeoapi.util import is_url, url_join
@@ -169,13 +171,27 @@ def get_tiles(self, layer=None, tileset=None,
 
             LOGGER.debug(f'WMTS 1.0.0 request url: {request_url}')
 
-            with requests.Session() as session:
-                resp = session.get(request_url)
+            try:
+                with requests.Session() as session:
+                    resp = session.get(request_url)
 
-                if resp.status_code == 400:
-                    raise ProviderTileNotFoundError
+                    if resp.status_code == 400:
+
+                        tms = self.get_tilematrixset(tileset)
+
+                        if (self.is_in_limits(tms, z, x, y)):
+                            return None
+                        raise ProviderTileNotFoundError
+
+                    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
 
-                return resp.content
         else:
             msg = f'Wrong data path configuration: {self.data}'
             LOGGER.error(msg)