From dff8e5df3f5e80a88590fc87aca17b39008289cc Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Thu, 19 Aug 2021 10:11:47 +0200 Subject: Merge pull request #2814 from rouault/fix_2813 BoundCRS: accept importing/exporting in WKT2 and PROJJSON the scope/area/extent/id attributes (fixes #2813) --- include/proj/crs.hpp | 5 +++++ include/proj/io.hpp | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) (limited to 'include/proj') diff --git a/include/proj/crs.hpp b/include/proj/crs.hpp index 481667b5..dcab094a 100644 --- a/include/proj/crs.hpp +++ b/include/proj/crs.hpp @@ -1010,6 +1010,11 @@ class PROJ_GCC_DLL BoundCRS final : public CRS, const override; // throw(io::FormattingException) //! @endcond + PROJ_DLL static BoundCRSNNPtr + create(const util::PropertyMap &properties, const CRSNNPtr &baseCRSIn, + const CRSNNPtr &hubCRSIn, + const operation::TransformationNNPtr &transformationIn); + PROJ_DLL static BoundCRSNNPtr create(const CRSNNPtr &baseCRSIn, const CRSNNPtr &hubCRSIn, const operation::TransformationNNPtr &transformationIn); diff --git a/include/proj/io.hpp b/include/proj/io.hpp index 11912e3d..1c858248 100644 --- a/include/proj/io.hpp +++ b/include/proj/io.hpp @@ -537,7 +537,11 @@ class PROJ_GCC_DLL JSONFormatter { // cppcheck-suppress functionStatic PROJ_INTERNAL bool outputId() const; - PROJ_INTERNAL bool outputUsage() const; + PROJ_INTERNAL bool + outputUsage(bool calledBeforeObjectContext = false) const; + + PROJ_INTERNAL static const char *PROJJSON_v0_2; + PROJ_INTERNAL static const char *PROJJSON_v0_3; //! @endcond -- cgit v1.2.3