Skip to content

Commit

Permalink
Add optimised method to create QgsCircularString direct from coordinate
Browse files Browse the repository at this point in the history 
arrays
  • Loading branch information
@nyalldawson
nyalldawson committed Apr 27, 2021
1 parent ca22c47 commit 063f2ee
Show file tree
Hide file tree
Showing 4 changed files with 227 additions and 0 deletions.
19 changes: 19 additions & 0 deletions python/core/auto_generated/geometry/qgscircularstring.sip.in
View file
Expand Up @@ -39,6 +39,25 @@ arc passing through ``p1``, ``p2`` and ``p3``.
.. versionadded:: 3.2
%End

QgsCircularString( const QVector<double> &x, const QVector<double> &y,
const QVector<double> &z = QVector<double>(),
const QVector<double> &m = QVector<double>() ) /HoldGIL/;
%Docstring
Construct a circular string from arrays of coordinates. If the z or m
arrays are non-empty then the resultant circular string will have
z and m types accordingly.

This constructor is more efficient then calling :py:func:`~QgsCircularString.setPoints`.

.. warning::

It is the caller's responsibility to ensure that the supplied arrays
are of odd sizes.

.. versionadded:: 3.20
%End


static QgsCircularString fromTwoPointsAndCenter( const QgsPoint &p1,
const QgsPoint &p2,
const QgsPoint &center,
Expand Down
46 changes: 46 additions & 0 deletions src/core/geometry/qgscircularstring.cpp
View file
Expand Up @@ -71,6 +71,52 @@ QgsCircularString::QgsCircularString( const QgsPoint &p1, const QgsPoint &p2, co
}
}

QgsCircularString::QgsCircularString( const QVector<double> &x, const QVector<double> &y, const QVector<double> &z, const QVector<double> &m )
{
mWkbType = QgsWkbTypes::CircularString;
int pointCount = std::min( x.size(), y.size() );
if ( x.size() == pointCount )
{
mX = x;
}
else
{
mX = x.mid( 0, pointCount );
}
if ( y.size() == pointCount )
{
mY = y;
}
else
{
mY = y.mid( 0, pointCount );
}
if ( !z.isEmpty() && z.count() >= pointCount )
{
mWkbType = QgsWkbTypes::CircularStringZ;
if ( z.size() == pointCount )
{
mZ = z;
}
else
{
mZ = z.mid( 0, pointCount );
}
}
if ( !m.isEmpty() && m.count() >= pointCount )
{
mWkbType = QgsWkbTypes::addM( mWkbType );
if ( m.size() == pointCount )
{
mM = m;
}
else
{
mM = m.mid( 0, pointCount );
}
}
}

QgsCircularString QgsCircularString::fromTwoPointsAndCenter( const QgsPoint &p1, const QgsPoint &p2, const QgsPoint &center, const bool useShortestArc )
{
const QgsPoint midPoint = QgsGeometryUtils::segmentMidPointFromCenter( p1, p2, center, useShortestArc );
Expand Down
17 changes: 17 additions & 0 deletions src/core/geometry/qgscircularstring.h
View file
Expand Up @@ -50,6 +50,23 @@ class CORE_EXPORT QgsCircularString: public QgsCurve
const QgsPoint &p2,
const QgsPoint &p3 ) SIP_HOLDGIL;

/**
* Construct a circular string from arrays of coordinates. If the z or m
* arrays are non-empty then the resultant circular string will have
* z and m types accordingly.
*
* This constructor is more efficient then calling setPoints().
*
* \warning It is the caller's responsibility to ensure that the supplied arrays
* are of odd sizes.
*
* \since QGIS 3.20
*/
QgsCircularString( const QVector<double> &x, const QVector<double> &y,
const QVector<double> &z = QVector<double>(),
const QVector<double> &m = QVector<double>() ) SIP_HOLDGIL;


