Fix doc generation with Doxygen 1.9.3

Since the update to Doxygen 1.9.3, doc generation was broken. With
bisection of doxygen, it was found this was due to commit
https://github.com/doxygen/doxygen/commit/ee8f3fb7a2ed74ee30ae3202707617e97f6641ff
which makes Doxygen honour nested @cond . This revealed bad pairing of
@cond / @endcond in our code, fixed by this commit.

8 files changed, 10 insertions, 13 deletions

diff --git a/Doxyfile b/Doxyfile
index e5ab6ee6..7f4d3ec6 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -2108,15 +2108,6 @@ EXTERNAL_PAGES         = YES
 # Configuration options related to the dot tool
 #---------------------------------------------------------------------------
 
-# If the CLASS_DIAGRAMS tag is set to YES, doxygen will generate a class diagram
-# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to
-# NO turns the diagrams off. Note that this option also works with HAVE_DOT
-# disabled, but it is recommended to install and use dot, since it yields more
-# powerful graphs.
-# The default value is: YES.
-
-CLASS_DIAGRAMS         = YES
-
 # You can define message sequence charts within doxygen comments using the \msc
 # command. Doxygen will then run the mscgen tool (see:
 # http://www.mcternan.me.uk/mscgen/)) to produce the chart and insert it in the
diff --git a/src/iso19111/crs.cpp b/src/iso19111/crs.cpp
index 575f6e2b..2ea8393c 100644
--- a/src/iso19111/crs.cpp
+++ b/src/iso19111/crs.cpp
@@ -5879,6 +5879,7 @@ BoundCRS::_identify(const io::AuthorityFactoryPtr &authorityFactory) const {
     }
     return !resMatchOfTransfToWGS84.empty() ? resMatchOfTransfToWGS84 : res;
 }
+//! @endcond
 
 // ---------------------------------------------------------------------------
 
diff --git a/src/iso19111/factory.cpp b/src/iso19111/factory.cpp
index f08e32b9..158ecdc5 100644
--- a/src/iso19111/factory.cpp
+++ b/src/iso19111/factory.cpp
@@ -8797,6 +8797,7 @@ std::list<datum::EllipsoidNNPtr> AuthorityFactory::createEllipsoidFromExisting(
     }
     return res;
 }
+//! @endcond
 
 // ---------------------------------------------------------------------------
 
@@ -9308,7 +9309,6 @@ AuthorityFactory::createCompoundCRSFromExisting(
 
 // ---------------------------------------------------------------------------
 
-//! @cond Doxygen_Suppress
 std::vector<operation::CoordinateOperationNNPtr>
 AuthorityFactory::getTransformationsForGeoid(
     const std::string &geoidName, bool usePROJAlternativeGridNames) const {
diff --git a/src/iso19111/io.cpp b/src/iso19111/io.cpp
index 67877206..ca5a3d97 100644
--- a/src/iso19111/io.cpp
+++ b/src/iso19111/io.cpp
@@ -866,6 +866,8 @@ void WKTFormatter::stopInversion() {
 bool WKTFormatter::isInverted() const { return d->inversionStack_.back(); }
 #endif
 
+//! @endcond
+
 // ---------------------------------------------------------------------------
 
 //! @cond Doxygen_Suppress
@@ -1411,6 +1413,7 @@ struct WKTParser::Private {
     ConcatenatedOperationNNPtr
     buildConcatenatedOperation(const WKTNodeNNPtr &node);
 };
+//! @endcond
 
 // ---------------------------------------------------------------------------
 
@@ -8867,6 +8870,8 @@ struct PROJStringParser::Private {
                                       int iAxisSwap, bool ignorePROJAxis);
 };
 
+//! @endcond
+
 // ---------------------------------------------------------------------------
 
 PROJStringParser::PROJStringParser() : d(internal::make_unique<Private>()) {}
diff --git a/src/iso19111/operation/singleoperation.cpp b/src/iso19111/operation/singleoperation.cpp
index 4dadfa40..99b70609 100644
--- a/src/iso19111/operation/singleoperation.cpp
+++ b/src/iso19111/operation/singleoperation.cpp
@@ -533,6 +533,7 @@ void OperationMethod::_exportToJSON(
         formatID(formatter);
     }
 }
+//! @endcond
 
 // ---------------------------------------------------------------------------
 
diff --git a/src/iso19111/operation/transformation.cpp b/src/iso19111/operation/transformation.cpp
index 36540242..a018a7b4 100644
--- a/src/iso19111/operation/transformation.cpp
+++ b/src/iso19111/operation/transformation.cpp
@@ -1477,7 +1477,6 @@ createApproximateInverseIfPossible(const Transformation *op) {
 
     return nullptr;
 }
-//! @endcond
 
 // ---------------------------------------------------------------------------
 
diff --git a/src/iso19111/util.cpp b/src/iso19111/util.cpp
index 82d36458..f8ae9049 100644
--- a/src/iso19111/util.cpp
+++ b/src/iso19111/util.cpp
@@ -293,6 +293,8 @@ const BaseObjectNNPtr *PropertyMap::get(const std::string &key) const {
     }
     return nullptr;
 }
+//! @endcond
+
 // ---------------------------------------------------------------------------
 
 //! @cond Doxygen_Suppress
diff --git a/src/networkfilemanager.cpp b/src/networkfilemanager.cpp
index cd0da86f..3eecc5e2 100644
--- a/src/networkfilemanager.cpp
+++ b/src/networkfilemanager.cpp
@@ -2077,8 +2077,6 @@ int proj_context_is_network_enabled(PJ_CONTEXT *ctx) {
     return ctx->networking.enabled;
 }
 
-//! @endcond
-
 // ---------------------------------------------------------------------------
 
 /** Define the URL endpoint to query for remote grids.