diff options
| author | Kristian Evers <kristianevers@gmail.com> | 2019-03-25 08:34:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-25 08:34:38 +0100 |
| commit | 85b1d84934d95c740f549c55c196a92487ff45a8 (patch) | |
| tree | ca679865e0648081e723c2e5db4a85de76f5df63 /include | |
| parent | 56784e70f3903cd1a0a7a3d47dfef7f837400d28 (diff) | |
| parent | 8763ea7f01bd349df29c5c4ce3b4edd6252eff37 (diff) | |
| download | PROJ-85b1d84934d95c740f549c55c196a92487ff45a8.tar.gz PROJ-85b1d84934d95c740f549c55c196a92487ff45a8.zip | |
Merge pull request #1360 from rouault/update_parser_to_ogc_18_010r6
WKT2 parser: update to OGC 18-010r6
Diffstat (limited to 'include')
| -rw-r--r-- | include/proj/coordinateoperation.hpp | 6 | ||||
| -rw-r--r-- | include/proj/internal/io_internal.hpp | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/include/proj/coordinateoperation.hpp b/include/proj/coordinateoperation.hpp index af1c293f..4397ed60 100644 --- a/include/proj/coordinateoperation.hpp +++ b/include/proj/coordinateoperation.hpp @@ -150,6 +150,8 @@ class PROJ_GCC_DLL CoordinateOperation : public common::ObjectUsage, PROJ_DLL bool hasBallparkTransformation() const; + PROJ_DLL static const std::string OPERATION_VERSION_KEY; + protected: PROJ_INTERNAL CoordinateOperation(); PROJ_INTERNAL CoordinateOperation(const CoordinateOperation &other); @@ -171,6 +173,10 @@ class PROJ_GCC_DLL CoordinateOperation : public common::ObjectUsage, const std::vector<metadata::PositionalAccuracyNNPtr> &accuracies); PROJ_INTERNAL void setHasBallparkTransformation(bool b); + PROJ_INTERNAL void + setProperties(const util::PropertyMap + &properties); // throw(InvalidValueTypeException) + private: PROJ_OPAQUE_PRIVATE_DATA CoordinateOperation &operator=(const CoordinateOperation &other) = delete; diff --git a/include/proj/internal/io_internal.hpp b/include/proj/internal/io_internal.hpp index 403698db..f614fc67 100644 --- a/include/proj/internal/io_internal.hpp +++ b/include/proj/internal/io_internal.hpp @@ -133,6 +133,7 @@ class WKTConstants { static const std::string BASEENGCRS; static const std::string BASEPARAMCRS; static const std::string BASETIMECRS; + static const std::string VERSION; // WKT2 alternate (longer or shorter) static const std::string GEODETICCRS; |