sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-14 00:07:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix multicurve allowing insertion of non curve geometries

Browse Source
This commit is contained in:
Nyall Dawson 2017-09-26 10:12:52 +10:00
parent 6505104074
commit ed90bf4ded
3 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
python/core/geometry/qgsmulticurve.sip
View File

@ -38,6 +38,8 @@ class QgsMultiCurve: QgsGeometryCollection
virtual bool addGeometry( QgsAbstractGeometry *g /Transfer/ );
virtual bool insertGeometry( QgsAbstractGeometry *g /Transfer/, int index );
QgsMultiCurve *reversed() const /Factory/;
%Docstring

11
src/core/geometry/qgsmulticurve.cpp
View File

@ -142,6 +142,17 @@ bool QgsMultiCurve::addGeometry( QgsAbstractGeometry *g )
return QgsGeometryCollection::addGeometry( g );
}
bool QgsMultiCurve::insertGeometry( QgsAbstractGeometry *g, int index )
{
if ( !g || !qgsgeometry_cast<QgsCurve *>( g ) )
{
delete g;
return false;
}
return QgsGeometryCollection::insertGeometry( g, index );
}
QgsMultiCurve *QgsMultiCurve::reversed() const
{
QgsMultiCurve *reversedMultiCurve = new QgsMultiCurve();

1
src/core/geometry/qgsmulticurve.h
View File

@ -38,6 +38,7 @@ class CORE_EXPORT QgsMultiCurve: public QgsGeometryCollection
QDomElement asGML3( QDomDocument &doc, int precision = 17, const QString &ns = "gml" ) const override;
QString asJSON( int precision = 17 ) const override;
bool addGeometry( QgsAbstractGeometry *g SIP_TRANSFER ) override;
bool insertGeometry( QgsAbstractGeometry *g SIP_TRANSFER, int index ) override;
/** Returns a copy of the multi curve, where each component curve has had its line direction reversed.
* \since QGIS 2.14