Fix #9070

qgis · Nov 18, 2013 · 51006ce · 51006ce
1 parent b21167c
commit 51006ce
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 6 deletions.
diff --git a/src/core/qgscoordinatetransform.cpp b/src/core/qgscoordinatetransform.cpp
@@ -193,14 +193,10 @@ void QgsCoordinateTransform::initialise()
   {
     destProjString += ( " " +  datumTransformString( mDestinationDatumTransform ) );
   }
-  else if ( !useDefaultDatumTransform && sourceProjString.contains( "+nadgrids" ) ) //add null grid if source transformation is ntv2
-  {
-    destProjString += " +nadgrids=@null";
-  }
 
-  if ( mSourceDatumTransform == -1 && !useDefaultDatumTransform && destProjString.contains( "+nadgrids" ) )
+  if ( !useDefaultDatumTransform )
   {
-    sourceProjString += " +nadgrids=@null";
+    addNullGridShifts( sourceProjString, destProjString );
   }
 
   mDestinationProjection = pj_init_plus( destProjString.toUtf8() );
@@ -931,3 +927,29 @@ QString QgsCoordinateTransform::datumTransformString( int datumTransform )
 
   return transformString;
 }
+
+void QgsCoordinateTransform::addNullGridShifts( QString& srcProjString, QString& destProjString )
+{
+  //if one transformation uses ntv2, the other one needs to be null grid shift
+  if ( mDestinationDatumTransform == -1 && srcProjString.contains( "+nadgrids" ) ) //add null grid if source transformation is ntv2
+  {
+    destProjString += " +nadgrids=@null";
+    return;
+  }
+  if ( mSourceDatumTransform == -1 && destProjString.contains( "+nadgrids" ) )
+  {
+    srcProjString += " +nadgrids=@null";
+    return;
+  }
+
+  //add null shift grid for google mercator
+  //(see e.g. http://trac.osgeo.org/proj/wiki/FAQ#ChangingEllipsoidWhycantIconvertfromWGS84toGoogleEarthVirtualGlobeMercator)
+  if ( mSourceCRS.authid().compare( "EPSG:3857", Qt::CaseInsensitive ) == 0 && mSourceDatumTransform == -1 )
+  {
+    srcProjString += " +nadgrids=@null";
+  }
+  if ( mDestCRS.authid().compare( "EPSG:3857", Qt::CaseInsensitive ) == 0 && mDestinationDatumTransform == -1 )
+  {
+    destProjString += " +nadgrids=@null";
+  }
+}
diff --git a/src/core/qgscoordinatetransform.h b/src/core/qgscoordinatetransform.h
@@ -285,6 +285,8 @@ class CORE_EXPORT QgsCoordinateTransform : public QObject
     /**Removes +nadgrids and +towgs84 from proj4 string*/
     static QString stripDatumTransform( const QString& proj4 );
     static void searchDatumTransform( const QString& sql, QList< int >& transforms );
+    /**In certain situations, null grid shifts have to be added to src / dst proj string*/
+    void addNullGridShifts( QString& srcProjString, QString& destProjString );
 };
 
 //! Output stream operator