Update test results

qgis · Jun 3, 2019 · 56c265f · 56c265f
1 parent f8655dc
commit 56c265f
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/tests/src/gui/testqgsdatumtransformdialog.cpp b/tests/src/gui/testqgsdatumtransformdialog.cpp
@@ -73,19 +73,19 @@ void TestQgsDatumTransformDialog::defaultTransform()
   QgsDatumTransformDialog::TransformInfo def = dlg.defaultDatumTransform();
   QCOMPARE( def.sourceCrs.authid(), QStringLiteral( "EPSG:7844" ) );
   QCOMPARE( def.destinationCrs.authid(), QStringLiteral( "EPSG:4283" ) );
-  QVERIFY( def.proj.startsWith( QStringLiteral( "+proj=pipeline +step +proj=axisswap +order=2,1 +step +proj=unitconvert +xy_in=deg +xy_out=rad +step +proj=push +v_3 +step +proj=cart +ellps=GRS80 +step +inv +proj=helmert +x=0.06155 +y=-0.01087 +z=-0.04019 +rx=-0.0394924 +ry=-0.0327221 +rz=-0.03" ) ) );
+  QCOMPARE( def.proj, QStringLiteral( "+proj=pipeline +step +proj=unitconvert +xy_in=deg +xy_out=rad +step +proj=push +v_3 +step +proj=cart +ellps=GRS80 +step +inv +proj=helmert +x=0.06155 +y=-0.01087 +z=-0.04019 +rx=-0.0394924 +ry=-0.0327221 +rz=-0.0328979 +s=-0.009994 +convention=coordinate_frame +step +inv +proj=cart +ellps=GRS80 +step +proj=pop +v_3 +step +proj=unitconvert +xy_in=rad +xy_out=deg" ) );
 
   // default should be initially selected
   def = dlg.selectedDatumTransform();
   QCOMPARE( def.sourceCrs.authid(), QStringLiteral( "EPSG:7844" ) );
   QCOMPARE( def.destinationCrs.authid(), QStringLiteral( "EPSG:4283" ) );
-  QVERIFY( def.proj.startsWith( QStringLiteral( "+proj=pipeline +step +proj=axisswap +order=2,1 +step +proj=unitconvert +xy_in=deg +xy_out=rad +step +proj=push +v_3 +step +proj=cart +ellps=GRS80 +step +inv +proj=helmert +x=0.06155 +y=-0.01087 +z=-0.04019 +rx=-0.0394924 +ry=-0.0327221 +rz=-0.03" ) ) );
+  QCOMPARE( def.proj, QStringLiteral( "+proj=pipeline +step +proj=unitconvert +xy_in=deg +xy_out=rad +step +proj=push +v_3 +step +proj=cart +ellps=GRS80 +step +inv +proj=helmert +x=0.06155 +y=-0.01087 +z=-0.04019 +rx=-0.0394924 +ry=-0.0327221 +rz=-0.0328979 +s=-0.009994 +convention=coordinate_frame +step +inv +proj=cart +ellps=GRS80 +step +proj=pop +v_3 +step +proj=unitconvert +xy_in=rad +xy_out=deg" ) );
 
   QgsDatumTransformDialog dlg2( QgsCoordinateReferenceSystem( QStringLiteral( "EPSG:4326" ) ), QgsCoordinateReferenceSystem( QStringLiteral( "EPSG:26742" ) ) );
   def = dlg2.defaultDatumTransform();
   QCOMPARE( def.sourceCrs.authid(), QStringLiteral( "EPSG:4326" ) );
   QCOMPARE( def.destinationCrs.authid(), QStringLiteral( "EPSG:26742" ) );
-  QVERIFY( def.proj.startsWith( QStringLiteral( "+proj=pipeline +step +proj=axisswap +order=2,1 +step +proj=unitconvert +xy_in=deg +xy_out=rad +step +proj=push +v_3 +step +proj=cart +ellps=WGS84 +step +proj=helmert +x=8 +y=-159 +z=-175 +step +inv +proj=cart +ellps=clrk66 +step +proj=pop" ) ) );
+  QCOMPARE( def.proj,  QStringLiteral( "+proj=pipeline +step +proj=unitconvert +xy_in=deg +xy_out=rad +step +proj=push +v_3 +step +proj=cart +ellps=WGS84 +step +proj=helmert +x=8 +y=-159 +z=-175 +step +inv +proj=cart +ellps=clrk66 +step +proj=pop +v_3 +step +proj=lcc +lat_0=37.6666666666667 +lon_0=-122 +lat_1=39.8333333333333 +lat_2=38.3333333333333 +x_0=609601.219202438 +y_0=0 +ellps=clrk66 +step +proj=unitconvert +xy_in=m +z_in=m +xy_out=us-ft +z_out=us-ft" ) );
 
 #else
   Q_NOWARN_DEPRECATED_PUSH