replace convertTo/set by add{M,Z}Value

lbartoletti · nyalldawson · commit dabd15eecbbc · 2021-06-09T10:45:40.000+10:00
diff --git a/src/core/geometry/qgsgeometryutils.cpp b/src/core/geometry/qgsgeometryutils.cpp
@@ -1815,14 +1815,12 @@ bool QgsGeometryUtils::transferFirstZOrMValueToPoint( const QgsPointSequence &po
   {
     if ( !m_passed && pt.isMeasure() )
     {
-      point.convertTo( QgsWkbTypes::addM( point.wkbType() ) );
-      point.setM( pt.m() );
+      point.addMValue( pt.m() );
       mFound = true;
     }
     if ( !z_passed && pt.is3D() )
     {
-      point.convertTo( QgsWkbTypes::addZ( point.wkbType() ) );
-      point.setZ( pt.z() );
+      point.addZValue( pt.z() );
       zFound = true;
     }
     if ( zFound && mFound )
@@ -1840,8 +1838,7 @@ bool QgsGeometryUtils::transferFirstMValueToPoint( const QgsPointSequence &point
   {
     if ( pt.isMeasure() )
     {
-      point.convertTo( QgsWkbTypes::addM( point.wkbType() ) );
-      point.setM( pt.m() );
+      point.addMValue( pt.m() );
       rc = true;
       break;
     }
@@ -1858,8 +1855,7 @@ bool QgsGeometryUtils::transferFirstZValueToPoint( const QgsPointSequence &point
   {
     if ( pt.is3D() )
     {
-      point.convertTo( QgsWkbTypes::addZ( point.wkbType() ) );
-      point.setZ( pt.z() );
+      point.addZValue( pt.z() );
       rc = true;
       break;
     }

Original file line number	Diff line number	Diff line change
`@@ -1815,14 +1815,12 @@ bool QgsGeometryUtils::transferFirstZOrMValueToPoint( const QgsPointSequence &po`
`1815`	`1815`	`{`
`1816`	`1816`	`if ( !m_passed && pt.isMeasure() )`
`1817`	`1817`	`{`
`1818`		`- point.convertTo( QgsWkbTypes::addM( point.wkbType() ) );`
`1819`		`- point.setM( pt.m() );`
	`1818`	`+ point.addMValue( pt.m() );`
`1820`	`1819`	`mFound = true;`
`1821`	`1820`	`}`
`1822`	`1821`	`if ( !z_passed && pt.is3D() )`
`1823`	`1822`	`{`
`1824`		`- point.convertTo( QgsWkbTypes::addZ( point.wkbType() ) );`
`1825`		`- point.setZ( pt.z() );`
	`1823`	`+ point.addZValue( pt.z() );`
`1826`	`1824`	`zFound = true;`
`1827`	`1825`	`}`
`1828`	`1826`	`if ( zFound && mFound )`
`@@ -1840,8 +1838,7 @@ bool QgsGeometryUtils::transferFirstMValueToPoint( const QgsPointSequence &point`
`1840`	`1838`	`{`
`1841`	`1839`	`if ( pt.isMeasure() )`
`1842`	`1840`	`{`
`1843`		`- point.convertTo( QgsWkbTypes::addM( point.wkbType() ) );`
`1844`		`- point.setM( pt.m() );`
	`1841`	`+ point.addMValue( pt.m() );`
`1845`	`1842`	`rc = true;`
`1846`	`1843`	`break;`
`1847`	`1844`	`}`
`@@ -1858,8 +1855,7 @@ bool QgsGeometryUtils::transferFirstZValueToPoint( const QgsPointSequence &point`
`1858`	`1855`	`{`
`1859`	`1856`	`if ( pt.is3D() )`
`1860`	`1857`	`{`
`1861`		`- point.convertTo( QgsWkbTypes::addZ( point.wkbType() ) );`
`1862`		`- point.setZ( pt.z() );`
	`1858`	`+ point.addZValue( pt.z() );`
`1863`	`1859`	`rc = true;`
`1864`	`1860`	`break;`
`1865`	`1861`	`}`