Fix compound CRSs axis order and orientation info

qgis · Jul 31, 2024 · ea64be6 · ea64be6
1 parent b117fb9
commit ea64be6
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 1 deletion.
diff --git a/src/core/proj/qgscoordinatereferencesystem.cpp b/src/core/proj/qgscoordinatereferencesystem.cpp
@@ -833,6 +833,9 @@ bool QgsCoordinateReferenceSystem::hasAxisInverted() const
 
 QList<Qgis::CrsAxisDirection> QgsCoordinateReferenceSystem::axisOrdering() const
 {
+  if ( type() == Qgis::CrsType::Compound )
+    return horizontalCrs().axisOrdering() + verticalCrs().axisOrdering();
+
   const PJ *projObject = d->threadLocalProjObject();
   if ( !projObject )
     return {};

diff --git a/src/core/proj/qgsprojutils.cpp b/src/core/proj/qgsprojutils.cpp
@@ -117,7 +117,12 @@ bool QgsProjUtils::axisOrderIsSwapped( const PJ *crs )
     return false;
 
   PJ_CONTEXT *context = QgsProjContext::get();
-  QgsProjUtils::proj_pj_unique_ptr pjCs( proj_crs_get_coordinate_system( context, crs ) );
+
+  QgsProjUtils::proj_pj_unique_ptr horizCrs = crsToHorizontalCrs( crs );
+  if ( !horizCrs )
+    return false;
+
+  QgsProjUtils::proj_pj_unique_ptr pjCs( proj_crs_get_coordinate_system( context, horizCrs.get() ) );
   if ( !pjCs )
     return false;
 

diff --git a/tests/src/core/testqgscoordinatereferencesystem.cpp b/tests/src/core/testqgscoordinatereferencesystem.cpp
@@ -289,6 +289,24 @@ void TestQgsCoordinateReferenceSystem::compoundCrs()
   QCOMPARE( crs.type(), Qgis::CrsType::Compound );
   QVERIFY( !crs.isGeographic() );
   QCOMPARE( crs.mapUnits(), Qgis::DistanceUnit::Meters );
+  QVERIFY( !crs.hasAxisInverted() );
+  QCOMPARE( crs.axisOrdering(),
+            QList<Qgis::CrsAxisDirection>()
+            << Qgis::CrsAxisDirection::East
+            << Qgis::CrsAxisDirection::North
+            << Qgis::CrsAxisDirection::Up );
+
+  crs = QgsCoordinateReferenceSystem( QStringLiteral( "EPSG:3903" ) );
+  QVERIFY( crs.isValid() );
+  QCOMPARE( crs.type(), Qgis::CrsType::Compound );
+  QVERIFY( !crs.isGeographic() );
+  QCOMPARE( crs.mapUnits(), Qgis::DistanceUnit::Meters );
+  QVERIFY( crs.hasAxisInverted() );
+  QCOMPARE( crs.axisOrdering(),
+            QList<Qgis::CrsAxisDirection>()
+            << Qgis::CrsAxisDirection::North
+            << Qgis::CrsAxisDirection::East
+            << Qgis::CrsAxisDirection::Up );
 }
 
 void TestQgsCoordinateReferenceSystem::verticalCrs()

diff --git a/tests/src/core/testqgsprojutils.cpp b/tests/src/core/testqgsprojutils.cpp
@@ -94,6 +94,8 @@ void TestQgsProjUtils::axisOrderIsSwapped()
   QVERIFY( !QgsProjUtils::axisOrderIsSwapped( crs.get() ) );
   crs.reset( proj_create( context, "urn:ogc:def:crs:EPSG::4326" ) );
   QVERIFY( QgsProjUtils::axisOrderIsSwapped( crs.get() ) );
+  crs.reset( proj_create( context, "urn:ogc:def:crs:EPSG::3903" ) );
+  QVERIFY( QgsProjUtils::axisOrderIsSwapped( crs.get() ) );
 }
 
 void TestQgsProjUtils::searchPath()