morecantile 3.2.4__tar.gz → 3.3.0__tar.gz

{morecantile-3.2.4 → morecantile-3.3.0}/.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 3.2.4
+current_version = 3.3.0
 commit = True
 tag = True
 tag_name = {new_version}

morecantile-3.3.0/.pre-commit-config.yaml

@@ -0,0 +1,34 @@
+repos:
+  - repo: https://github.com/abravalheri/validate-pyproject
+    rev: v0.12.1
+    hooks:
+      - id: validate-pyproject
+
+  - repo: https://github.com/psf/black
+    rev: 22.12.0
+    hooks:
+      - id: black
+        language_version: python
+
+  - repo: https://github.com/PyCQA/isort
+    rev: 5.12.0
+    hooks:
+      - id: isort
+        language_version: python
+
+  - repo: https://github.com/charliermarsh/ruff-pre-commit
+    rev: v0.0.238
+    hooks:
+      - id: ruff
+        args: ["--fix"]
+
+  - repo: https://github.com/pre-commit/mirrors-mypy
+    rev: v0.991
+    hooks:
+      - id: mypy
+        language_version: python
+        # No reason to run if only tests have changed. They intentionally break typing.
+        exclude: tests/.*
+        additional_dependencies:
+        - types-attrs
+        - types-cachetools

