From 31692d0c0667f26ea1975affeae161beabb279fd Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Wed, 18 Aug 2021 20:27:46 +0200 Subject: =?UTF-8?q?BoundCRS:=20accept=20importing/exporting=20in=20WKT2=20?= =?UTF-8?q?and=20PROJJSON=20the=20scope/area/extent/id=20attributes=20(fix?= =?UTF-8?q?es=C2=A0#2813)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit For PROJJSON only, also accept the ``name`` attribute. --- include/proj/crs.hpp | 5 +++++ include/proj/io.hpp | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) (limited to 'include') 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