morecantile 6.1.0__py3-none-any.whl → 7.0.0__py3-none-any.whl

morecantile/scripts/cli.py

@@ -11,6 +11,8 @@ import morecantile
 
 logger = logging.getLogger(__name__)
 
+WGS84_CRS = CRS.from_epsg(4326)
+
 
 def configure_logging(verbosity):
     """Configure log verbosity.
@@ -189,6 +191,11 @@ def cli(ctx, verbose, quiet):
     help="Path to TileMatrixSet JSON file.",
     type=click.Path(),
 )
+@click.option(
+    "--crs",
+    help="Geographic CRS. Default to WGS84.",
+    type=str,
+)
 @click.pass_context
 def shapes(  # noqa: C901
     ctx,
@@ -204,6 +211,7 @@ def shapes(  # noqa: C901
     extents,
     buffer,
     tms,
+    crs,
 ):
     """
     Reads one or more Web Mercator tile descriptions
@@ -259,6 +267,7 @@ def shapes(  # noqa: C901
             projected=projected,
             buffer=buffer,
             precision=precision,
+            geographic_crs=CRS.from_user_input(crs) if crs else WGS84_CRS,
         )
         bbox = feature["bbox"]
         w, s, e, n = bbox
@@ -402,7 +411,7 @@ def tiles(ctx, zoom, input, identifier, seq, tms):  # noqa: C901
 def tms(identifier):
     """Print TMS JSON."""
     tms = morecantile.tms.get(identifier)
-    click.echo(tms.json(exclude_none=True))
+    click.echo(tms.model_dump_json(exclude_none=True))
 
 
 ################################################################################
@@ -445,8 +454,6 @@ def custom(
     epsg, extent, name, minzoom, maxzoom, tile_width, tile_height, extent_epsg, title
 ):
     """Create Custom TMS."""
-    extent_crs = CRS.from_epsg(extent_epsg) if extent_epsg else None
-
     tms = morecantile.TileMatrixSet.custom(
         extent,
         CRS.from_epsg(epsg),
@@ -455,10 +462,10 @@ def custom(
         maxzoom=maxzoom,
         tile_width=tile_width,
         tile_height=tile_height,
-        extent_crs=extent_crs,
+        extent_crs=CRS.from_epsg(extent_epsg) if extent_epsg else None,
         title=title or "Custom TileMatrixSet",
     )
-    click.echo(tms.json(exclude_none=True))
+    click.echo(tms.model_dump_json(exclude_none=True))
 
 
 ################################################################################
@@ -526,6 +533,11 @@ def custom(
     default=None,
     help="Shift shape x and y values by a constant number",
 )
+@click.option(
+    "--crs",
+    help="Geographic CRS. Default to WGS84.",
+    type=str,
+)
 def tms_to_geojson(  # noqa: C901
     input,
     level,
@@ -538,6 +550,7 @@ def tms_to_geojson(  # noqa: C901
     collect,
     extents,
     buffer,
+    crs,
 ):
     """Print TMS document as GeoJSON."""
     tms = morecantile.TileMatrixSet(**json.load(input))
@@ -568,6 +581,7 @@ def tms_to_geojson(  # noqa: C901
                 projected=projected,
                 buffer=buffer,
                 precision=precision,
+                geographic_crs=CRS.from_user_input(crs) if crs else WGS84_CRS,
             )
             bbox = feature["bbox"]
             w, s, e, n = bbox

morecantile/utils.py

@@ -1,7 +1,7 @@
 """morecantile utils."""
 
 import math
-from typing import Dict, List
+from typing import Dict, List, Tuple
 
 from pyproj import CRS
 from pyproj.enums import WktVersion
@@ -110,6 +110,28 @@ def point_in_bbox(point: Coords, bbox: BoundingBox, precision: int = 5) -> bool:
     )
 
 
+def truncate_coordinates(
+    lng: float, lat: float, bbox: BoundingBox
+) -> Tuple[float, float]:
+    """
+    Truncate coordinates to a given bbox.
+
+    Adapted from https://github.com/mapbox/mercantile/blob/master/mercantile/__init__.py
+
+    """
+    if lng > bbox.right:
+        lng = bbox.right
+    elif lng < bbox.left:
+        lng = bbox.left
+
+    if lat > bbox.top:
+        lat = bbox.top
+    elif lat < bbox.bottom:
+        lat = bbox.bottom
+
+    return lng, lat
+
+
 def is_power_of_two(number: int) -> bool:
     """Check if a number is a power of 2"""
     return (number & (number - 1) == 0) and number != 0
@@ -118,12 +140,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.1.0.dist-info → morecantile-7.0.0.dist-info}/METADATA

