Merge pull request #161 from developmentseed/feature/performance-impr…

…ovement Performance improvement
developmentseed · Oct 17, 2024 · b2704d2 · b2704d2
2 parents 1dbb5fa + 57e9b1a
commit b2704d2
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 8 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,4 +1,9 @@
 
+## 6.1.0 (TBD)
+
+* add `_tile_matrices_idx: Dict[str, int]` private attribute to improve `matrices` lookup
+* change `xy_bounds()` and `bounds()` methods to avoid calculation duplication
+
 ## 6.0.0 (2024-10-16)
 
 * remove `_geographic_crs` private attribute in `TileMatrixSet` model **breaking change**

diff --git a/morecantile/models.py b/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
@@ -765,9 +771,8 @@ def custom(
 
     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
@@ -1093,8 +1098,23 @@ def xy_bounds(self, *tile: Tile) -> BoundingBox:
         """
         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 +1166,10 @@ def bounds(self, *tile: Tile) -> BoundingBox:
         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