morecantile 5.4.1__tar.gz → 6.0.0__tar.gz

{morecantile-5.4.1 → morecantile-6.0.0}/.gitignore

@@ -130,3 +130,7 @@ dmypy.json
 
 # PyCharm:
 .idea
+
+# VSCode
+.vscode
+.vscode/

{morecantile-5.4.1 → morecantile-6.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: morecantile
-Version: 5.4.1
+Version: 6.0.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>
@@ -20,8 +20,10 @@ 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: mkdocs>=1.4.3 ; extra == "docs"
+Requires-Dist: mkdocs-material[imaging]>=9.5 ; extra == "docs"
+Requires-Dist: griffe-inherited-docstrings>=1.0.0 ; extra == "docs"
+Requires-Dist: mkdocstrings[python]>=0.25.1 ; extra == "docs"
 Requires-Dist: pygments ; extra == "docs"
 Requires-Dist: rasterio>=1.2.1 ; extra == "rasterio"
 Requires-Dist: mercantile ; extra == "test"

{morecantile-5.4.1 → morecantile-6.0.0}/morecantile/__init__.py

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

{morecantile-5.4.1 → morecantile-6.0.0}/morecantile/commons.py

@@ -7,10 +7,10 @@ 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.
+        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)

{morecantile-5.4.1 → morecantile-6.0.0}/morecantile/models.py

@@ -40,7 +40,6 @@ from morecantile.utils import (
 NumType = Union[float, int]
 BoundsType = Tuple[NumType, NumType]
 LL_EPSILON = 1e-11
-WGS84_CRS = pyproj.CRS.from_epsg(4326)
 axesInfo = Annotated[List[str], Field(min_length=2, max_length=2)]
 
 
@@ -486,7 +485,6 @@ class TileMatrixSet(BaseModel, arbitrary_types_allowed=True):
     ]
 
     # Private attributes
-    _geographic_crs: pyproj.CRS = PrivateAttr(default=WGS84_CRS)
     _to_geographic: pyproj.Transformer = PrivateAttr()
     _from_geographic: pyproj.Transformer = PrivateAttr()
 
@@ -494,16 +492,12 @@ class TileMatrixSet(BaseModel, arbitrary_types_allowed=True):
         """Set private attributes."""
         super().__init__(**data)
 
-        self._geographic_crs = pyproj.CRS.from_user_input(
-            data.get("_geographic_crs", WGS84_CRS)
-        )
-
         try:
             self._to_geographic = pyproj.Transformer.from_crs(
-                self.crs._pyproj_crs, self._geographic_crs, always_xy=True
+                self.crs._pyproj_crs, self.crs._pyproj_crs.geodetic_crs, always_xy=True
             )
             self._from_geographic = pyproj.Transformer.from_crs(
-                self._geographic_crs, self.crs._pyproj_crs, always_xy=True
+                self.crs._pyproj_crs.geodetic_crs, self.crs._pyproj_crs, always_xy=True
             )
         except ProjError:
             warnings.warn(
@@ -555,7 +549,7 @@ class TileMatrixSet(BaseModel, arbitrary_types_allowed=True):
     @cached_property
     def geographic_crs(self) -> pyproj.CRS:
         """Return the TMS's geographic CRS."""
-        return self._geographic_crs
+        return self.crs._pyproj_crs.geodetic_crs
 
     @cached_property
     def rasterio_crs(self):
@@ -565,7 +559,7 @@ class TileMatrixSet(BaseModel, arbitrary_types_allowed=True):
     @cached_property
     def rasterio_geographic_crs(self):
         """Return the geographic CRS as a rasterio CRS."""
-        return to_rasterio_crs(self._geographic_crs)
+        return to_rasterio_crs(self.crs._pyproj_crs.geodetic_crs)
 
     @property
     def minzoom(self) -> int:
@@ -656,7 +650,6 @@ class TileMatrixSet(BaseModel, arbitrary_types_allowed=True):
         title: Optional[str] = None,
         id: Optional[str] = None,
         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,
@@ -689,8 +682,6 @@ class TileMatrixSet(BaseModel, arbitrary_types_allowed=True):
             Tile Matrix Set title
         id: str, optional
             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
@@ -769,7 +760,6 @@ class TileMatrixSet(BaseModel, arbitrary_types_allowed=True):
             tileMatrices=tile_matrices,
             id=id,
             title=title,
-            _geographic_crs=geographic_crs,
             **kwargs,
         )
 
@@ -1250,9 +1240,8 @@ class TileMatrixSet(BaseModel, arbitrary_types_allowed=True):
 
         for w, s, e, n in bboxes:
             # Clamp bounding values.
-            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)
+            w = max(self.bbox.left, w)
             s = max(self.bbox.bottom, s)
             e = max(self.bbox.right, e) if es_contain_180th else min(self.bbox.right, e)
             n = min(self.bbox.top, n)

{morecantile-5.4.1 → morecantile-6.0.0}/pyproject.toml

@@ -41,8 +41,10 @@ dev = [
     "bump-my-version",
 ]
 docs = [
-    "mkdocs",
-    "mkdocs-material",
+    "mkdocs>=1.4.3",
+    "mkdocs-material[imaging]>=9.5",
+    "griffe-inherited-docstrings>=1.0.0",
+    "mkdocstrings[python]>=0.25.1",
     "pygments",
 ]
 
@@ -54,7 +56,7 @@ Documentation = "https://developmentseed.org/morecantile/"
 morecantile = "morecantile.scripts.cli:cli"
 
 [build-system]
-requires = ["flit>=3.2,<4"]
+requires = ["flit_core>=3.2,<4"]
 build-backend = "flit_core.buildapi"
 
 [tool.flit.module]
@@ -114,7 +116,7 @@ filterwarnings = [
 ]
 
 [tool.bumpversion]
-current_version = "5.4.1"
+current_version = "6.0.0"
 
 search = "{current_version}"
 replace = "{new_version}"