morecantile 5.2.0__tar.gz → 5.2.2__tar.gz

{morecantile-5.2.0 → morecantile-5.2.2}/.bumpversion.cfg

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

{morecantile-5.2.0 → morecantile-5.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: morecantile
-Version: 5.2.0
+Version: 5.2.2
 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>

{morecantile-5.2.0 → morecantile-5.2.2}/morecantile/__init__.py

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

{morecantile-5.2.0 → morecantile-5.2.2}/morecantile/data/README.md

@@ -1,5 +1,5 @@
 # tileMatrixSet json documents
 
-TileMatrixSet from http://schemas.opengis.net/tms/1.0/json/examples/
+TileMatrixSet from https://schemas.opengis.net/tms/2.0/json/examples/tilematrixset/
 
 `NZTM2000` and `LINZAntarticaMapTilegrid` are from GDAL https://github.com/OSGeo/gdal/pull/2505/files#diff-33251b8c7db3e78835102ded8d11d851

{morecantile-5.2.0 → morecantile-5.2.2}/morecantile/data/WGS1984Quad.json

@@ -1,5 +1,5 @@
 {
-  "id": "WorldCRS84Quad",
+  "id": "WGS1984Quad",
   "title": "EPSG:4326 for the World",
   "uri": "http://www.opengis.net/def/tilematrixset/OGC/1.0/WorldCRS84Quad",
   "crs": "http://www.opengis.net/def/crs/EPSG/0/4326",
@@ -322,4 +322,4 @@
       "matrixHeight": 8388608
     }
   ]
-}
+}

{morecantile-5.2.0 → morecantile-5.2.2}/morecantile/models.py

@@ -64,15 +64,12 @@ class CRSUri(BaseModel):
 
 
 class CRSWKT(BaseModel):
-    """Coordinate Reference System (CRS) from WKT."""
+    """Coordinate Reference System (CRS) from WKT encoded as PROJJSON Object."""
 
     wkt: Annotated[
-        str,
+        Dict,
         Field(
-            description="Reference to one coordinate reference system (CRS) as WKT string",
-            examples=[
-                'GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]]',
-            ],
+            description="An object defining the CRS using the JSON encoding for Well-known text representation of coordinate reference systems 2.0",
         ),
     ]
 
@@ -109,7 +106,7 @@ class CRS(RootModel[Union[str, Union[CRSUri, CRSWKT, CRSRef]]]):
             self._pyproj_crs = pyproj.CRS.from_user_input(str(self.root.uri))
 
         elif isinstance(self.root, CRSWKT):
-            self._pyproj_crs = pyproj.CRS.from_wkt(self.root.wkt)
+            self._pyproj_crs = pyproj.CRS.from_json_dict(self.root.wkt)
 
         elif isinstance(self.root, CRSRef):
             raise NotImplementedError(
@@ -660,10 +657,10 @@ class TileMatrixSet(BaseModel, arbitrary_types_allowed=True):
             try:
                 pyproj.CRS.from_user_input(crs_data)
             except CRSError:
-                crs_data = {"wkt": crs.to_wkt()}
+                crs_data = {"wkt": crs.to_json_dict()}
 
         else:
-            crs_data = {"wkt": crs.to_wkt()}
+            crs_data = {"wkt": crs.to_json_dict()}
 
         return cls(
             crs=crs_data,