morecantile 5.2.3__tar.gz → 5.3.1__tar.gz

{morecantile-5.2.3 → morecantile-5.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: morecantile
-Version: 5.2.3
+Version: 5.3.1
 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>
@@ -18,6 +18,7 @@ Requires-Dist: attrs
 Requires-Dist: pyproj~=3.1
 Requires-Dist: pydantic~=2.0
 Requires-Dist: pre-commit ; extra == "dev"
+Requires-Dist: bump-my-version ; extra == "dev"
 Requires-Dist: mkdocs ; extra == "docs"
 Requires-Dist: mkdocs-material ; extra == "docs"
 Requires-Dist: pygments ; extra == "docs"

{morecantile-5.2.3 → morecantile-5.3.1}/morecantile/__init__.py

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

{morecantile-5.2.3 → morecantile-5.3.1}/morecantile/models.py

@@ -31,6 +31,7 @@ from morecantile.utils import (
     _parse_tile_arg,
     bbox_to_feature,
     check_quadkey_support,
+    lons_contain_antimeridian,
     meters_per_unit,
     point_in_bbox,
     to_rasterio_crs,
@@ -660,6 +661,7 @@ class TileMatrixSet(BaseModel, arbitrary_types_allowed=True):
         ordered_axes: Optional[List[str]] = None,
         geographic_crs: pyproj.CRS = WGS84_CRS,
         screen_pixel_size: float = 0.28e-3,
+        decimation_base: int = 2,
         **kwargs: Any,
     ):
         """
@@ -692,8 +694,12 @@ class TileMatrixSet(BaseModel, arbitrary_types_allowed=True):
             Tile Matrix Set identifier
         geographic_crs: pyproj.CRS
             Geographic (lat,lon) coordinate reference system (default is EPSG:4326)
+        ordered_axes: list of str, optional
+            Override Axis order (e.g `["N", "S"]`) else default to CRS's metadata
         screen_pixel_size: float, optional
             Rendering pixel size. 0.28 mm was the actual pixel size of a common display from 2005 and considered as standard by OGC.
+        decimation_base: int, optional
+            How tiles are divided at each zoom level (default is 2). Must be greater than 1.
         kwargs: Any
             Attributes to forward to the TileMatrixSet
 
@@ -713,6 +719,11 @@ class TileMatrixSet(BaseModel, arbitrary_types_allowed=True):
             transform = pyproj.Transformer.from_crs(extent_crs, crs, always_xy=True)
             extent = transform.transform_bounds(*extent, densify_pts=21)
 
+        if decimation_base <= 1:
+            raise ValueError(
+                "Custom TileMatrixSet requires a decimation base that is greater than 1."
+            )
+
         bbox = BoundingBox(*extent)
         x_origin = bbox.left if not is_inverted else bbox.top
         y_origin = bbox.top if not is_inverted else bbox.left
@@ -723,8 +734,10 @@ class TileMatrixSet(BaseModel, arbitrary_types_allowed=True):
         tile_matrices: List[TileMatrix] = []
         for zoom in range(minzoom, maxzoom + 1):
             res = max(
-                width / (tile_width * matrix_scale[0]) / 2.0**zoom,
-                height / (tile_height * matrix_scale[1]) / 2.0**zoom,
+                width / (tile_width * matrix_scale[0]) / float(decimation_base) ** zoom,
+                height
+                / (tile_height * matrix_scale[1])
+                / float(decimation_base) ** zoom,
             )
             tile_matrices.append(
                 TileMatrix(
@@ -735,8 +748,8 @@ class TileMatrixSet(BaseModel, arbitrary_types_allowed=True):
                         "pointOfOrigin": [x_origin, y_origin],
                         "tileWidth": tile_width,
                         "tileHeight": tile_height,
-                        "matrixWidth": matrix_scale[0] * 2**zoom,
-                        "matrixHeight": matrix_scale[1] * 2**zoom,
+                        "matrixWidth": matrix_scale[0] * decimation_base**zoom,
+                        "matrixHeight": matrix_scale[1] * decimation_base**zoom,
                     }
                 )
             )
@@ -1240,9 +1253,11 @@ class TileMatrixSet(BaseModel, arbitrary_types_allowed=True):
 
         for w, s, e, n in bboxes:
             # Clamp bounding values.
-            w = max(self.bbox.left, w)
+            ws_contain_180th = lons_contain_antimeridian(w, self.bbox.left)
+            es_contain_180th = lons_contain_antimeridian(e, self.bbox.right)
+            w = min(self.bbox.left, w) if ws_contain_180th else max(self.bbox.left, w)
             s = max(self.bbox.bottom, s)
-            e = min(self.bbox.right, e)
+            e = max(self.bbox.right, e) if es_contain_180th else min(self.bbox.right, e)
             n = min(self.bbox.top, n)
 
             for z in zooms:

{morecantile-5.2.3 → morecantile-5.3.1}/morecantile/utils.py

@@ -40,6 +40,30 @@ def _parse_tile_arg(*args) -> Tile:
         )
 
 
+def lons_contain_antimeridian(lon1: float, lon2: float) -> bool:
+    """
+    Check if the antimeridian (180th meridian) is between two longitude points
+
+    Parameters
+    ----------
+    lon1: float
+        The first longitude.
+    lon2: float
+        The second longitude
+
+    Returns
+    -------
+    A bool representing whether two longs contain the 180th meridian.
+    """
+    lon1_clipped = max(-180.0, min(lon1, 180))
+    lon2_clipped = max(-180.0, min(lon2, 180))
+    lon1_converted = (lon1_clipped + 360) % 360
+    lon2_converted = (lon2_clipped + 360) % 360
+    ws = [lon1_converted, lon2_converted]
+    sorted(ws)
+    return ws[0] < 180 < ws[1]
+
+
 def meters_per_unit(crs: CRS) -> float:
     """
     Coefficient to convert the coordinate reference system (CRS)

{morecantile-5.2.3 → morecantile-5.3.1}/pyproject.toml

@@ -37,6 +37,7 @@ test = [
 ]
 dev = [
     "pre-commit",
+    "bump-my-version",
 ]
 docs = [
     "mkdocs",
@@ -110,3 +111,18 @@ ignore = [
 filterwarnings = [
     "ignore:You will likely lose important projection*:UserWarning",
 ]
+
+[tool.bumpversion]
+current_version = "5.3.1"
+
+search = "{current_version}"
+replace = "{new_version}"
+regex = false
+tag = true
+commit = true
+tag_name = "{new_version}"
+
+[[tool.bumpversion.files]]
+filename = "morecantile/__init__.py"
+search = '__version__ = "{current_version}"'
+replace = '__version__ = "{new_version}"'

morecantile-5.2.3/.bumpversion.cfg

@@ -1,9 +0,0 @@
-[bumpversion]
-current_version = 5.2.3
-commit = True
-tag = True
-tag_name = {new_version}
-
-[bumpversion:file:morecantile/__init__.py]
-search = __version__ = "{current_version}"
-replace = __version__ = "{new_version}"