Merge pull request #9 from webb-ben/force-crs

Force XY

Author: ptomasula

pygeoapi/provider/mvt_postgresql.py

@@ -151,7 +151,7 @@ def get_tiles(self, layer='default', tileset=None,
         ]
         if not self.is_in_limits(tileset_schema, z, x, y):
             LOGGER.warning(f'Tile {z}/{x}/{y} not found')
-            return ProviderTileNotFoundError
+            raise ProviderTileNotFoundError
 
         storage_srid = get_crs_from_uri(self.storage_crs).to_string()
         out_srid = get_crs_from_uri(tileset_schema.crs).to_string()

pygeoapi/util.py

@@ -766,7 +766,7 @@ def get_crs_from_uri(uri: str) -> pyproj.CRS:
 
 
 def get_transform_from_crs(
-    crs_in: pyproj.CRS, crs_out: pyproj.CRS, always_xy: bool = False
+    crs_in: pyproj.CRS, crs_out: pyproj.CRS, always_xy: bool = True
 ) -> Callable[[GeomObject], GeomObject]:
     """ Get transformation function from two `pyproj.CRS` instances.
 

tests/provider/test_postgresql_mvt_provider.py

@@ -271,11 +271,11 @@ def test_get_tiles_WebMercatorQuad(config):
 
     # Tile does not exist in matrixset
     z, x, y = 1, 1000000, 1000000
-    result = p.get_tiles(
-        tileset=tileset,
-        z=z, x=x, y=y
-    )
-    assert result == ProviderTileNotFoundError
+    with pytest.raises(ProviderTileNotFoundError):
+        p.get_tiles(
+            tileset=tileset,
+            z=z, x=x, y=y
+        )
 
 
 def test_get_tiles_WorldCRS84Quad(config):
@@ -311,8 +311,8 @@ def test_get_tiles_WorldCRS84Quad(config):
 
     # Tile does not exist in matrixset
     z, x, y = 1, 1000000, 1000000
-    result = p.get_tiles(
-        tileset=tileset,
-        z=z, x=x, y=y
-    )
-    assert result == ProviderTileNotFoundError
+    with pytest.raises(ProviderTileNotFoundError):
+        p.get_tiles(
+            tileset=tileset,
+            z=z, x=x, y=y
+        )