diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2020-05-17 20:47:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-17 20:47:15 +0200 |
| commit | b349fa73847740950b2c5f5e6e1f5769ab594b44 (patch) | |
| tree | dd00105bf829d5bcc4bf8104999bd454c87c3f50 /include | |
| parent | 2d6b5c0a9a1e0f0f92e69c641a16377ef36f8270 (diff) | |
| parent | 6a3371ea66098b13f83414519317b3fe72d7a148 (diff) | |
| download | PROJ-b349fa73847740950b2c5f5e6e1f5769ab594b44.tar.gz PROJ-b349fa73847740950b2c5f5e6e1f5769ab594b44.zip | |
Merge pull request #2229 from rouault/fix_2228
Allow importing WKT1 COMPD_CS with a VERT_DATUM[Ellipsoid,2002]
Diffstat (limited to 'include')
| -rw-r--r-- | include/proj/crs.hpp | 3 | ||||
| -rw-r--r-- | include/proj/datum.hpp | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/include/proj/crs.hpp b/include/proj/crs.hpp index 61844f79..7aa74c41 100644 --- a/include/proj/crs.hpp +++ b/include/proj/crs.hpp @@ -140,6 +140,9 @@ class PROJ_GCC_DLL CRS : public common::ObjectUsage, PROJ_INTERNAL CRSNNPtr allowNonConformantWKT1Export() const; + PROJ_INTERNAL CRSNNPtr + attachOriginalVertCRS(const VerticalCRSNNPtr &vertCRS) const; + //! @endcond protected: diff --git a/include/proj/datum.hpp b/include/proj/datum.hpp index 6a0db1dc..3fc5f5d8 100644 --- a/include/proj/datum.hpp +++ b/include/proj/datum.hpp @@ -590,6 +590,8 @@ class PROJ_GCC_DLL VerticalReferenceFrame : public Datum { PROJ_INTERNAL void _exportToJSON(io::JSONFormatter *formatter) const override; // throw(FormattingException) + PROJ_INTERNAL const std::string &getWKT1DatumType() const; + //! @endcond protected: |