More proj6 test fixes

nyalldawson · nyalldawson · commit 4db0f5bf6cee · 2019-05-13T10:38:26.000+10:00
diff --git a/src/core/qgscoordinatereferencesystem.cpp b/src/core/qgscoordinatereferencesystem.cpp
@@ -787,15 +787,8 @@ bool QgsCoordinateReferenceSystem::createFromProj4( const QString &proj4String )
   // +x_0=600000 +y_0=2200000 +a=6378249.2 +b=6356515.000000472 +units=m +no_defs
   //
   QString myProj4String = proj4String.trimmed();
-#if PROJ_VERSION_MAJOR>=6
-  if ( !myProj4String.contains( QStringLiteral( "+type=crs" ) ) )
-  {
-    myProj4String += QStringLiteral( " +type=crs" );
-  }
-#else
   myProj4String.remove( QStringLiteral( "+type=crs" ) );
   myProj4String = myProj4String.trimmed();
-#endif
 
   // hack!
 #if PROJ_VERSION_MAJOR>=6
@@ -809,7 +802,8 @@ bool QgsCoordinateReferenceSystem::createFromProj4( const QString &proj4String )
   // broken on proj <= 6.1.0
 #if PROJ_VERSION_MAJOR>=6
   // first, try to use proj to do this for us...
-  QgsProjUtils::proj_pj_unique_ptr crs( proj_create( QgsProjContext::get(), proj4String.toLatin1().constData() ) );
+  const QString projCrsString = myProj4String + ( myProj4String.contains( QStringLiteral( "+type=crs" ) ) ? QString() : QStringLiteral( " +type=crs" ) );
+  QgsProjUtils::proj_pj_unique_ptr crs( proj_create( QgsProjContext::get(), projCrsString.toLatin1().constData() ) );
   if ( crs )
   {
     //crs = QgsProjUtils::crsToSingleCrs( crs.get() ) ;
diff --git a/tests/src/core/testqgscoordinatetransform.cpp b/tests/src/core/testqgscoordinatetransform.cpp
@@ -225,9 +225,7 @@ void TestQgsCoordinateTransform::scaleFactor()
   QFETCH( double, factor );
 
   QgsCoordinateTransform ct( sourceCrs, destCrs, QgsProject::instance() );
-
-  // qDebug() << QString::number(ct.scaleFactor( rect ), 'g', 17) ;
-  QVERIFY( qgsDoubleNear( ct.scaleFactor( rect ), factor ) );
+  QGSCOMPARENEAR( ct.scaleFactor( rect ), factor, 0.00000001 );
 }
 
 void TestQgsCoordinateTransform::scaleFactor_data()

Original file line number	Diff line number	Diff line change
`@@ -225,9 +225,7 @@ void TestQgsCoordinateTransform::scaleFactor()`
`225`	`225`	`QFETCH( double, factor );`
`226`	`226`
`227`	`227`	`QgsCoordinateTransform ct( sourceCrs, destCrs, QgsProject::instance() );`
`228`		`-`
`229`		`- // qDebug() << QString::number(ct.scaleFactor( rect ), 'g', 17) ;`
`230`		`- QVERIFY( qgsDoubleNear( ct.scaleFactor( rect ), factor ) );`
	`228`	`+ QGSCOMPARENEAR( ct.scaleFactor( rect ), factor, 0.00000001 );`
`231`	`229`	`}`
`232`	`230`
`233`	`231`	`void TestQgsCoordinateTransform::scaleFactor_data()`