/**
* Creates a circular string with a single arc representing
* the curve from \a p1 to \a p2 with the specified \a center.
Expand Down
145 changes: 145 additions & 0 deletions tests/src/core/testqgsgeometry.cpp
View file
Expand Up @@ -125,6 +125,7 @@ class TestQgsGeometry : public QObject
void point(); //test QgsPointV2
void lineString(); //test QgsLineString
void circularString();
void circularStringFromArray();
void polygon(); //test QgsPolygon
void curvePolygon();
void triangle();
Expand Down Expand Up @@ -3017,6 +3018,150 @@ void TestQgsGeometry::circularString()
QCOMPARE( orientation.orientation(), QgsCurve::CounterClockwise );
}

void TestQgsGeometry::circularStringFromArray()
{
// test creating circular strings from arrays
QVector< double > xx;
xx << 1 << 2 << 3;
QVector< double > yy;
yy << 11 << 12 << 13;
QgsCircularString fromArray( xx, yy );
QCOMPARE( fromArray.wkbType(), QgsWkbTypes::CircularString );
QCOMPARE( fromArray.numPoints(), 3 );
QCOMPARE( fromArray.xAt( 0 ), 1.0 );
QCOMPARE( fromArray.yAt( 0 ), 11.0 );
QCOMPARE( fromArray.xAt( 1 ), 2.0 );
QCOMPARE( fromArray.yAt( 1 ), 12.0 );
QCOMPARE( fromArray.xAt( 2 ), 3.0 );
QCOMPARE( fromArray.yAt( 2 ), 13.0 );

// unbalanced
xx = QVector< double >() << 1 << 2;
yy = QVector< double >() << 11 << 12 << 13;
QgsCircularString fromArray2( xx, yy );
QCOMPARE( fromArray2.wkbType(), QgsWkbTypes::CircularString );
QCOMPARE( fromArray2.numPoints(), 2 );
QCOMPARE( fromArray2.xAt( 0 ), 1.0 );
QCOMPARE( fromArray2.yAt( 0 ), 11.0 );
QCOMPARE( fromArray2.xAt( 1 ), 2.0 );
QCOMPARE( fromArray2.yAt( 1 ), 12.0 );
xx = QVector< double >() << 1 << 2 << 3;
yy = QVector< double >() << 11 << 12;
QgsCircularString fromArray3( xx, yy );
QCOMPARE( fromArray3.wkbType(), QgsWkbTypes::CircularString );
QCOMPARE( fromArray3.numPoints(), 2 );
QCOMPARE( fromArray3.xAt( 0 ), 1.0 );
QCOMPARE( fromArray3.yAt( 0 ), 11.0 );
QCOMPARE( fromArray3.xAt( 1 ), 2.0 );
QCOMPARE( fromArray3.yAt( 1 ), 12.0 );
// with z
QVector< double > zz;
xx = QVector< double >() << 1 << 2 << 3;
yy = QVector< double >() << 11 << 12 << 13;
zz = QVector< double >() << 21 << 22 << 23;
QgsCircularString fromArray4( xx, yy, zz );
QCOMPARE( fromArray4.wkbType(), QgsWkbTypes::CircularStringZ );
QCOMPARE( fromArray4.numPoints(), 3 );
QCOMPARE( fromArray4.xAt( 0 ), 1.0 );
QCOMPARE( fromArray4.yAt( 0 ), 11.0 );
QCOMPARE( fromArray4.pointN( 0 ).z(), 21.0 );
QCOMPARE( fromArray4.xAt( 1 ), 2.0 );
QCOMPARE( fromArray4.yAt( 1 ), 12.0 );
QCOMPARE( fromArray4.pointN( 1 ).z(), 22.0 );
QCOMPARE( fromArray4.xAt( 2 ), 3.0 );
QCOMPARE( fromArray4.yAt( 2 ), 13.0 );
QCOMPARE( fromArray4.pointN( 2 ).z(), 23.0 );

// unbalanced -> z ignored
zz = QVector< double >() << 21 << 22;
QgsCircularString fromArray5( xx, yy, zz );
QCOMPARE( fromArray5.wkbType(), QgsWkbTypes::CircularString );
QCOMPARE( fromArray5.numPoints(), 3 );
QCOMPARE( fromArray5.xAt( 0 ), 1.0 );
QCOMPARE( fromArray5.yAt( 0 ), 11.0 );
QCOMPARE( fromArray5.xAt( 1 ), 2.0 );
QCOMPARE( fromArray5.yAt( 1 ), 12.0 );
QCOMPARE( fromArray5.xAt( 2 ), 3.0 );
QCOMPARE( fromArray5.yAt( 2 ), 13.0 );
// unbalanced -> z truncated
zz = QVector< double >() << 21 << 22 << 23 << 24;
fromArray5 = QgsCircularString( xx, yy, zz );
QCOMPARE( fromArray5.wkbType(), QgsWkbTypes::CircularStringZ );
QCOMPARE( fromArray5.numPoints(), 3 );
QCOMPARE( fromArray5.xAt( 0 ), 1.0 );
QCOMPARE( fromArray5.yAt( 0 ), 11.0 );
QCOMPARE( fromArray5.pointN( 0 ).z(), 21.0 );
QCOMPARE( fromArray5.xAt( 1 ), 2.0 );
QCOMPARE( fromArray5.yAt( 1 ), 12.0 );
QCOMPARE( fromArray5.pointN( 1 ).z(), 22.0 );
QCOMPARE( fromArray5.xAt( 2 ), 3.0 );
QCOMPARE( fromArray5.yAt( 2 ), 13.0 );
QCOMPARE( fromArray5.pointN( 2 ).z(), 23.0 );

// with m
QVector< double > mm;
xx = QVector< double >() << 1 << 2 << 3;
yy = QVector< double >() << 11 << 12 << 13;
mm = QVector< double >() << 21 << 22 << 23;
QgsCircularString fromArray6( xx, yy, QVector< double >(), mm );
QCOMPARE( fromArray6.wkbType(), QgsWkbTypes::CircularStringM );
QCOMPARE( fromArray6.numPoints(), 3 );
QCOMPARE( fromArray6.xAt( 0 ), 1.0 );
QCOMPARE( fromArray6.yAt( 0 ), 11.0 );
QCOMPARE( fromArray6.pointN( 0 ).m(), 21.0 );
QCOMPARE( fromArray6.xAt( 1 ), 2.0 );
QCOMPARE( fromArray6.yAt( 1 ), 12.0 );
QCOMPARE( fromArray6.pointN( 1 ).m(), 22.0 );
QCOMPARE( fromArray6.xAt( 2 ), 3.0 );
QCOMPARE( fromArray6.yAt( 2 ), 13.0 );
QCOMPARE( fromArray6.pointN( 2 ).m(), 23.0 );
// unbalanced -> m ignored
mm = QVector< double >() << 21 << 22;
QgsCircularString fromArray7( xx, yy, QVector< double >(), mm );
QCOMPARE( fromArray7.wkbType(), QgsWkbTypes::CircularString );
QCOMPARE( fromArray7.numPoints(), 3 );
QCOMPARE( fromArray7.xAt( 0 ), 1.0 );
QCOMPARE( fromArray7.yAt( 0 ), 11.0 );
QCOMPARE( fromArray7.xAt( 1 ), 2.0 );
QCOMPARE( fromArray7.yAt( 1 ), 12.0 );
QCOMPARE( fromArray7.xAt( 2 ), 3.0 );
QCOMPARE( fromArray7.yAt( 2 ), 13.0 );
// unbalanced -> m truncated
mm = QVector< double >() << 21 << 22 << 23 << 24;
fromArray7 = QgsCircularString( xx, yy, QVector< double >(), mm );
QCOMPARE( fromArray7.wkbType(), QgsWkbTypes::CircularStringM );
QCOMPARE( fromArray7.numPoints(), 3 );
QCOMPARE( fromArray7.xAt( 0 ), 1.0 );
QCOMPARE( fromArray7.yAt( 0 ), 11.0 );
QCOMPARE( fromArray7.pointN( 0 ).m(), 21.0 );
QCOMPARE( fromArray7.xAt( 1 ), 2.0 );
QCOMPARE( fromArray7.yAt( 1 ), 12.0 );
QCOMPARE( fromArray7.pointN( 1 ).m(), 22.0 );
QCOMPARE( fromArray7.xAt( 2 ), 3.0 );
QCOMPARE( fromArray7.yAt( 2 ), 13.0 );
QCOMPARE( fromArray7.pointN( 2 ).m(), 23.0 );

// zm
xx = QVector< double >() << 1 << 2 << 3;
yy = QVector< double >() << 11 << 12 << 13;
zz = QVector< double >() << 21 << 22 << 23;
mm = QVector< double >() << 31 << 32 << 33;
QgsCircularString fromArray8( xx, yy, zz, mm );
QCOMPARE( fromArray8.wkbType(), QgsWkbTypes::CircularStringZM );
QCOMPARE( fromArray8.numPoints(), 3 );
QCOMPARE( fromArray8.xAt( 0 ), 1.0 );
QCOMPARE( fromArray8.yAt( 0 ), 11.0 );
QCOMPARE( fromArray8.pointN( 0 ).z(), 21.0 );
QCOMPARE( fromArray8.pointN( 0 ).m(), 31.0 );
QCOMPARE( fromArray8.xAt( 1 ), 2.0 );
QCOMPARE( fromArray8.yAt( 1 ), 12.0 );
QCOMPARE( fromArray8.pointN( 1 ).z(), 22.0 );
QCOMPARE( fromArray8.pointN( 1 ).m(), 32.0 );
QCOMPARE( fromArray8.xAt( 2 ), 3.0 );
QCOMPARE( fromArray8.yAt( 2 ), 13.0 );
QCOMPARE( fromArray8.pointN( 2 ).z(), 23.0 );
QCOMPARE( fromArray8.pointN( 2 ).m(), 33.0 );
}

void TestQgsGeometry::lineString()
{
Expand Down

0 comments on commit 063f2ee

Please sign in to comment.