diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2019-12-17 16:52:08 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-17 16:52:08 +0100 |
| commit | 9db6e144ae10854a5aff46fad2584c840c251974 (patch) | |
| tree | 433d4c96ff925827beb2e8cce8988cbba9fd1eee /include/proj/internal | |
| parent | da7ffcd528595acb97589d59319967d01d8e5e8f (diff) | |
| parent | 75a3299803beabf2dd2600aee2b5849347dabc29 (diff) | |
| download | PROJ-9db6e144ae10854a5aff46fad2584c840c251974.tar.gz PROJ-9db6e144ae10854a5aff46fad2584c840c251974.zip | |
Merge pull request #1803 from rouault/improve_identification_with_datum_name_aliases
identify(): take into datum name aliases (fixes #1800)
Diffstat (limited to 'include/proj/internal')
| -rw-r--r-- | include/proj/internal/coordinateoperation_internal.hpp | 33 |
1 files changed, 19 insertions, 14 deletions
diff --git a/include/proj/internal/coordinateoperation_internal.hpp b/include/proj/internal/coordinateoperation_internal.hpp index 7ae2cd78..361261c1 100644 --- a/include/proj/internal/coordinateoperation_internal.hpp +++ b/include/proj/internal/coordinateoperation_internal.hpp @@ -118,10 +118,11 @@ class InverseCoordinateOperation : virtual public CoordinateOperation { void _exportToPROJString(io::PROJStringFormatter *formatter) const override; // throw(FormattingException) - bool - _isEquivalentTo(const util::IComparable *other, - util::IComparable::Criterion criterion = - util::IComparable::Criterion::STRICT) const override; + bool _isEquivalentTo( + const util::IComparable *other, + util::IComparable::Criterion criterion = + util::IComparable::Criterion::STRICT, + const io::DatabaseContextPtr &dbContext = nullptr) const override; CoordinateOperationNNPtr inverse() const override; @@ -158,11 +159,13 @@ class InverseConversion : public Conversion, public InverseCoordinateOperation { InverseCoordinateOperation::_exportToPROJString(formatter); } - bool - _isEquivalentTo(const util::IComparable *other, - util::IComparable::Criterion criterion = - util::IComparable::Criterion::STRICT) const override { - return InverseCoordinateOperation::_isEquivalentTo(other, criterion); + bool _isEquivalentTo( + const util::IComparable *other, + util::IComparable::Criterion criterion = + util::IComparable::Criterion::STRICT, + const io::DatabaseContextPtr &dbContext = nullptr) const override { + return InverseCoordinateOperation::_isEquivalentTo(other, criterion, + dbContext); } CoordinateOperationNNPtr inverse() const override { @@ -208,11 +211,13 @@ class InverseTransformation : public Transformation, Transformation::_exportToJSON(formatter); } - bool - _isEquivalentTo(const util::IComparable *other, - util::IComparable::Criterion criterion = - util::IComparable::Criterion::STRICT) const override { - return InverseCoordinateOperation::_isEquivalentTo(other, criterion); + bool _isEquivalentTo( + const util::IComparable *other, + util::IComparable::Criterion criterion = + util::IComparable::Criterion::STRICT, + const io::DatabaseContextPtr &dbContext = nullptr) const override { + return InverseCoordinateOperation::_isEquivalentTo(other, criterion, + dbContext); } CoordinateOperationNNPtr inverse() const override { |