From 3a2df3462c851b7dc823b1cd84fc8a61dc9c2d08 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sat, 17 Oct 2020 22:41:55 +0200
Subject: CompoundCRS with ellipsoidal height: make sure the vertical axis has
 'ellipsoid height' as name and 'h' as abbreviation

---
 src/iso19111/crs.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/iso19111/crs.cpp b/src/iso19111/crs.cpp
index cea6476f..051f9463 100644
--- a/src/iso19111/crs.cpp
+++ b/src/iso19111/crs.cpp
@@ -4477,8 +4477,12 @@ CRSNNPtr CompoundCRS::createLax(const util::PropertyMap &properties,
                   &(axis->direction()) == &(cs::AxisDirection::UP))) {
                 name += " (" + comp1Vert->nameStr() + ')';
             }
+            auto newVertAxis = cs::CoordinateSystemAxis::create(
+                util::PropertyMap().set(IdentifiedObject::NAME_KEY,
+                                        cs::AxisName::Ellipsoidal_height),
+                cs::AxisAbbreviation::h, axis->direction(), axis->unit());
             return components[0]
-                ->promoteTo3D(name, dbContext, axis)
+                ->promoteTo3D(name, dbContext, newVertAxis)
                 ->attachOriginalCompoundCRS(create(
                     properties,
                     comp0Bound ? std::vector<CRSNNPtr>{comp0Bound->baseCRS(),
-- 
cgit v1.2.3