morecantile 6.0.0__py3-none-any.whl → 6.2.0__py3-none-any.whl

morecantile/__init__.py

@@ -8,7 +8,7 @@ Refs:
 
 """
 
-__version__ = "6.0.0"
+__version__ = "6.2.0"
 
 from .commons import BoundingBox, Coords, Tile  # noqa
 from .defaults import TileMatrixSets, tms  # noqa

morecantile/defaults.py

@@ -55,7 +55,7 @@ class TileMatrixSets:
         """Register TileMatrixSet(s)."""
         for identifier in custom_tms.keys():
             if identifier in self.tms and not overwrite:
-                raise Exception(f"{identifier} is already a registered TMS.")
+                raise InvalidIdentifier(f"{identifier} is already a registered TMS.")
 
         return TileMatrixSets({**self.tms, **custom_tms})
 

morecantile/models.py

@@ -488,10 +488,16 @@ class TileMatrixSet(BaseModel, arbitrary_types_allowed=True):
     _to_geographic: pyproj.Transformer = PrivateAttr()
     _from_geographic: pyproj.Transformer = PrivateAttr()
 
+    _tile_matrices_idx: Dict[int, int] = PrivateAttr()
+
     def __init__(self, **data):
         """Set private attributes."""
         super().__init__(**data)
 
+        self._tile_matrices_idx = {
+            int(mat.id): idx for idx, mat in enumerate(self.tileMatrices)
+        }
+
         try:
             self._to_geographic = pyproj.Transformer.from_crs(
                 self.crs._pyproj_crs, self.crs._pyproj_crs.geodetic_crs, always_xy=True
@@ -504,6 +510,7 @@ class TileMatrixSet(BaseModel, arbitrary_types_allowed=True):
                 "Could not create coordinate Transformer from input CRS to the given geographic CRS"
                 "some methods might not be available.",
                 UserWarning,
+                stacklevel=1,
             )
             self._to_geographic = None
             self._from_geographic = None
@@ -531,10 +538,8 @@ class TileMatrixSet(BaseModel, arbitrary_types_allowed=True):
     def is_variable(self) -> bool:
         """Check if TMS has variable width matrix."""
         return any(
-            [
-                True if matrix.variableMatrixWidths is not None else False
-                for matrix in self.tileMatrices
-            ]
+            True if matrix.variableMatrixWidths is not None else False
+            for matrix in self.tileMatrices
         )
 
     def __iter__(self):
@@ -765,9 +770,8 @@ class TileMatrixSet(BaseModel, arbitrary_types_allowed=True):
 
     def matrix(self, zoom: int) -> TileMatrix:
         """Return the TileMatrix for a specific zoom."""
-        for m in self.tileMatrices:
-            if m.id == str(zoom):
-                return m
+        if (idx := self._tile_matrices_idx.get(zoom, None)) is not None:
+            return self.tileMatrices[idx]
 
         #######################################################################
         # If user wants a deeper matrix we calculate it
@@ -795,6 +799,7 @@ class TileMatrixSet(BaseModel, arbitrary_types_allowed=True):
         warnings.warn(
             f"TileMatrix not found for level: {zoom} - Creating values from TMS Scale.",
             UserWarning,
+            stacklevel=1,
         )
 
         # TODO: what if we want to construct a matrix for a level up ?
@@ -889,6 +894,7 @@ class TileMatrixSet(BaseModel, arbitrary_types_allowed=True):
             warnings.warn(
                 f"Point ({x}, {y}) is outside TMS bounds {list(self.xy_bbox)}.",
                 PointOutsideTMSBounds,
+                stacklevel=1,
             )
 
         lng, lat = self._to_geographic.transform(x, y)
@@ -908,6 +914,7 @@ class TileMatrixSet(BaseModel, arbitrary_types_allowed=True):
             warnings.warn(
                 f"Point ({lng}, {lat}) is outside TMS bounds {list(self.bbox)}.",
                 PointOutsideTMSBounds,
+                stacklevel=1,
             )
 
         x, y = self._from_geographic.transform(lng, lat)
@@ -1093,8 +1100,23 @@ class TileMatrixSet(BaseModel, arbitrary_types_allowed=True):
         """
         t = _parse_tile_arg(*tile)
 
