diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2019-05-07 11:39:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-07 11:39:48 +0200 |
| commit | 850050693a25843d6ae69492cfad72f7753e39f7 (patch) | |
| tree | 4d464df04190ae115e7f54259457286d22580eb9 /include | |
| parent | 4636df33ed4d2a9bedf19973d58a42858fb816c0 (diff) | |
| parent | d4ffaca08a4f2ef3475165c2634561ee9bf01885 (diff) | |
| download | PROJ-850050693a25843d6ae69492cfad72f7753e39f7.tar.gz PROJ-850050693a25843d6ae69492cfad72f7753e39f7.zip | |
Merge pull request #1454 from rouault/fix_ETRS89_3D_to_proj_string_with_geoidgrids_nadgrids
createOperations(): fix case of ETRS89 3D to proj string with nadgrids and geoidgrids
Diffstat (limited to 'include')
| -rw-r--r-- | include/proj/coordinateoperation.hpp | 3 | ||||
| -rw-r--r-- | include/proj/internal/internal.hpp | 3 | ||||
| -rw-r--r-- | include/proj/io.hpp | 3 |
3 files changed, 7 insertions, 2 deletions
diff --git a/include/proj/coordinateoperation.hpp b/include/proj/coordinateoperation.hpp index 994cbab2..7ade26f2 100644 --- a/include/proj/coordinateoperation.hpp +++ b/include/proj/coordinateoperation.hpp @@ -1476,7 +1476,8 @@ class PROJ_GCC_DLL Transformation : public SingleOperation { PROJ_DLL static TransformationNNPtr createGravityRelatedHeightToGeographic3D( const util::PropertyMap &properties, const crs::CRSNNPtr &sourceCRSIn, - const crs::CRSNNPtr &targetCRSIn, const std::string &filename, + const crs::CRSNNPtr &targetCRSIn, const crs::CRSPtr &interpolationCRSIn, + const std::string &filename, const std::vector<metadata::PositionalAccuracyNNPtr> &accuracies); PROJ_DLL static TransformationNNPtr createVERTCON( diff --git a/include/proj/internal/internal.hpp b/include/proj/internal/internal.hpp index 220c137b..2222a264 100644 --- a/include/proj/internal/internal.hpp +++ b/include/proj/internal/internal.hpp @@ -140,6 +140,9 @@ std::string toupper(const std::string &osStr); PROJ_FOR_TEST std::vector<std::string> split(const std::string &osStr, char separator); +PROJ_FOR_TEST std::vector<std::string> split(const std::string &osStr, + const std::string &separator); + bool ci_equal(const char *a, const char *b) noexcept; #ifdef SUPPORT_DELETED_FUNCTION diff --git a/include/proj/io.hpp b/include/proj/io.hpp index a603533e..c553598d 100644 --- a/include/proj/io.hpp +++ b/include/proj/io.hpp @@ -427,7 +427,8 @@ class PROJ_GCC_DLL PROJStringFormatter { PROJ_INTERNAL void setOmitProjLongLatIfPossible(bool omit); PROJ_INTERNAL bool omitProjLongLatIfPossible() const; - PROJ_INTERNAL void setOmitZUnitConversion(bool omit); + PROJ_INTERNAL void pushOmitZUnitConversion(); + PROJ_INTERNAL void popOmitZUnitConversion(); PROJ_INTERNAL bool omitZUnitConversion() const; PROJ_INTERNAL void setDropEarlyBindingsTerms(bool drop); |