Merge 85c918c into ae074ee

pyproj4 · Feb 12, 2020 · 72e5db3 · 72e5db3
2 parents ae074ee + 85c918c
commit 72e5db3
Show file tree

Hide file tree

Showing 10 changed files with 1,580 additions and 425 deletions.
diff --git a/docs/api/crs/crs.rst b/docs/api/crs/crs.rst
@@ -21,6 +21,15 @@ GeographicCRS
     :special-members: __init__
 
 
+DerivedGeographicCRS
+------------------------
+
+.. autoclass:: pyproj.crs.DerivedGeographicCRS
+    :members:
+    :show-inheritance:
+    :special-members: __init__
+
+
 ProjectedCRS
 -----------------------
 

diff --git a/docs/history.rst b/docs/history.rst
@@ -12,6 +12,7 @@ Change Log
 * BUG: Fix getting :attr:`pyproj.crs.Ellipsoid.semi_minor_metre` when not computed (issue #457)
 * ENH: Added support for custom CRS (issue #389)
 * ENH: Added enumeration for WKT2_2019 (issue #526)
+* ENH: Update from_cf/to_cf to use WKT instead of PROJ strings for internal management (issue #515)
 
 2.4.2
 ~~~~~

diff --git a/pyproj/crs/__init__.py b/pyproj/crs/__init__.py
@@ -20,6 +20,7 @@
     CRS,
     BoundCRS,
     CompoundCRS,
+    DerivedGeographicCRS,
     GeographicCRS,
     ProjectedCRS,
     VerticalCRS,