-        left, top = self._ul(t)
-        right, bottom = self._lr(t)
+        matrix = self.matrix(t.z)
+        origin_x, origin_y = self._matrix_origin(matrix)
+
+        cf = (
+            matrix.get_coalesce_factor(t.y)
+            if matrix.variableMatrixWidths is not None
+            else 1
+        )
+
+        left = origin_x + math.floor(t.x / cf) * matrix.cellSize * cf * matrix.tileWidth
+        top = origin_y - t.y * matrix.cellSize * matrix.tileHeight
+        right = (
+            origin_x
+            + (math.floor(t.x / cf) + 1) * matrix.cellSize * cf * matrix.tileWidth
+        )
+        bottom = origin_y - (t.y + 1) * matrix.cellSize * matrix.tileHeight
+
         return BoundingBox(left, bottom, right, top)
 
     def ul(self, *tile: Tile) -> Coords:
@@ -1146,10 +1168,10 @@ class TileMatrixSet(BaseModel, arbitrary_types_allowed=True):
         BoundingBox: The bounding box of the input tile.
 
         """
-        t = _parse_tile_arg(*tile)
+        _left, _bottom, _right, _top = self.xy_bounds(*tile)
+        left, top = self.lnglat(_left, _top)
+        right, bottom = self.lnglat(_right, _bottom)
 
-        left, top = self.ul(t)
-        right, bottom = self.lr(t)
         return BoundingBox(left, bottom, right, top)
 
     @property
@@ -1352,6 +1374,7 @@ class TileMatrixSet(BaseModel, arbitrary_types_allowed=True):
                 "CRS is no longer part of the GeoJSON specification."
                 "Other projection than EPSG:4326 might not be supported.",
                 UserWarning,
+                stacklevel=1,
             )
             feat.update(
                 {

morecantile/utils.py

@@ -118,12 +118,10 @@ def is_power_of_two(number: int) -> bool:
 def check_quadkey_support(tms: List) -> bool:
     """Check if a Tile Matrix Set supports quadkeys"""
     return all(
-        [
-            (t.matrixWidth == t.matrixHeight)
-            and is_power_of_two(t.matrixWidth)
-            and ((t.matrixWidth * 2) == tms[i + 1].matrixWidth)
-            for i, t in enumerate(tms[:-1])
-        ]
+        (t.matrixWidth == t.matrixHeight)
+        and is_power_of_two(t.matrixWidth)
+        and ((t.matrixWidth * 2) == tms[i + 1].matrixWidth)
+        for i, t in enumerate(tms[:-1])
     )
 
 

{morecantile-6.0.0.dist-info → morecantile-6.2.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: morecantile
-Version: 6.0.0
+Version: 6.2.0
 Summary: Construct and use map tile grids (a.k.a TileMatrixSet / TMS).
 Keywords: GIS,TMS,TileMatrixSet,Map Tile
 Author-email: Vincent Sarago <vincent@developmentseed.com>
@@ -14,10 +14,13 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Scientific/Engineering :: GIS
 Requires-Dist: attrs
-Requires-Dist: pyproj~=3.1
+Requires-Dist: pyproj>=3.1,<4.0
 Requires-Dist: pydantic~=2.0
+Requires-Dist: pytest ; extra == "benchmark"
+Requires-Dist: pytest-benchmark ; extra == "benchmark"
 Requires-Dist: pre-commit ; extra == "dev"
 Requires-Dist: bump-my-version ; extra == "dev"
 Requires-Dist: mkdocs>=1.4.3 ; extra == "docs"
@@ -32,6 +35,7 @@ Requires-Dist: pytest-cov ; extra == "test"
 Requires-Dist: rasterio>=1.2.1 ; extra == "test"
 Project-URL: Documentation, https://developmentseed.org/morecantile/
 Project-URL: Source, https://github.com/developmentseed/morecantile
+Provides-Extra: benchmark
 Provides-Extra: dev
 Provides-Extra: docs
 Provides-Extra: rasterio

{morecantile-6.0.0.dist-info → morecantile-6.2.0.dist-info}/RECORD

@@ -1,10 +1,10 @@
-morecantile/__init__.py,sha256=nU-M9zzFyyUJOGF9xw5-VjHdf30Ft4Kui1uizI32GzQ,436
+morecantile/__init__.py,sha256=KRnysWzcvNgWYQZkJP1uG2KO_Ca-PbfZywfToeD36AE,436
 morecantile/commons.py,sha256=iHElysLSMu-zb3h1G1-AJnQrZ6y-2GseZkoBkOuzcZ8,1031
-morecantile/defaults.py,sha256=9lvHmZ9WM_J5uNCS9VWEy8O5_x2dA2Spvk4H5aHv6UQ,1804
+morecantile/defaults.py,sha256=PYqEekETggu4yLKhPuU8FTTu04qpR0w_xhewIBkFS1E,1812
 morecantile/errors.py,sha256=rhtdpNglfEz5nC8I-BJKUr_gkOwAPwVi1vhLFJ2StYw,907
-morecantile/models.py,sha256=ZOA_J0cLVZd1Sknn1CW3bDRVwM1M6iVpIujb-Zm5bE8,51068
+morecantile/models.py,sha256=muzqOjaZvIyk6mYXRywy0dT18W1eqLtyC4b1F0MgDeg,51966
 morecantile/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-morecantile/utils.py,sha256=-JUTcrwhT_TEWAPWV8YQBQJoYU2HfVkqQEJaggtnKJg,4020
+morecantile/utils.py,sha256=wEdAc8cZE7iqnuEdfRBSWSzJtYpcIaC6I9eCewhqXy8,3984
 morecantile/data/CDB1GlobalGrid.json,sha256=VDc2ukAWtTQeCdOG8YMqsGO-D7eSzSCN1TEaBn2qLZI,36115
 morecantile/data/CanadianNAD83_LCC.json,sha256=RuR9z5MjxKzU4KE-CutrzjpWBz9c-XXykKAxcD83veU,7267
 morecantile/data/EuropeanETRS89_LAEAQuad.json,sha256=pR2Q7eAlLRG74SRdzYhXj19bf5qBvHrE6kzJ5cvko1Q,4679
@@ -21,8 +21,8 @@ morecantile/data/WorldCRS84Quad.json,sha256=l0Wf2faYwzRwO0mG-Tea1Vydpi7V1Oel5L9l
 morecantile/data/WorldMercatorWGS84Quad.json,sha256=JaqoBSu5qVJmL-J7oSVU1etP2OPWx_aVaTc68dGX0Ec,7001
 morecantile/scripts/__init__.py,sha256=-CJncfgWDnSZ8au-SJtgX-OFgCddlf7___d91qQcqQM,23
 morecantile/scripts/cli.py,sha256=TOc1RjLXuTzKs2FNNHQ3eCiGqiBoDFA4fKWpOAuY12s,17364
-morecantile-6.0.0.dist-info/entry_points.txt,sha256=keoXuYgnX-mdrGWwXIHqEkSZjQK_iAmtmdrtZ3sCT24,59
-morecantile-6.0.0.dist-info/LICENSE,sha256=18IxFIta7rF_RcVSIgLUUd_alyfQ9bGoZKQm5vOarGU,1073
-morecantile-6.0.0.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
-morecantile-6.0.0.dist-info/METADATA,sha256=LHgzSmCyr9fyl8iYdOX1sPRExHAa38Vd1YnDZFOOp04,7140
-morecantile-6.0.0.dist-info/RECORD,,
+morecantile-6.2.0.dist-info/entry_points.txt,sha256=keoXuYgnX-mdrGWwXIHqEkSZjQK_iAmtmdrtZ3sCT24,59
+morecantile-6.2.0.dist-info/LICENSE,sha256=18IxFIta7rF_RcVSIgLUUd_alyfQ9bGoZKQm5vOarGU,1073
+morecantile-6.2.0.dist-info/WHEEL,sha256=CpUCUxeHQbRN5UGRQHYRJorO5Af-Qy_fHMctcQ8DSGI,82
+morecantile-6.2.0.dist-info/METADATA,sha256=fDX754cdrEPZvGR7vJR2d4jUck4aJhRZ0ALxcyDwvcs,7322
+morecantile-6.2.0.dist-info/RECORD,,

{morecantile-6.0.0.dist-info → morecantile-6.2.0.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: flit 3.9.0
+Generator: flit 3.10.1
 Root-Is-Purelib: true
 Tag: py3-none-any