Update CRS conversion

Author: webb-ben

pygeoapi/provider/mvt_postgresql.py

@@ -44,21 +44,15 @@
 from pygeoapi.provider.base_mvt import BaseMVTProvider
 from pygeoapi.provider.postgresql import PostgreSQLProvider
 from pygeoapi.provider.base_tile import ProviderTileNotFoundError
-from pygeoapi.util import url_join
+from pygeoapi.util import url_join, get_crs_from_uri
 
 LOGGER = logging.getLogger(__name__)
 
 WEBMERCATORQUAD = TileMatrixSetEnum.WEBMERCATORQUAD.value
 WORLDCRS84QUAD = TileMatrixSetEnum.WORLDCRS84QUAD.value
 
-CRS_CODES = {
-    'http://www.opengis.net/def/crs/OGC/1.3/CRS84': 4326,
-    'https://www.opengis.net/def/crs/OGC/0/CRS84': 4326,
-    'http://www.opengis.net/def/crs/EPSG/0/3857': 3857
-}
 
-
-class MVTPostgreSQLProvider(BaseMVTProvider, PostgreSQLProvider):
+class MVTPostgreSQLProvider(PostgreSQLProvider, BaseMVTProvider):
     """
     MVT PostgreSQL Provider
     Provider for serving tiles rendered on-the-fly from
@@ -82,11 +76,14 @@ def __init__(self, provider_def):
 
     def get_fields(self):
         """
-        Get Postgrres fields
+        Get Postgres columns
 
-        :returns: `dict` of item fields
+        :returns: `list` of columns
         """
-        PostgreSQLProvider.get_fields(self)
+        return [
+            column for column in self.table_model.__table__.columns
+            if column.name != self.geom
+        ]
 
     def get_layer(self):
         """
@@ -136,34 +133,30 @@ def get_tiles(self, layer='default', tileset=None,
         if format_ == 'mvt':
             format_ = self.format_type
 
-        geom_column = getattr(self.table_model, self.geom)
-        tile_envelope = func.ST_TileEnvelope(z, x, y)
         [tileset_schema] = [
             schema for schema in self.get_tiling_schemes()
             if tileset == schema.tileMatrixSet
         ]
-
         if not self.is_in_limits(tileset_schema, z, x, y):
+            LOGGER.warning(f'Tile {z}/{x}/{y} not found')
             return ProviderTileNotFoundError
 
+        geom_column = getattr(self.table_model, self.geom)
+        tile_envelope = func.ST_TileEnvelope(z, x, y)
         if tileset_schema.crs != self.storage_crs:
-            LOGGER.debug('Transforming geometry')
-            tile_envelope = func.ST_Transform(
-                tile_envelope, CRS_CODES[tileset_schema.crs]
-            )
-            geom_column = func.ST_Transform(
-                geom_column, CRS_CODES[tileset_schema.crs]
-            )
+            target_srid = get_crs_from_uri(tileset_schema.crs).to_string()
+            LOGGER.debug(f'Transforming geometry to {target_srid}')
 
-        all_columns = [
-            c for c in self.table_model.__table__.columns if c.name != 'geom'
+            tile_envelope = func.ST_Transform(tile_envelope, target_srid)
+            geom_column = func.ST_Transform(geom_column, target_srid)
+
+        mvt_columns = [
+            *self.get_fields(),
+            func.ST_AsMVTGeom(geom_column, tile_envelope)
         ]
-        all_columns.append(
-            func.ST_AsMVTGeom(geom_column, tile_envelope).label('mvt')
-        )
         tile_query = select(
             func.ST_AsMVT(
-                select(*all_columns)
+                select(*mvt_columns)
                 .select_from(self.table_model)
                 .cte('tile')
                 .table_valued(),
@@ -173,7 +166,8 @@ def get_tiles(self, layer='default', tileset=None,
 
         with Session(self._engine) as session:
             result = session.execute(tile_query).scalar()
-            return bytes(result) or None
+
+        return bytes(result) or None
 
     def get_html_metadata(self, dataset, server_url, layer, tileset,
                           title, description, keywords, **kwargs):