diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2018-12-06 14:26:56 +0100 |
|---|---|---|
| committer | Even Rouault <even.rouault@spatialys.com> | 2018-12-06 14:26:56 +0100 |
| commit | 706fac8bc70312f5729e2f3aeeb4f67ecb211b1d (patch) | |
| tree | 8f229d8ecdc05cd15537c20c94181656cdcc7eec /include | |
| parent | 892f2eb80ace522c841afeb435671ca048215b66 (diff) | |
| parent | 25fa18055f43d0881a1a2bf9990c99fecfcbdbb7 (diff) | |
| download | PROJ-706fac8bc70312f5729e2f3aeeb4f67ecb211b1d.tar.gz PROJ-706fac8bc70312f5729e2f3aeeb4f67ecb211b1d.zip | |
Merge remote-tracking branch 'rouault/gdalbarn'
Diffstat (limited to 'include')
| -rw-r--r-- | include/proj/coordinateoperation.hpp | 4 | ||||
| -rw-r--r-- | include/proj/io.hpp | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/include/proj/coordinateoperation.hpp b/include/proj/coordinateoperation.hpp index 4dd85e96..f5cdbba0 100644 --- a/include/proj/coordinateoperation.hpp +++ b/include/proj/coordinateoperation.hpp @@ -1680,6 +1680,10 @@ class PROJ_GCC_DLL CoordinateOperationContext { PROJ_DLL bool getUsePROJAlternativeGridNames() const; + PROJ_DLL void setDiscardSuperseded(bool discard); + + PROJ_DLL bool getDiscardSuperseded() const; + /** Describe how grid availability is used. */ enum class GridAvailabilityUse { /** Grid availability is only used for sorting results. Operations diff --git a/include/proj/io.hpp b/include/proj/io.hpp index 77ca1d2d..26420150 100644 --- a/include/proj/io.hpp +++ b/include/proj/io.hpp @@ -887,13 +887,15 @@ class PROJ_GCC_DLL AuthorityFactory { createFromCoordinateReferenceSystemCodes( const std::string &sourceCRSAuthName, const std::string &sourceCRSCode, const std::string &targetCRSAuthName, const std::string &targetCRSCode, - bool usePROJAlternativeGridNames, bool discardIfMissingGrid) const; + bool usePROJAlternativeGridNames, bool discardIfMissingGrid, + bool discardSuperseded) const; PROJ_DLL std::vector<operation::CoordinateOperationNNPtr> createFromCRSCodesWithIntermediates( const std::string &sourceCRSAuthName, const std::string &sourceCRSCode, const std::string &targetCRSAuthName, const std::string &targetCRSCode, bool usePROJAlternativeGridNames, bool discardIfMissingGrid, + bool discardSuperseded, const std::vector<std::pair<std::string, std::string>> &intermediateCRSAuthCodes) const; |
