diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2020-05-19 12:42:50 +0200 |
|---|---|---|
| committer | Even Rouault <even.rouault@spatialys.com> | 2020-05-19 14:20:55 +0200 |
| commit | ec3fdd00f133736560f807765dd73367c85f4bdc (patch) | |
| tree | 619de908565fbb03e18d90da94b88a3eb5fef76b /include | |
| parent | 1a715234754146ebe224fb849a87ca6575fdc88f (diff) | |
| download | PROJ-ec3fdd00f133736560f807765dd73367c85f4bdc.tar.gz PROJ-ec3fdd00f133736560f807765dd73367c85f4bdc.zip | |
WKT1 ingestion: fix ingestion of COMPD_CS with ellipsoidal vertical datum and non metre units (contributes to fixes #2232)
Diffstat (limited to 'include')
| -rw-r--r-- | include/proj/crs.hpp | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/include/proj/crs.hpp b/include/proj/crs.hpp index 7aa74c41..bbdc9565 100644 --- a/include/proj/crs.hpp +++ b/include/proj/crs.hpp @@ -68,6 +68,12 @@ using BoundCRSPtr = std::shared_ptr<BoundCRS>; /** Non-null shared pointer of BoundCRS */ using BoundCRSNNPtr = util::nn<BoundCRSPtr>; +class CompoundCRS; +/** Shared pointer of CompoundCRS */ +using CompoundCRSPtr = std::shared_ptr<CompoundCRS>; +/** Non-null shared pointer of CompoundCRS */ +using CompoundCRSNNPtr = util::nn<CompoundCRSPtr>; + // --------------------------------------------------------------------------- class CRS; @@ -141,7 +147,12 @@ class PROJ_GCC_DLL CRS : public common::ObjectUsage, PROJ_INTERNAL CRSNNPtr allowNonConformantWKT1Export() const; PROJ_INTERNAL CRSNNPtr - attachOriginalVertCRS(const VerticalCRSNNPtr &vertCRS) const; + attachOriginalCompoundCRS(const CompoundCRSNNPtr &compoundCRS) const; + + PROJ_INTERNAL CRSNNPtr promoteTo3D( + const std::string &newName, const io::DatabaseContextPtr &dbContext, + const cs::CoordinateSystemAxisNNPtr &verticalAxisIfNotAlreadyPresent) + const; //! @endcond @@ -855,12 +866,6 @@ class PROJ_GCC_DLL InvalidCompoundCRSException : public util::Exception { // --------------------------------------------------------------------------- -class CompoundCRS; -/** Shared pointer of CompoundCRS */ -using CompoundCRSPtr = std::shared_ptr<CompoundCRS>; -/** Non-null shared pointer of CompoundCRS */ -using CompoundCRSNNPtr = util::nn<CompoundCRSPtr>; - /** \brief A coordinate reference system describing the position of points * through two or more independent single coordinate reference systems. * |