WKT2_2018: always export ID in base crs node, even if there is one on upper node

This is a particular logic allowed by paragraph 7.3.3 Identifier
of OGC 18-010r6

2 files changed, 16 insertions, 2 deletions

diff --git a/src/iso19111/crs.cpp b/src/iso19111/crs.cpp
index 9779d817..2dc6b3bf 100644
--- a/src/iso19111/crs.cpp
+++ b/src/iso19111/crs.cpp
@@ -2432,7 +2432,8 @@ void DerivedCRS::baseExportToWKT(io::WKTFormatter *formatter,
                                           !l_baseCRS->identifiers().empty());
     formatter->addQuotedString(l_baseCRS->nameStr());
     l_baseCRS->exportDatumOrDatumEnsembleToWkt(formatter);
-    if (formatter->use2018Keywords() && formatter->outputId()) {
+    if (formatter->use2018Keywords() &&
+        !(formatter->idOnTopLevelOnly() && formatter->topLevelHasId())) {
         l_baseCRS->formatID(formatter);
     }
     formatter->endNode();
@@ -2673,7 +2674,8 @@ void ProjectedCRS::_exportToWKT(io::WKTFormatter *formatter) const {
             geodeticCRSAxisList[0]->unit()._exportToWKT(formatter);
         }
         l_baseCRS->primeMeridian()->_exportToWKT(formatter);
-        if (formatter->use2018Keywords() && formatter->outputId()) {
+        if (formatter->use2018Keywords() &&
+            !(formatter->idOnTopLevelOnly() && formatter->topLevelHasId())) {
             l_baseCRS->formatID(formatter);
         }
         formatter->endNode();
diff --git a/src/iso19111/io.cpp b/src/iso19111/io.cpp
index 220ee967..78b18719 100644
--- a/src/iso19111/io.cpp
+++ b/src/iso19111/io.cpp
@@ -634,6 +634,18 @@ bool WKTFormatter::primeMeridianInDegree() const {
 
 // ---------------------------------------------------------------------------
 
+bool WKTFormatter::idOnTopLevelOnly() const {
+    return d->params_.idOnTopLevelOnly_;
+}
+
+// ---------------------------------------------------------------------------
+
+bool WKTFormatter::topLevelHasId() const {
+    return d->stackHasId_.size() >= 2 && d->stackHasId_[1];
+}
+
+// ---------------------------------------------------------------------------
+
 WKTFormatter::Version WKTFormatter::version() const {
     return d->params_.version_;
 }