Update CRS handling (#52)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

Author: webb-ben

.github/workflows/main.yml

@@ -23,9 +23,10 @@ jobs:
       - uses: actions/setup-python@v2
         name: Setup Python
         with:
-          python-version: '3.10'
+          python-version: 3.12
       - name: Install requirements 📦
         run: |
+          pip3 install setuptools
           pip3 install https://github.com/geopython/pygeoapi/archive/refs/heads/master.zip
           pip3 install -r requirements.txt
           pip3 install -r requirements-dev.txt

pygeoapi_plugins/provider/ckan.py

@@ -38,7 +38,7 @@
     ProviderQueryError,
     ProviderConnectionError,
 )
-from pygeoapi.util import crs_transform
+from pygeoapi.crs import crs_transform
 
 LOGGER = logging.getLogger(__name__)
 

pygeoapi_plugins/provider/geopandas_.py

@@ -44,7 +44,7 @@
     ProviderNoDataError,
     ProviderQueryError,
 )
-from pygeoapi.util import crs_transform
+from pygeoapi.crs import crs_transform
 
 LOGGER = logging.getLogger(__name__)
 

pygeoapi_plugins/provider/mvt_postgresql.py

@@ -45,7 +45,7 @@
 
 from pygeoapi.provider.mvt_postgresql import MVTPostgreSQLProvider
 from pygeoapi.provider.tile import ProviderTileNotFoundError
-from pygeoapi.util import get_crs_from_uri
+from pygeoapi.crs import get_crs
 
 LOGGER = logging.getLogger(__name__)
 
@@ -111,8 +111,8 @@ def get_tiles(self, layer=None, tileset=None, z=None, y=None, x=None, format_=No
 
         LOGGER.debug(f'Querying {self.table} for MVT tile {z}/{x}/{y}')
 
-        storage_srid = get_crs_from_uri(self.storage_crs).to_string()
-        out_srid = get_crs_from_uri(tileset_schema.crs).to_string()
+        storage_srid = get_crs(self.storage_crs).to_string()
+        out_srid = get_crs(tileset_schema.crs).to_string()
         envelope = self.get_envelope(z, y, x, tileset)
         envelope = select(
             ST_Transform(envelope, storage_srid).label('src'),

tests/test_postgresql_provider.py

@@ -154,6 +154,7 @@ def test_query_with_config_properties(config):
     """
     properties_subset = ['name', 'waterway', 'width', 'does_not_exist']
     config.update({'properties': properties_subset})
+    properties_subset.append('osm_id')
     provider = PostgreSQLProvider(config)
     assert provider.properties == properties_subset
     result = provider.query()