Skip to content

Commit 0de1bfa

Browse files
committed
QgsCoordinateTransform::transformCoords(): do not convert elevations to radians
Fixes #14702
1 parent 0b502c9 commit 0de1bfa

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

src/core/qgscoordinatetransform.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -668,7 +668,6 @@ void QgsCoordinateTransform::transformCoords( int numPoints, double *x, double *
668668
{
669669
x[i] *= DEG_TO_RAD;
670670
y[i] *= DEG_TO_RAD;
671-
z[i] *= DEG_TO_RAD;
672671
}
673672

674673
}
@@ -736,7 +735,6 @@ void QgsCoordinateTransform::transformCoords( int numPoints, double *x, double *
736735
{
737736
x[i] *= RAD_TO_DEG;
738737
y[i] *= RAD_TO_DEG;
739-
z[i] *= RAD_TO_DEG;
740738
}
741739
}
742740
#ifdef COORDINATE_TRANSFORM_VERBOSE

tests/src/core/testqgsgeometry.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -604,7 +604,7 @@ void TestQgsGeometry::pointV2()
604604
p16.transform( tr, QgsCoordinateTransform::ForwardTransform );
605605
QVERIFY( qgsDoubleNear( p16.x(), 175.771, 0.001 ) );
606606
QVERIFY( qgsDoubleNear( p16.y(), -39.722, 0.001 ) );
607-
QVERIFY( qgsDoubleNear( p16.z(), 57.2958, 0.001 ) );
607+
QVERIFY( qgsDoubleNear( p16.z(), 1.0, 0.001 ) );
608608
QCOMPARE( p16.m(), 2.0 );
609609
p16.transform( tr, QgsCoordinateTransform::ReverseTransform );
610610
QVERIFY( qgsDoubleNear( p16.x(), 6374985, 1 ) );
@@ -1489,11 +1489,11 @@ void TestQgsGeometry::lineStringV2()
14891489
l22.transform( tr, QgsCoordinateTransform::ForwardTransform );
14901490
QVERIFY( qgsDoubleNear( l22.pointN( 0 ).x(), 175.771, 0.001 ) );
14911491
QVERIFY( qgsDoubleNear( l22.pointN( 0 ).y(), -39.722, 0.001 ) );
1492-
QVERIFY( qgsDoubleNear( l22.pointN( 0 ).z(), 57.2958, 0.001 ) );
1492+
QVERIFY( qgsDoubleNear( l22.pointN( 0 ).z(), 1.0, 0.001 ) );
14931493
QCOMPARE( l22.pointN( 0 ).m(), 2.0 );
14941494
QVERIFY( qgsDoubleNear( l22.pointN( 1 ).x(), 176.959, 0.001 ) );
14951495
QVERIFY( qgsDoubleNear( l22.pointN( 1 ).y(), -38.798, 0.001 ) );
1496-
QVERIFY( qgsDoubleNear( l22.pointN( 1 ).z(), 171.887, 0.001 ) );
1496+
QVERIFY( qgsDoubleNear( l22.pointN( 1 ).z(), 3.0, 0.001 ) );
14971497
QCOMPARE( l22.pointN( 1 ).m(), 4.0 );
14981498

14991499
//reverse transform

0 commit comments

Comments
 (0)