From b14fba985726c097a6105ab447f2bc126c06b082 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sun, 21 Mar 2021 00:23:09 +0100
Subject: Merge pull request #2594 from rouault/fix_of_fix_2588

createOperations(): fix regression for the fix of #2588
---
 src/iso19111/operation/coordinateoperationfactory.cpp | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/iso19111/operation/coordinateoperationfactory.cpp b/src/iso19111/operation/coordinateoperationfactory.cpp
index e4b9617e..39e9bdde 100644
--- a/src/iso19111/operation/coordinateoperationfactory.cpp
+++ b/src/iso19111/operation/coordinateoperationfactory.cpp
@@ -4888,16 +4888,12 @@ void CoordinateOperationFactory::Private::createOperationsCompoundToGeog(
 
                 // Lambda to add to the set the name of geodetic datum of the
                 // CRS
-                const auto addDatumOfToSet = [](std::set<std::string> &set,
-                                                const crs::CRSNNPtr &crs) {
+                const auto addDatumOfToSet = [&dbContext](
+                                                 std::set<std::string> &set,
+                                                 const crs::CRSNNPtr &crs) {
                     auto geodCRS = crs->extractGeodeticCRS();
                     if (geodCRS) {
-                        const auto &datum = geodCRS->datum();
-                        if (datum) {
-                            set.insert(datum->nameStr());
-                        } else {
-                            set.insert(geodCRS->datumEnsemble()->nameStr());
-                        }
+                        set.insert(geodCRS->datumNonNull(dbContext)->nameStr());
                     }
                 };
 
-- 
cgit v1.2.3