Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 17 additions & 6 deletions app/inpututils.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -900,14 +900,25 @@ QgsPoint InputUtils::transformPoint( const QgsCoordinateReferenceSystem &srcCrs,
{
if ( !ct.isShortCircuited() )
{
const QgsVector3D transformed = ct.transform( QgsVector3D( srcPoint.x(), srcPoint.y(), srcPoint.z() ) );
fallbackOperationOccurred = ct.fallbackOperationOccurred();
const QgsPoint pt( transformed.x(), transformed.y(), transformed.z(), srcPoint.m() );
return pt;
// check if the CRS have vertical axis
if ( srcCrs.hasVerticalAxis() && destCrs.hasVerticalAxis() )
{
const QgsVector3D transformed = ct.transform( QgsVector3D( srcPoint.x(), srcPoint.y(), srcPoint.z() ) );
fallbackOperationOccurred = ct.fallbackOperationOccurred();
const QgsPoint pt( transformed.x(), transformed.y(), transformed.z(), srcPoint.m() );
return pt;
}
else
{
const QgsPointXY transformedXY = ct.transform( QgsPointXY( srcPoint.x(), srcPoint.y() ) );
fallbackOperationOccurred = ct.fallbackOperationOccurred();
const QgsPoint pt( transformedXY.x(), transformedXY.y(), srcPoint.z(), srcPoint.m() );
return pt;
}
}

return srcPoint;
}

return srcPoint;
}
catch ( QgsCsException &cse )
{
Expand Down
2 changes: 1 addition & 1 deletion app/position/mapposition.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ void MapPosition::recalculateMapPosition()
{
QgsPointXY srcPoint = QgsPointXY( geoposition.x(), geoposition.y() );
QgsPointXY mapPositionXY = InputUtils::transformPointXY(
mPositionKit->positionCrs3D(),
mPositionKit->positionCrs2D(),
mMapSettings->destinationCrs(),
mMapSettings->transformContext(),
srcPoint
Expand Down
Loading