@@ -1,44 +1,49 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: morecantile
-Version: 6.1.0
+Version: 7.0.0
 Summary: Construct and use map tile grids (a.k.a TileMatrixSet / TMS).
-Keywords: GIS,TMS,TileMatrixSet,Map Tile
+Project-URL: Source, https://github.com/developmentseed/morecantile
+Project-URL: Documentation, https://developmentseed.org/morecantile/
 Author-email: Vincent Sarago <vincent@developmentseed.com>
-Requires-Python: >=3.8
-Description-Content-Type: text/markdown
+License: MIT License
+        
+        Copyright (c) 2020 Development Seed
+        
+        Permission is hereby granted, free of charge, to any person obtaining a copy
+        of this software and associated documentation files (the "Software"), to deal
+        in the Software without restriction, including without limitation the rights
+        to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+        copies of the Software, and to permit persons to whom the Software is
+        furnished to do so, subject to the following conditions:
+        
+        The above copyright notice and this permission notice shall be included in all
+        copies or substantial portions of the Software.
+        
+        THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+        IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+        FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+        AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+        LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+        OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+        SOFTWARE.
+License-File: LICENSE
+Keywords: GIS,Map Tile,TMS,TileMatrixSet
 Classifier: Intended Audience :: Information Technology
 Classifier: Intended Audience :: Science/Research
-Classifier: License :: OSI Approved :: BSD License
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
+Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Scientific/Engineering :: GIS
+Requires-Python: >=3.11
 Requires-Dist: attrs
-Requires-Dist: pyproj~=3.1
+Requires-Dist: click
 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"
-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"
-Requires-Dist: pytest ; extra == "test"
-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
+Requires-Dist: pyproj<4.0,>=3.1
 Provides-Extra: rasterio
-Provides-Extra: test
+Requires-Dist: rasterio>=1.2.1; extra == 'rasterio'
+Description-Content-Type: text/markdown
 
 # Morecantile
 
