switch from rasterio/gdal to pyproj

.github/workflows/ci.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.6, 3.7, 3.8, 3.9]
+        python-version: [3.7, 3.8, 3.9]
 
     steps:
       - uses: actions/checkout@v2
@@ -30,9 +30,9 @@ jobs:
       - name: Run Tox
         run: tox -e py
 
-      # Run pre-commit (only for python-3.7)
+      # Run pre-commit (only for python-3.8)
       - name: run pre-commit
-        if: matrix.python-version == 3.7
+        if: matrix.python-version == 3.8
         run: pre-commit run --all-files
 
       - name: Upload Results
@@ -44,32 +44,8 @@ jobs:
           name: ${{ matrix.platform }}-${{ matrix.tox-env }}
           fail_ci_if_error: false
 
-  gdal:
-    needs: [tests]
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        # Rasterio 1.1.8 wheels come with GDAL 2
-        # Rasterio 1.2.3 wheels come with GDAL 3.2
-        rasterio-version: ["==1.1.8", ">=1.2"]
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Set up Python
-        uses: actions/setup-python@v1
-        with:
-          python-version: "3.8"
-
-      - name: Install dependencies
-        run: |
-          python -m pip install --upgrade pip
-          python -m pip install .["test"] rasterio${{ matrix.rasterio-version }}
-
-      - name: Run Test
-        run: python -m pytest --cov morecantile --cov-report term-missing --ignore=venv
-
   publish:
-    needs: [tests, gdal]
+    needs: [tests]
     runs-on: ubuntu-latest
     if: startsWith(github.event.ref, 'refs/tags') || github.event_name == 'release'
     steps:

CHANGES.md

@@ -1,4 +1,14 @@
 
