aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorEven Rouault <even.rouault@spatialys.com>2020-10-07 23:58:36 +0200
committerEven Rouault <even.rouault@spatialys.com>2020-10-08 17:31:56 +0200
commit53672bdf7074e3737f6e6a53ee7373dcbccd6ea4 (patch)
treedfbdcb78c020aa43a3597210eb0d998e9b8f1e21 /include
parent9dc3bf503b0455526a4d180930f8414621ea6187 (diff)
downloadPROJ-53672bdf7074e3737f6e6a53ee7373dcbccd6ea4.tar.gz
PROJ-53672bdf7074e3737f6e6a53ee7373dcbccd6ea4.zip
Make CRS identification work with CRS with DatumEnsemble
Diffstat (limited to 'include')
-rw-r--r--include/proj/crs.hpp11
1 files changed, 10 insertions, 1 deletions
diff --git a/include/proj/crs.hpp b/include/proj/crs.hpp
index bbdc9565..a028aceb 100644
--- a/include/proj/crs.hpp
+++ b/include/proj/crs.hpp
@@ -194,7 +194,10 @@ class PROJ_GCC_DLL SingleCRS : public CRS {
PROJ_INTERNAL void
exportDatumOrDatumEnsembleToWkt(io::WKTFormatter *formatter)
const; // throw(io::FormattingException)
- //! @endcond
+
+ PROJ_INTERNAL const datum::DatumNNPtr
+ datumNonNull(const io::DatabaseContextPtr &dbContext) const;
+ //! @endcond
protected:
PROJ_INTERNAL SingleCRS(const datum::DatumPtr &datumIn,
@@ -289,6 +292,9 @@ class PROJ_GCC_DLL GeodeticCRS : virtual public SingleCRS,
PROJ_INTERNAL void
addDatumInfoToPROJString(io::PROJStringFormatter *formatter) const;
+ PROJ_INTERNAL const datum::GeodeticReferenceFrameNNPtr
+ datumNonNull(const io::DatabaseContextPtr &dbContext) const;
+
PROJ_INTERNAL void addGeocentricUnitConversionIntoPROJString(
io::PROJStringFormatter *formatter) const;
@@ -474,6 +480,9 @@ class PROJ_GCC_DLL VerticalCRS : virtual public SingleCRS,
PROJ_INTERNAL void
addLinearUnitConvert(io::PROJStringFormatter *formatter) const;
+ PROJ_INTERNAL const datum::VerticalReferenceFrameNNPtr
+ datumNonNull(const io::DatabaseContextPtr &dbContext) const;
+
PROJ_INTERNAL void _exportToWKT(io::WKTFormatter *formatter)
const override; // throw(io::FormattingException)