morecantile 5.3.0__tar.gz → 5.4.0__tar.gz

{morecantile-5.3.0 → morecantile-5.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: morecantile
-Version: 5.3.0
+Version: 5.4.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>
@@ -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.3.0 → morecantile-5.4.0}/morecantile/__init__.py

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

{morecantile-5.3.0 → morecantile-5.4.0}/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,
@@ -1252,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.3.0 → morecantile-5.4.0}/morecantile/scripts/cli.py

@@ -184,6 +184,11 @@ def cli(ctx, verbose, quiet):
     default=None,
     help="Shift shape x and y values by a constant number",
 )
+@click.option(
+    "--tms",
+    help="Path to TileMatrixSet JSON file.",
+    type=click.Path(),
+)
 @click.pass_context
 def shapes(  # noqa: C901
     ctx,
@@ -198,6 +203,7 @@ def shapes(  # noqa: C901
     collect,
     extents,
     buffer,
+    tms,
 ):
     """
     Reads one or more Web Mercator tile descriptions
@@ -217,7 +223,10 @@ def shapes(  # noqa: C901
     the properties object of the output feature.
 
     """
-    tms = morecantile.tms.get(identifier)
+    tilematrixset = morecantile.tms.get(identifier)
+    if tms:
+        with open(tms, "r") as f:
+            tilematrixset = morecantile.TileMatrixSet(**json.load(f))
 
     dump_kwds = {"sort_keys": True}
     if indent:
@@ -243,7 +252,7 @@ def shapes(  # noqa: C901
         else:
             raise click.BadParameter("{0}".format(obj), param=input, param_hint="input")
 
-        feature = tms.feature(
+        feature = tilematrixset.feature(
             (x, y, z),
             fid=fid,
             props=props,
@@ -273,7 +282,7 @@ def shapes(  # noqa: C901
         click.echo(
             json.dumps(
                 {"type": "FeatureCollection", "bbox": bbox, "features": features},
-                **dump_kwds
+                **dump_kwds,
             )
         )
 
@@ -302,8 +311,13 @@ def shapes(  # noqa: C901
     default=False,
     help="Write a RS-delimited JSON sequence (default is LF).",
 )
+@click.option(
+    "--tms",
+    help="Path to TileMatrixSet JSON file.",
+    type=click.Path(),
+)
 @click.pass_context
-def tiles(ctx, zoom, input, identifier, seq):  # noqa: C901
+def tiles(ctx, zoom, input, identifier, seq, tms):  # noqa: C901
     """
     Lists TMS tiles at ZOOM level intersecting
     GeoJSON [west, south, east, north] bounding boxen, features, or
@@ -324,7 +338,10 @@ def tiles(ctx, zoom, input, identifier, seq):  # noqa: C901
     [853, 1551, 12]
 
     """
-    tms = morecantile.tms.get(identifier)
+    tilematrixset = morecantile.tms.get(identifier)
+    if tms:
+        with open(tms, "r") as f:
+            tilematrixset = morecantile.TileMatrixSet(**json.load(f))
 
     for obj in normalize_source(input):
         if isinstance(obj, list):
@@ -362,7 +379,9 @@ def tiles(ctx, zoom, input, identifier, seq):  # noqa: C901
             east -= epsilon
             north -= epsilon
 
-        for tile in tms.tiles(west, south, east, north, [zoom], truncate=False):
+        for tile in tilematrixset.tiles(
+            west, south, east, north, [zoom], truncate=False
+        ):
             vals = (tile.x, tile.y, zoom)
             output = json.dumps(vals)
             if seq:

{morecantile-5.3.0 → morecantile-5.4.0}/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.3.0 → morecantile-5.4.0}/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.4.0"
+
+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.3.0/.bumpversion.cfg

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