Merge pull request #142 from developmentseed/patch/crs-wkt-is-projjso…

…n-object OGC says Well Known Text is a PROJJSON object
developmentseed · Jan 18, 2024 · ef793c7 · ef793c7
2 parents d0aa3ad + 1b3eee0
commit ef793c7
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 10 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,4 +1,24 @@
 
+## 5.2.1 (2024-01-18)
+
+* fix `CRS` WKT type from `string` to `Object` (PROJJSON) (ref: https://github.com/opengeospatial/2D-Tile-Matrix-Set/issues/89).
+
+    ```python
+    # Before
+    wkt = pyproj.CRS.from_epsg(3857).to_wkt()
+    TileMatrixSet(
+        ...
+        crs={"wkt": wkt}
+    )
+
+    # Now
+    wkt = pyproj.CRS.from_epsg(3857).to_json_dict()
+    TileMatrixSet(
+        ...
+        crs={"wkt": wkt}
+    )
+    ```
+
 ## 5.2.0 (2024-01-18)
 
 * fix `CRS` parsing to allow `wkt ({"wkt": ...})` and `uri ({"uri": ...})` defined CRS

diff --git a/morecantile/models.py b/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 @@ def model_post_init(self, __context: Any) -> None:
             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 @@ def custom(
             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,

diff --git a/tests/test_models.py b/tests/test_models.py
@@ -566,7 +566,7 @@ def test_crs_type():
     assert crs._pyproj_crs == pyproj.CRS.from_epsg(3857)
 
     # CRSWKT
-    wkt = pyproj.CRS.from_epsg(3857).to_wkt()
+    wkt = pyproj.CRS.from_epsg(3857).to_json_dict()
     crs = CRS({"wkt": wkt})
     assert crs.root == CRSWKT(wkt=wkt)
     assert crs.model_dump()["wkt"] == wkt