+## 3.0.0a0
+
+* add `.rasterio_crs` properties to TMS for compatibility with rasterio (https://github.com/developmentseed/morecantile/pull/58)
+
+**breaking changes**
+
+* switch from rasterio to PyProj for CRS definition and projection transformation (https://github.com/developmentseed/morecantile/pull/58)
+* remove python 3.6 supports (because of pyproj)
+
+
 ## 2.1.4 (2021-08-20)
 
 * add **NZTM2000Quad** tile matrix set from LINZ (author @blacha, https://github.com/developmentseed/morecantile/pull/57)
@@ -20,7 +30,6 @@
 
 * update `NZTM2000*` CRS uri from `https://www.opengis.net/def/crs/EPSG/0/2193` to `urn:ogc:def:crs:EPSG:2193` (https://github.com/developmentseed/morecantile/pull/61)
 
-
 ## 2.1.3 - Doesn't exists
 
 ## 2.1.2 (2021-05-18)

morecantile/__init__.py

@@ -8,7 +8,7 @@
 
 """
 
-__version__ = "2.1.4"
+__version__ = "3.0.0a0"
 
 from .commons import BoundingBox, Coords, Tile  # noqa
 from .defaults import tms  # noqa

morecantile/commons.py

@@ -1,14 +1,29 @@
 """Morecantile commons."""
 
-from collections import OrderedDict, namedtuple
+from typing import NamedTuple
 
-from rasterio.coords import BoundingBox  # noqa
 
-_Tile = namedtuple("_Tile", ["x", "y", "z"])
-_Coords = namedtuple("_Coords", ["x", "y"])
+class BoundingBox(NamedTuple):
+    """A xmin,ymin,xmax,ymax coordinates tuple.
+
+    Args:
+    left (number): min horizontal coordinate.
+    bottom (number):min vertical coordinate.
+    right (number): max horizontal coordinate.
+    top (number): max vertical coordinate.
+
+    Examples:
+        >>> BoundingBox(-180.0, -90.0, 180.0, 90.0)
+
+    """
+
+    left: float
+    bottom: float
+    right: float
+    top: float
 
 
-class Coords(_Coords):
+class Coords(NamedTuple):
     """A x,y Coordinates pair.
 
     Args:
@@ -20,11 +35,11 @@ class Coords(_Coords):
 
     """
 
-    def _asdict(self):
-        return OrderedDict(zip(self._fields, self))
+    x: float
+    y: float
 
 
-class Tile(_Tile):
+class Tile(NamedTuple):
     """TileMatrixSet X,Y,Z tile indices.
 
     Args:
@@ -37,5 +52,6 @@ class Tile(_Tile):
 
     """
 
-    def _asdict(self):
-        return OrderedDict(zip(self._fields, self))
+    x: int
+    y: int
+    z: int

morecantile/data/CanadianNAD83_LCC.json

@@ -4,7 +4,7 @@
     "identifier": "CanadianNAD83_LCC",
     "boundingBox": {
         "type": "BoundingBoxType",
-        "crs": "http://www.opengis.net/def/crs/EPSG/0/3978",
+        "crs": "urn:ogc:def:crs:EPSG::3978",
         "lowerCorner": [
             -7786476.885838887,
             -5153821.09213678
@@ -14,7 +14,7 @@
             7928343.534071138
         ]
     },
-    "supportedCRS": "http://www.opengis.net/def/crs/EPSG/0/3978",
+    "supportedCRS": "urn:ogc:def:crs:EPSG::3978",
     "tileMatrix": [
         {
             "type": "TileMatrixType",
@@ -355,4 +355,4 @@
             "matrixHeight": 2625811
         }
     ]
-}
+}

morecantile/data/EuropeanETRS89_LAEAQuad.json

@@ -4,7 +4,7 @@
     "identifier": "EuropeanETRS89_LAEAQuad",
     "boundingBox": {
         "type": "BoundingBoxType",
-        "crs": "http://www.opengis.net/def/crs/EPSG/0/3035",
+        "crs": "urn:ogc:def:crs:EPSG::3035",
         "lowerCorner": [
             1000000.0,
             2000000.0
@@ -14,7 +14,7 @@
             5500000.0
         ]
     },
-    "supportedCRS": "http://www.opengis.net/def/crs/EPSG/0/3035",
+    "supportedCRS": "urn:ogc:def:crs:EPSG::3035",
     "tileMatrix": [
         {
             "type": "TileMatrixType",
@@ -225,4 +225,4 @@
             "matrixHeight": 32768
         }
     ]
-}
+}

morecantile/data/LINZAntarticaMapTilegrid.json

@@ -2,7 +2,7 @@
     "type": "TileMatrixSetType",
     "title": "LINZ Antarctic Map Tile Grid (Ross Sea Region)",
     "identifier": "LINZAntarticaMapTilegrid",
-    "supportedCRS": "http://www.opengis.net/def/crs/EPSG/0/5482",
+    "supportedCRS": "urn:ogc:def:crs:EPSG::5482",
     "tileMatrix": [
         {
             "type": "TileMatrixType",
@@ -187,4 +187,4 @@
             "matrixHeight": 3303
         }
     ]
-}
+}

morecantile/data/NZTM2000.json

@@ -3,10 +3,10 @@
     "title": "LINZ NZTM2000 Map Tile Grid",
     "abstract": "See https://www.linz.govt.nz/data/linz-data-service/guides-and-documentation/nztm2000-map-tile-service-schema",
     "identifier": "NZTM2000",
-    "supportedCRS": "urn:ogc:def:crs:EPSG:2193",
+    "supportedCRS": "urn:ogc:def:crs:EPSG::2193",
     "boundingBox": {
         "type": "BoundingBoxType",
-        "crs": "urn:ogc:def:crs:EPSG:2193",
+        "crs": "urn:ogc:def:crs:EPSG::2193",
         "lowerCorner": [
             3087000,
             274000

morecantile/data/NZTM2000Quad.json

@@ -3,10 +3,10 @@
   "title": "LINZ NZTM2000Quad Map Tile Grid",
   "abstract": "See https://github.com/linz/NZTM2000TileMatrixSet",
   "identifier": "NZTM2000Quad",
-  "supportedCRS": "urn:ogc:def:crs:EPSG:2193",
+  "supportedCRS": "urn:ogc:def:crs:EPSG::2193",
   "boundingBox": {
     "type": "BoundingBoxType",
-    "crs": "urn:ogc:def:crs:EPSG:2193",
+    "crs": "urn:ogc:def:crs:EPSG::2193",
     "lowerCorner": [
       419435.9938,
       -3260586.7284

morecantile/data/UPSAntarcticWGS84Quad.json

@@ -4,7 +4,7 @@
     "identifier": "UPSAntarcticWGS84Quad",
     "boundingBox": {
         "type": "BoundingBoxType",
-        "crs": "http://www.opengis.net/def/crs/EPSG/0/5042",
+        "crs": "urn:ogc:def:crs:EPSG::5042",
         "lowerCorner": [
             -14440759.350252,
             -14440759.350252
@@ -14,7 +14,7 @@
             18440759.350252
         ]
     },
-    "supportedCRS": "http://www.opengis.net/def/crs/EPSG/0/5042",
+    "supportedCRS": "urn:ogc:def:crs:EPSG::5042",
     "tileMatrix": [
         {
             "type": "TileMatrixType",
@@ -342,4 +342,4 @@
             "matrixHeight": 16777216
         }
     ]
-}
+}

morecantile/data/UPSArcticWGS84Quad.json

@@ -4,7 +4,7 @@
     "identifier": "UPSArcticWGS84Quad",
     "boundingBox": {
         "type": "BoundingBoxType",
-        "crs": "http://www.opengis.net/def/crs/EPSG/0/5041",
+        "crs": "urn:ogc:def:crs:EPSG::5041",
         "lowerCorner": [
             -14440759.350252,
             -14440759.350252
@@ -14,7 +14,7 @@
             18440759.350252
         ]
     },
-    "supportedCRS": "http://www.opengis.net/def/crs/EPSG/0/5041",
+    "supportedCRS": "urn:ogc:def:crs:EPSG::5041",
     "tileMatrix": [
         {
             "type": "TileMatrixType",
@@ -342,4 +342,4 @@
             "matrixHeight": 16777216
         }
     ]
-}
+}

morecantile/data/UTM31WGS84Quad.json

@@ -4,7 +4,7 @@
     "identifier": "UTM31WGS84Quad",
     "boundingBox": {
         "type": "BoundingBoxType",
-        "crs": "http://www.opengis.net/def/crs/EPSG/0/32631",
+        "crs": "urn:ogc:def:crs:EPSG::32631",
         "lowerCorner": [
             -9501965.72931276,
             -20003931.4586255
@@ -14,7 +14,7 @@
             20003931.4586255
         ]
     },
-    "supportedCRS": "http://www.opengis.net/def/crs/EPSG/0/32631",
+    "supportedCRS": "urn:ogc:def:crs:EPSG::32631",
     "tileMatrix": [
         {
             "type": "TileMatrixType",
@@ -329,4 +329,4 @@
             "matrixHeight": 16777216
         }
     ]
-}
+}

morecantile/data/WebMercatorQuad.json

@@ -4,7 +4,7 @@
     "identifier": "WebMercatorQuad",
     "boundingBox": {
         "type": "BoundingBoxType",
-        "crs": "http://www.opengis.net/def/crs/EPSG/0/3857",
+        "crs": "urn:ogc:def:crs:EPSG::3857",
         "lowerCorner": [
             -20037508.3427892,
             -20037508.3427892
@@ -14,7 +14,7 @@
             20037508.3427892
         ]
     },
-    "supportedCRS": "http://www.opengis.net/def/crs/EPSG/0/3857",
+    "supportedCRS": "urn:ogc:def:crs:EPSG::3857",
     "wellKnownScaleSet": "http://www.opengis.net/def/wkss/OGC/1.0/GoogleMapsCompatible",
     "tileMatrix": [
         {
@@ -343,4 +343,4 @@
             "matrixHeight": 16777216
         }
     ]
-}
+}

morecantile/data/WorldCRS84Quad.json

@@ -4,7 +4,7 @@
     "identifier": "WorldCRS84Quad",
     "boundingBox": {
         "type": "BoundingBoxType",
-        "crs": "http://www.opengis.net/def/crs/OGC/1.3/CRS84",
+        "crs": "urn:ogc:def:crs:OGC::CRS84",
         "lowerCorner": [
             -180,
             -90
@@ -14,7 +14,7 @@
             90
         ]
     },
-    "supportedCRS": "http://www.opengis.net/def/crs/OGC/1.3/CRS84",
+    "supportedCRS": "urn:ogc:def:crs:OGC::CRS84",
     "wellKnownScaleSet": "http://www.opengis.net/def/wkss/OGC/1.0/GoogleCRS84Quad",
     "tileMatrix": [
         {
@@ -252,4 +252,4 @@
             "matrixHeight": 131072
         }
     ]
-}
+}

morecantile/data/WorldMercatorWGS84Quad.json

@@ -4,7 +4,7 @@
     "identifier": "WorldMercatorWGS84Quad",
     "boundingBox": {
         "type": "BoundingBoxType",
-        "crs": "http://www.opengis.net/def/crs/EPSG/0/3395",
+        "crs": "urn:ogc:def:crs:EPSG::3395",
         "lowerCorner": [
             -20037508.3427892,
             -20037508.3427892
@@ -14,7 +14,7 @@
             20037508.3427892
         ]
     },
-    "supportedCRS": "http://www.opengis.net/def/crs/EPSG/0/3395",
+    "supportedCRS": "urn:ogc:def:crs:EPSG::3395",
     "wellKnownScaleSet": "http://www.opengis.net/def/wkss/OGC/1.0/WorldMercatorWGS84",
     "tileMatrix": [
         {
@@ -252,4 +252,4 @@
             "matrixHeight": 131072
         }
     ]
-}
+}