Fix proj string manipulation for reverse datum transformations

mhugent · mhugent · commit b21167c5b6e0 · 2013-11-18T09:32:39.000+01:00
diff --git a/src/core/qgscoordinatetransform.cpp b/src/core/qgscoordinatetransform.cpp
@@ -193,10 +193,16 @@ void QgsCoordinateTransform::initialise()
   {
     destProjString += ( " " +  datumTransformString( mDestinationDatumTransform ) );
   }
-  else if ( sourceProjString.contains( "+nadgrids" ) ) //add null grid if source transformation is ntv2
+  else if ( !useDefaultDatumTransform && sourceProjString.contains( "+nadgrids" ) ) //add null grid if source transformation is ntv2
   {
     destProjString += " +nadgrids=@null";
   }
+
+  if ( mSourceDatumTransform == -1 && !useDefaultDatumTransform && destProjString.contains( "+nadgrids" ) )
+  {
+    sourceProjString += " +nadgrids=@null";
+  }
+
   mDestinationProjection = pj_init_plus( destProjString.toUtf8() );
 
 #ifdef COORDINATE_TRANSFORM_VERBOSE
@@ -792,8 +798,9 @@ QList< QList< int > > QgsCoordinateTransform::datumTransformations( const QgsCoo
   QList<int> directTransforms;
   searchDatumTransform( QString( "SELECT coord_op_code FROM tbl_datum_transform WHERE source_crs_code = %1 AND target_crs_code = %2" ).arg( srcAuthCode ).arg( destAuthCode ),
                         directTransforms );
+  QList<int> reverseDirectTransforms;
   searchDatumTransform( QString( "SELECT coord_op_code FROM tbl_datum_transform WHERE source_crs_code = %1 AND target_crs_code = %2" ).arg( destAuthCode ).arg( srcAuthCode ),
-                        directTransforms );
+                        reverseDirectTransforms );
   QList<int> srcToWgs84;
   searchDatumTransform( QString( "SELECT coord_op_code FROM tbl_datum_transform WHERE ( source_crs_code = %1 AND target_crs_code = %2 ) OR ( source_crs_code = %2 AND target_crs_code = %1 )" ).arg( srcAuthCode ).arg( 4326 ),
                         srcToWgs84 );
@@ -808,6 +815,12 @@ QList< QList< int > > QgsCoordinateTransform::datumTransformations( const QgsCoo
     transformations.push_back( QList<int>() << *directIt << -1 );
   }
 
+  //add direct datum transformations
+  directIt = reverseDirectTransforms.constBegin();
+  for ( ; directIt != reverseDirectTransforms.constEnd(); ++directIt )
+  {
+    transformations.push_back( QList<int>() << -1 << *directIt );
+  }
 
   QList<int>::const_iterator srcWgsIt = srcToWgs84.constBegin();
   for ( ; srcWgsIt != srcToWgs84.constEnd(); ++srcWgsIt )
diff --git a/src/gui/qgsdatumtransformdialog.cpp b/src/gui/qgsdatumtransformdialog.cpp
@@ -71,10 +71,7 @@ QList< int > QgsDatumTransformDialog::selectedDatumTransform()
     for ( int i = 0; i < 2; ++i )
     {
       int transformNr = item->data( i, Qt::UserRole ).toInt();
-      if ( transformNr != -1 )
-      {
-        list << transformNr;
-      }
+      list << transformNr;
     }
   }
   return list;

Original file line number	Diff line number	Diff line change
`@@ -71,10 +71,7 @@ QList< int > QgsDatumTransformDialog::selectedDatumTransform()`
`71`	`71`	`for ( int i = 0; i < 2; ++i )`
`72`	`72`	`{`
`73`	`73`	`int transformNr = item->data( i, Qt::UserRole ).toInt();`
`74`		`- if ( transformNr != -1 )`
`75`		`- {`
`76`		`- list << transformNr;`
`77`		`- }`
	`74`	`+ list << transformNr;`
`78`	`75`	`}`
`79`	`76`	`}`
`80`	`77`	`return list;`