diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2021-08-19 10:11:47 +0200 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2021-08-19 08:34:01 +0000 |
| commit | dff8e5df3f5e80a88590fc87aca17b39008289cc (patch) | |
| tree | 0a5e285a6383537a8318a5d2bc01a36ab8ac5e2a /include | |
| parent | b8ab9150834257bcb197ca73b5a81eef7becdbdc (diff) | |
| download | PROJ-dff8e5df3f5e80a88590fc87aca17b39008289cc.tar.gz PROJ-dff8e5df3f5e80a88590fc87aca17b39008289cc.zip | |
Merge pull request #2814 from rouault/fix_2813
BoundCRS: accept importing/exporting in WKT2 and PROJJSON the scope/area/extent/id attributes (fixes #2813)
Diffstat (limited to 'include')
| -rw-r--r-- | include/proj/crs.hpp | 5 | ||||
| -rw-r--r-- | include/proj/io.hpp | 6 |
2 files changed, 10 insertions, 1 deletions
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 @@ -1011,6 +1011,11 @@ class PROJ_GCC_DLL BoundCRS final : public CRS, //! @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 |