From bd9ecbacf575a1926fb8e223c4add1a4cc45d7f3 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Mon, 16 Dec 2019 15:23:22 +0100 Subject: identify(): take into datum name aliases (fixes #1800) --- include/proj/util.hpp | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) (limited to 'include/proj/util.hpp') diff --git a/include/proj/util.hpp b/include/proj/util.hpp index e4d6c3e0..622709d1 100644 --- a/include/proj/util.hpp +++ b/include/proj/util.hpp @@ -166,6 +166,13 @@ namespace proj {} NS_PROJ_START +//! @cond Doxygen_Suppress +namespace io { +class DatabaseContext; +using DatabaseContextPtr = std::shared_ptr; +} +//! @endcond + /** osgeo.proj.util namespace. * * \brief A set of base types from ISO 19103, \ref GeoAPI and other PROJ @@ -342,15 +349,18 @@ class PROJ_GCC_DLL IComparable { EQUIVALENT_EXCEPT_AXIS_ORDER_GEOGCRS, }; - PROJ_DLL bool isEquivalentTo(const IComparable *other, - Criterion criterion = Criterion::STRICT) const; + PROJ_DLL bool + isEquivalentTo(const IComparable *other, + Criterion criterion = Criterion::STRICT, + const io::DatabaseContextPtr &dbContext = nullptr) const; PROJ_PRIVATE : //! @cond Doxygen_Suppress PROJ_INTERNAL virtual bool - _isEquivalentTo(const IComparable *other, - Criterion criterion = Criterion::STRICT) const = 0; + _isEquivalentTo( + const IComparable *other, Criterion criterion = Criterion::STRICT, + const io::DatabaseContextPtr &dbContext = nullptr) const = 0; //! @endcond }; -- cgit v1.2.3