Skip to content

Commit

Permalink
Fix copy/paste error, update unit tests
Browse files Browse the repository at this point in the history
  • Loading branch information
nyalldawson committed Dec 18, 2017
1 parent c701791 commit a77b5b6
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/core/qgsdatumtransform.cpp
Expand Up @@ -68,7 +68,7 @@ QList< QgsDatumTransform::TransformPair > QgsDatumTransform::datumTransformation
}

//add direct datum transformations
for ( int transform : qgis::as_const( directTransforms ) )
for ( int transform : qgis::as_const( reverseDirectTransforms ) )
{
transformations.push_back( QgsDatumTransform::TransformPair( -1, transform ) );
}
Expand Down
17 changes: 14 additions & 3 deletions tests/src/python/test_qgscoordinatetransform.py
Expand Up @@ -213,10 +213,21 @@ def testTransformInfo(self):
transforms = QgsDatumTransform.datumTransformations(QgsCoordinateReferenceSystem(4613), QgsCoordinateReferenceSystem(4326))
self.assertTrue(len(transforms) > 0)
self.assertIn('+towgs84=-403,684,41', [QgsDatumTransform.datumTransformToProj(t.sourceTransformId) for t in transforms])
self.assertIn('+towgs84=-403,684,41', [QgsDatumTransform.datumTransformToProj(t.destinationTransformId) for t in transforms])
self.assertIn('EPSG:4613', [QgsDatumTransform.datumTransformInfo(t.destinationTransformId).sourceCrsAuthId for t in
self.assertEqual([''] * len(transforms), [QgsDatumTransform.datumTransformToProj(t.destinationTransformId) for t in transforms])
self.assertIn('EPSG:4613', [QgsDatumTransform.datumTransformInfo(t.sourceTransformId).sourceCrsAuthId for t in
transforms])
self.assertIn('EPSG:4326', [QgsDatumTransform.datumTransformInfo(t.destinationTransformId).destinationCrsAuthId for t in
self.assertEqual([''] * len(transforms), [QgsDatumTransform.datumTransformInfo(t.destinationTransformId).destinationCrsAuthId for t in
transforms])

# and the reverse
transforms = QgsDatumTransform.datumTransformations(QgsCoordinateReferenceSystem(4326), QgsCoordinateReferenceSystem(4613))
self.assertTrue(len(transforms) > 0)
self.assertEqual([''] * len(transforms), [QgsDatumTransform.datumTransformToProj(t.sourceTransformId) for t in transforms])
self.assertIn('+towgs84=-403,684,41',
[QgsDatumTransform.datumTransformToProj(t.destinationTransformId) for t in transforms])
self.assertEqual([''] * len(transforms), [QgsDatumTransform.datumTransformInfo(t.sourceTransformId).destinationCrsAuthId for t in
transforms])
self.assertIn('EPSG:4613', [QgsDatumTransform.datumTransformInfo(t.destinationTransformId).sourceCrsAuthId for t in
transforms])

def testStringToTransformId(self):
Expand Down

0 comments on commit a77b5b6

Please sign in to comment.