aboutsummaryrefslogtreecommitdiff
path: root/include/proj/internal
diff options
context:
space:
mode:
authorEven Rouault <even.rouault@spatialys.com>2019-12-16 15:23:22 +0100
committerEven Rouault <even.rouault@spatialys.com>2019-12-16 17:50:39 +0100
commitbd9ecbacf575a1926fb8e223c4add1a4cc45d7f3 (patch)
tree770cc59bf111f8b427d9bc14ea7548ff3edbc9b3 /include/proj/internal
parenta68c146d7f3c1efb0f42b46c708a0a195e51a2ff (diff)
downloadPROJ-bd9ecbacf575a1926fb8e223c4add1a4cc45d7f3.tar.gz
PROJ-bd9ecbacf575a1926fb8e223c4add1a4cc45d7f3.zip
identify(): take into datum name aliases (fixes #1800)
Diffstat (limited to 'include/proj/internal')
-rw-r--r--include/proj/internal/coordinateoperation_internal.hpp33
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 {