Tweak transform logic (only remove src/dest transforms when both transforms are -1)

nyalldawson · nyalldawson · commit 754a6e06bba3 · 2017-12-15T14:13:22.000+10:00
diff --git a/src/core/qgscoordinatetransformcontext.cpp b/src/core/qgscoordinatetransformcontext.cpp
@@ -115,7 +115,7 @@ bool QgsCoordinateTransformContext::addSourceDestinationDatumTransform( const Qg
 
   d.detach();
   d->mLock.lockForWrite();
-  if ( sourceTransform == -1 || destinationTransform == -1 )
+  if ( sourceTransform == -1 && destinationTransform == -1 )
   {
     d->mSourceDestDatumTransforms.remove( qMakePair( sourceCrs.authid(), destinationCrs.authid() ) );
   }
diff --git a/tests/src/python/test_qgscoordinatetransformcontext.py b/tests/src/python/test_qgscoordinatetransformcontext.py
@@ -129,11 +129,18 @@ def testSourceDestinationDatumTransforms(self):
         # remove existing
         self.assertTrue(context.addSourceDestinationDatumTransform(QgsCoordinateReferenceSystem(3111),
                                                                    QgsCoordinateReferenceSystem(4283), -1, 3))
-        self.assertEqual(context.sourceDestinationDatumTransforms(), {('EPSG:28356', 'EPSG:4283'): (3, 4),
+        self.assertEqual(context.sourceDestinationDatumTransforms(), {('EPSG:3111', 'EPSG:4283'): (-1, 3),
+                                                                      ('EPSG:28356', 'EPSG:4283'): (3, 4),
                                                                       ('EPSG:28356', 'EPSG:28357'): (9, 11)})
         self.assertTrue(context.addSourceDestinationDatumTransform(QgsCoordinateReferenceSystem(28356),
                                                                    QgsCoordinateReferenceSystem(28357), 1, -1))
-        self.assertEqual(context.sourceDestinationDatumTransforms(), {('EPSG:28356', 'EPSG:4283'): (3, 4)})
+        self.assertEqual(context.sourceDestinationDatumTransforms(), {('EPSG:3111', 'EPSG:4283'): (-1, 3),
+                                                                      ('EPSG:28356', 'EPSG:4283'): (3, 4),
+                                                                      ('EPSG:28356', 'EPSG:28357'): (1, -1)})
+        self.assertTrue(context.addSourceDestinationDatumTransform(QgsCoordinateReferenceSystem(28356),
+                                                                   QgsCoordinateReferenceSystem(28357), -1, -1))
+        self.assertEqual(context.sourceDestinationDatumTransforms(), {('EPSG:3111', 'EPSG:4283'): (-1, 3),
+                                                                      ('EPSG:28356', 'EPSG:4283'): (3, 4)})
 
         context.clear()
         self.assertEqual(context.sourceDestinationDatumTransforms(), {})

Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ bool QgsCoordinateTransformContext::addSourceDestinationDatumTransform( const Qg`
`115`	`115`
`116`	`116`	`d.detach();`
`117`	`117`	`d->mLock.lockForWrite();`
`118`		`- if ( sourceTransform == -1 \|\| destinationTransform == -1 )`
	`118`	`+ if ( sourceTransform == -1 && destinationTransform == -1 )`
`119`	`119`	`{`
`120`	`120`	`d->mSourceDestDatumTransforms.remove( qMakePair( sourceCrs.authid(), destinationCrs.authid() ) );`
`121`	`121`	`}`