{morecantile-3.2.4 → morecantile-3.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: morecantile
-Version: 3.2.4
+Version: 3.3.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>
@@ -90,12 +90,13 @@ Morecantile is like [mercantile](https://github.com/mapbox/mercantile) (the best
 ## Install
 
 ```bash
-$ pip install -U pip
-$ pip install morecantile
+$ python -m pip install -U pip
+$ python -m pip install morecantile
 
 # Or install from source:
 
-$ pip install git+https://github.com/developmentseed/morecantile.git
+$ python -m pip install -U pip
+$ python -m pip install git+https://github.com/developmentseed/morecantile.git
 ```
 
 ### Defaults Grids
@@ -119,6 +120,7 @@ ref: http://schemas.opengis.net/tms/1.0/json/examples/
 
 - [rio-tiler](https://github.com/cogeotiff/rio-tiler): Create tile from raster using Morecantile TMS.
 - [timvt](https://github.com/developmentseed/timvt): A lightweight PostGIS based dynamic vector tile server.
+- [planetcantile](https://github.com/AndrewAnnex/planetcantile): Tile matrix sets for other planets.
 
 ## Changes
 

{morecantile-3.2.4 → morecantile-3.3.0}/README.md

@@ -56,12 +56,13 @@ Morecantile is like [mercantile](https://github.com/mapbox/mercantile) (the best
 ## Install
 
 ```bash
-$ pip install -U pip
-$ pip install morecantile
+$ python -m pip install -U pip
+$ python -m pip install morecantile
 
 # Or install from source:
 
-$ pip install git+https://github.com/developmentseed/morecantile.git
+$ python -m pip install -U pip
+$ python -m pip install git+https://github.com/developmentseed/morecantile.git
 ```
 
 ### Defaults Grids
@@ -85,6 +86,7 @@ ref: http://schemas.opengis.net/tms/1.0/json/examples/
 
 - [rio-tiler](https://github.com/cogeotiff/rio-tiler): Create tile from raster using Morecantile TMS.
 - [timvt](https://github.com/developmentseed/timvt): A lightweight PostGIS based dynamic vector tile server.
+- [planetcantile](https://github.com/AndrewAnnex/planetcantile): Tile matrix sets for other planets.
 
 ## Changes
 

{morecantile-3.2.4 → morecantile-3.3.0}/morecantile/__init__.py

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

{morecantile-3.2.4 → morecantile-3.3.0}/morecantile/defaults.py

@@ -7,8 +7,8 @@ from typing import Dict, List, Sequence, Union
 
 import attr
 
-from .errors import InvalidIdentifier
-from .models import TileMatrixSet
+from morecantile.errors import InvalidIdentifier
+from morecantile.models import TileMatrixSet
 
 morecantile_tms_dir = pathlib.Path(__file__).parent.joinpath("data")
 tms_paths = list(pathlib.Path(morecantile_tms_dir).glob("*.json"))
@@ -17,8 +17,8 @@ user_tms_dir = os.environ.get("TILEMATRIXSET_DIRECTORY", None)
 if user_tms_dir:
     tms_paths.extend(list(pathlib.Path(user_tms_dir).glob("*.json")))
 
-default_tms: Dict[str, TileMatrixSet] = {
-    tms.stem: TileMatrixSet.parse_file(tms) for tms in tms_paths
+default_tms: Dict[str, Union[TileMatrixSet, pathlib.Path]] = {
+    tms.stem: tms for tms in sorted(tms_paths)
 }
 
 
@@ -33,7 +33,12 @@ class TileMatrixSets:
         if identifier not in self.tms:
             raise InvalidIdentifier(f"Invalid identifier: {identifier}")
 
-        return self.tms[identifier]
+        tms = self.tms[identifier]
+        if isinstance(tms, pathlib.Path):
+            tms = TileMatrixSet.parse_file(tms)
+            self.tms[identifier] = tms
+
+        return tms
 
     def list(self) -> List[str]:
         """List registered TMS."""

{morecantile-3.2.4 → morecantile-3.3.0}/morecantile/models.py

@@ -9,14 +9,15 @@ from pyproj import CRS, Transformer
 from pyproj.enums import WktVersion
 from pyproj.exceptions import ProjError
 
-from .commons import BoundingBox, Coords, Tile
-from .errors import (
+from morecantile.commons import BoundingBox, Coords, Tile
+from morecantile.errors import (
     InvalidZoomError,
+    MorecantileError,
     NoQuadkeySupport,
     PointOutsideTMSBounds,
     QuadKeyError,
 )
-from .utils import (
+from morecantile.utils import (
     _parse_tile_arg,
     bbox_to_feature,
     check_quadkey_support,
@@ -229,7 +230,7 @@ class TileMatrixSet(BaseModel):
         crs: CRS,
         tile_width: int = 256,
         tile_height: int = 256,
-        matrix_scale: List = [1, 1],
+        matrix_scale: Optional[List] = None,
         extent_crs: Optional[CRS] = None,
         minzoom: int = 0,
         maxzoom: int = 24,
@@ -273,6 +274,8 @@ class TileMatrixSet(BaseModel):
         TileMatrixSet
 
         """
+        matrix_scale = matrix_scale or [1, 1]
+
         tms: Dict[str, Any] = {
             "title": title,
             "identifier": identifier,
@@ -318,15 +321,15 @@ class TileMatrixSet(BaseModel):
             )
             tms["tileMatrix"].append(
                 TileMatrix(
-                    **dict(
-                        identifier=str(zoom),
-                        scaleDenominator=res * mpu / 0.00028,
-                        topLeftCorner=[x_origin, y_origin],
-                        tileWidth=tile_width,
-                        tileHeight=tile_height,
-                        matrixWidth=matrix_scale[0] * 2**zoom,
-                        matrixHeight=matrix_scale[1] * 2**zoom,
-                    )
+                    **{
+                        "identifier": str(zoom),
+                        "scaleDenominator": res * mpu / 0.00028,
+                        "topLeftCorner": [x_origin, y_origin],
+                        "tileWidth": tile_width,
+                        "tileHeight": tile_height,
+                        "matrixWidth": matrix_scale[0] * 2**zoom,
+                        "matrixHeight": matrix_scale[1] * 2**zoom,
+                    }
                 )
             )
 
@@ -334,45 +337,44 @@ class TileMatrixSet(BaseModel):
 
     def matrix(self, zoom: int) -> TileMatrix:
         """Return the TileMatrix for a specific zoom."""
-        try:
-            tile_matrix = list(
-                filter(lambda m: m.identifier == str(zoom), self.tileMatrix)
-            )[0]
-        except IndexError:
-            matrix_scale = list(
-                {
-                    round(
-                        self.tileMatrix[idx].scaleDenominator
-                        / self.tileMatrix[idx - 1].scaleDenominator,
-                        2,
-                    )
-                    for idx in range(1, len(self.tileMatrix))
-                }
-            )
-            if len(matrix_scale) > 1:
-                raise Exception(
-                    f"TileMatrix not found for level: {zoom} - Unable to construct tileMatrix for TMS with variable scale"
+        for m in self.tileMatrix:
+            if m.identifier == str(zoom):
+                return m
+
+        matrix_scale = list(
+            {
+                round(
+                    self.tileMatrix[idx].scaleDenominator
+                    / self.tileMatrix[idx - 1].scaleDenominator,
+                    2,
                 )
-
-            warnings.warn(
-                f"TileMatrix not found for level: {zoom} - Creating values from TMS Scale.",
-                UserWarning,
+                for idx in range(1, len(self.tileMatrix))
+            }
+        )
+        if len(matrix_scale) > 1:
+            raise InvalidZoomError(
+                f"TileMatrix not found for level: {zoom} - Unable to construct tileMatrix for TMS with variable scale"
             )
 
-            tile_matrix = self.tileMatrix[-1]
-            factor = 1 / matrix_scale[0]
-            while not str(zoom) == tile_matrix.identifier:
-                tile_matrix = TileMatrix(
-                    **dict(
-                        identifier=str(int(tile_matrix.identifier) + 1),
-                        scaleDenominator=tile_matrix.scaleDenominator / factor,
-                        topLeftCorner=tile_matrix.topLeftCorner,
-                        tileWidth=tile_matrix.tileWidth,
-                        tileHeight=tile_matrix.tileHeight,
-                        matrixWidth=int(tile_matrix.matrixWidth * factor),
-                        matrixHeight=int(tile_matrix.matrixHeight * factor),
-                    )
-                )
+        warnings.warn(
+            f"TileMatrix not found for level: {zoom} - Creating values from TMS Scale.",
+            UserWarning,
+        )
+
+        tile_matrix = self.tileMatrix[-1]
+        factor = 1 / matrix_scale[0]
+        while not str(zoom) == tile_matrix.identifier:
+            tile_matrix = TileMatrix(
+                **{
+                    "identifier": str(int(tile_matrix.identifier) + 1),
+                    "scaleDenominator": tile_matrix.scaleDenominator / factor,
+                    "topLeftCorner": tile_matrix.topLeftCorner,
+                    "tileWidth": tile_matrix.tileWidth,
+                    "tileHeight": tile_matrix.tileHeight,
+                    "matrixWidth": int(tile_matrix.matrixWidth * factor),
+                    "matrixHeight": int(tile_matrix.matrixHeight * factor),
+                }
+            )
 
         return tile_matrix
 
@@ -789,7 +791,7 @@ class TileMatrixSet(BaseModel):
         self,
         tile: Tile,
         fid: Optional[str] = None,
-        props: Dict = {},
+        props: Optional[Dict] = None,
         buffer: Optional[NumType] = None,
         precision: Optional[int] = None,
         projected: bool = False,

{morecantile-3.2.4 → morecantile-3.3.0}/morecantile/scripts/cli.py

@@ -185,7 +185,7 @@ def cli(ctx, verbose, quiet):
     help="Shift shape x and y values by a constant number",
 )
 @click.pass_context
-def shapes(
+def shapes(  # noqa: C901
     ctx,
     input,
     identifier,
@@ -230,7 +230,7 @@ def shapes(
     col_xs = []
     col_ys = []
 
-    for i, line in enumerate(iter_lines(src)):
+    for _i, line in enumerate(iter_lines(src)):
         obj = json.loads(line)
         if isinstance(obj, dict):
             x, y, z = obj["tile"][:3]
@@ -303,7 +303,7 @@ def shapes(
     help="Write a RS-delimited JSON sequence (default is LF).",
 )
 @click.pass_context
-def tiles(ctx, zoom, input, identifier, seq):
+def tiles(ctx, zoom, input, identifier, seq):  # noqa: C901
     """
     Lists TMS tiles at ZOOM level intersecting
     GeoJSON [west, south, east, north] bounding boxen, features, or
@@ -507,7 +507,7 @@ def custom(
     default=None,
     help="Shift shape x and y values by a constant number",
 )
-def tms_to_geojson(
+def tms_to_geojson(  # noqa: C901
     input,
     level,
     precision,

{morecantile-3.2.4 → morecantile-3.3.0}/morecantile/utils.py

@@ -5,8 +5,8 @@ from typing import Dict, List
 
 from pyproj import CRS
 
-from .commons import BoundingBox, Coords, Tile
-from .errors import TileArgParsingError
+from morecantile.commons import BoundingBox, Coords, Tile
+from morecantile.errors import TileArgParsingError
 
 
 def _parse_tile_arg(*args) -> Tile:
@@ -59,10 +59,10 @@ def meters_per_unit(crs: CRS) -> float:
     unit_name = crs.axis_info[0].unit_name
     try:
         return unit_factors[unit_name]
-    except KeyError:
+    except KeyError as e:
         raise Exception(
-            f"CRS {crs} is not supported, please fill an issue in developmentseed/morecantile"
-        )
+            f"CRS {crs} with Unit Name `{unit_name}` is not supported, please fill an issue in developmentseed/morecantile"
+        ) from e
 
 
 def bbox_to_feature(west: float, south: float, east: float, north: float) -> Dict:

{morecantile-3.2.4 → morecantile-3.3.0}/pyproject.toml

@@ -66,6 +66,17 @@ exclude = [
     "CONTRIBUTING.md",
 ]
 
+[tool.coverage.run]
+branch = true
+parallel = true
+
+[tool.coverage.report]
+exclude_lines = [
+  "no cov",
+  "if __name__ == .__main__.:",
+  "if TYPE_CHECKING:",
+]
+
 [tool.isort]
 profile = "black"
 known_first_party = ["morecantile"]
@@ -73,8 +84,18 @@ known_third_party = ["rasterio", "pydantic", "pyproj", "mercantile"]
 default_section = "THIRDPARTY"
 
 [tool.mypy]
-no_strict_optional = "True"
+no_strict_optional = true
 
-[tool.pydocstyle]
-select = "D1"
-match = "(?!test).*.py"
+[tool.ruff]
+select = [
+    "D1",  # pydocstyle errors
+    "E",  # pycodestyle errors
+    "W",  # pycodestyle warnings
+    "C",  # flake8-comprehensions
+    "B",  # flake8-bugbear
+]
+ignore = [
+    "E501",  # line too long, handled by black
+    "B008",  # do not perform function calls in argument defaults
+    "B905",  # ignore zip() without an explicit strict= parameter, only support with python >3.10
+]

morecantile-3.2.4/.flake8

@@ -1,5 +0,0 @@
-[flake8]
-ignore = E501,W503,E203
-exclude = .git,__pycache__,docs/source/conf.py,old,build,dist
-max-complexity = 12
-max-line-length = 90

morecantile-3.2.4/.pre-commit-config.yaml

@@ -1,32 +0,0 @@
-repos:
-  - repo: https://github.com/psf/black
-    rev: 22.3.0
-    hooks:
-      - id: black
-        language_version: python
-
-  - repo: https://github.com/PyCQA/isort
-    rev: 5.4.2
-    hooks:
-      - id: isort
-        language_version: python
-
-  - repo: https://github.com/PyCQA/flake8
-    rev: 3.8.3
-    hooks:
-      - id: flake8
-        language_version: python
-
-  - repo: https://github.com/PyCQA/pydocstyle
-    rev: 6.1.1
-    hooks:
-      - id: pydocstyle
-        language_version: python
-        additional_dependencies:
-          - toml
-
-  - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v0.812
-    hooks:
-      - id: mypy
-        language_version: python

morecantile-3.2.4/setup.py

@@ -1,31 +0,0 @@
-"""Fake morecantile setup.py for github."""
-import sys
-
-from setuptools import setup
-
-sys.stderr.write(
-    """
-===============================
-Unsupported installation method
-===============================
-morecantile no longer supports installation with `python setup.py install`.
-Please use `python -m pip install .` instead.
-"""
-)
-sys.exit(1)
-
-
-# The below code will never execute, however GitHub is particularly
-# picky about where it finds Python packaging metadata.
-# See: https://github.com/github/feedback/discussions/6456
-#
-# To be removed once GitHub catches up.
-
-setup(
-    name="morecantile",
-    install_requires=[
-        "attrs",
-        "pyproj~=3.1",
-        "pydantic",
-    ],
-)