@@ -86,12 +91,12 @@ Morecantile is like [mercantile](https://github.com/mapbox/mercantile) (the best
 ## Install
 
 ```bash
-$ python -m pip install -U pip
-$ python -m pip install morecantile
+python -m pip install -U pip
+python -m pip install morecantile
 
 # Or install from source:
-$ python -m pip install -U pip
-$ python -m 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
 ```
 
 ## Usage
@@ -177,4 +182,3 @@ See [LICENSE](https://github.com/developmentseed/morecantile/blob/main/LICENSE)
 ## Authors
 
 Created by [Development Seed](<http://developmentseed.org>)
-

{morecantile-6.1.0.dist-info → morecantile-7.0.0.dist-info}/RECORD

@@ -1,28 +1,28 @@
-morecantile/__init__.py,sha256=Ge_Q-KuZkTJKwAfz3oz8LHNYTPlGZpU-OHRpTtm4XjY,436
+morecantile/__init__.py,sha256=7ZqZLq-TQmgh6C1xVQpzF66D83AO9RBtiq9iR_i1-og,436
 morecantile/commons.py,sha256=iHElysLSMu-zb3h1G1-AJnQrZ6y-2GseZkoBkOuzcZ8,1031
-morecantile/defaults.py,sha256=9lvHmZ9WM_J5uNCS9VWEy8O5_x2dA2Spvk4H5aHv6UQ,1804
+morecantile/defaults.py,sha256=55ZkV0fw7nSAklZgQSL7IVvLspqe3RVpTZd_nNxPlTo,1951
 morecantile/errors.py,sha256=rhtdpNglfEz5nC8I-BJKUr_gkOwAPwVi1vhLFJ2StYw,907
-morecantile/models.py,sha256=17p2BlpYRGxW61WK4fwh6GU68Gffa9ovGWghk2cQzaI,51856
+morecantile/models.py,sha256=dcQr3IWHc4iq5BwdgA4OqPyaKQKo5QX8XTE2AZ-I2no,56250
 morecantile/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-morecantile/utils.py,sha256=-JUTcrwhT_TEWAPWV8YQBQJoYU2HfVkqQEJaggtnKJg,4020
+morecantile/utils.py,sha256=6_J8i3u5RC9Z6ljzaWjvtU6woIMICsnIz-_B1enx7T8,4462
 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
 morecantile/data/GNOSISGlobalGrid.json,sha256=xFrneT5mwP3gJkDeCTkyuSXniw9Afdoa1PqdbqmVRaA,74685
 morecantile/data/LINZAntarticaMapTilegrid.json,sha256=dPfxQgpQlCAaaecmems9lTeFkPLbg0iBFqh5ItL-cpQ,5176
-morecantile/data/NZTM2000Quad.json,sha256=PAbOQYz4-TWduSqPVCpbEuaFwNBuVLDbefVVxFN531k,8457
+morecantile/data/NZTM2000Quad.json,sha256=3fXsFF1fQZExb5iZEpBxjaaUocfHUvRfckrTSPVmaSg,8388
 morecantile/data/README.md,sha256=b0ipEXJ24gR_7UmAdZuRxb_UjvQxuzqrJQOYMED-JUo,257
 morecantile/data/UPSAntarcticWGS84Quad.json,sha256=mmvm_HNKHpZloQPiN53LsIm8Ix9qZIV9CSxnkTRa--Y,7374
 morecantile/data/UPSArcticWGS84Quad.json,sha256=BupbyUtl1gZOrah5wnVUfOa1cKV_6RShjGx5Q56ReBI,7365
 morecantile/data/UTM31WGS84Quad.json,sha256=-cDrMJ-LFEFug7pVL85PKCdzTIWfiJwevv_QE5811Bs,7367
 morecantile/data/WGS1984Quad.json,sha256=7qnkuMBPAjdahGREta6_uScNkDoK7pUbplA3froQnrs,6930
-morecantile/data/WebMercatorQuad.json,sha256=kEaPEAaZrD8vQZo2OvcQlS1Q7lq3ums-uPJs46aPceY,7844
+morecantile/data/WebMercatorQuad.json,sha256=SAJ1gBA0LccnIq3qIEoUxoJ6_45sLClKYa-zPad24gQ,11027
 morecantile/data/WorldCRS84Quad.json,sha256=l0Wf2faYwzRwO0mG-Tea1Vydpi7V1Oel5L9l2NXHogk,7072
 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.1.0.dist-info/entry_points.txt,sha256=keoXuYgnX-mdrGWwXIHqEkSZjQK_iAmtmdrtZ3sCT24,59
-morecantile-6.1.0.dist-info/LICENSE,sha256=18IxFIta7rF_RcVSIgLUUd_alyfQ9bGoZKQm5vOarGU,1073
-morecantile-6.1.0.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
-morecantile-6.1.0.dist-info/METADATA,sha256=FuP9VVcbql1Tn47NSTrmD_cOL8T2rBLqvp2pc0mYges,7266
-morecantile-6.1.0.dist-info/RECORD,,
+morecantile/scripts/cli.py,sha256=X5Kq4H-fsNeO2IXocVw0fcc9oHHUxLeAVDXRUefkMAY,17742
+morecantile-7.0.0.dist-info/METADATA,sha256=frw0l-CRklTHxKG8SSZUMdocqw1o2D2NClAdq5W54Hs,7760
+morecantile-7.0.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+morecantile-7.0.0.dist-info/entry_points.txt,sha256=vbc6D3vR1kftKoSquOo7T1wtbIvRI-KkRsXsU1M0R2U,60
+morecantile-7.0.0.dist-info/licenses/LICENSE,sha256=18IxFIta7rF_RcVSIgLUUd_alyfQ9bGoZKQm5vOarGU,1073
+morecantile-7.0.0.dist-info/RECORD,,

{morecantile-6.1.0.dist-info → morecantile-7.0.0.dist-info}/WHEEL

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

morecantile-7.0.0.dist-info/entry_points.txt

@@ -0,0 +1,2 @@
+[console_scripts]
+morecantile = morecantile.scripts.cli:cli

morecantile-6.1.0.dist-info/entry_points.txt

@@ -1,3 +0,0 @@
-[console_scripts]
-morecantile=morecantile.scripts.cli:cli
-