Skip to content

Commit

Permalink
Inverted polygons: use unary union
Browse files Browse the repository at this point in the history
  • Loading branch information
Hugo Mercier committed Jun 10, 2014
1 parent 5ec4fef commit b2782ee
Show file tree
Hide file tree
Showing 5 changed files with 94 additions and 65 deletions.
9 changes: 9 additions & 0 deletions python/core/qgsgeometry.sip
View file
Expand Up @@ -442,3 +442,12 @@ class QgsGeometry
void validateGeometry( QList<QgsGeometry::Error> &errors /Out/ );
}; // class QgsGeometry

/** namespace where QgsGeometry-based algorithms lie */
namespace QgsGeometryAlgorithms
{
/** compute the unary union on a list of geometries. May be faster than an iterative union on a set of geometries.
@param geometryList a list of QgsGeometry* as input
@returns the new computed QgsGeometry, or null
*/
QgsGeometry* unaryUnion( const QList<QgsGeometry*>& geometryList );
};
20 changes: 20 additions & 0 deletions src/core/qgsgeometry.cpp
View file
Expand Up @@ -6396,3 +6396,23 @@ QgsGeometry* QgsGeometry::convertToPolygon( bool destMultipart )
return 0;
}
}

namespace QgsGeometryAlgorithms
{

QgsGeometry* unaryUnion( const QList<QgsGeometry*>& geometryList )
{
QList<GEOSGeometry*> geoms;
foreach( QgsGeometry* g, geometryList )
{
// const cast: it is ok here, since the pointers will only be used to be stored
// in a list for a call to union
geoms.append( const_cast<GEOSGeometry*>(g->asGeos()) );
}
GEOSGeometry* unioned = _makeUnion( geoms );
QgsGeometry *ret = new QgsGeometry();
ret->fromGeos( unioned );
return ret;
}

}// QgsGeometryAlgorithms
10 changes: 10 additions & 0 deletions src/core/qgsgeometry.h
View file
Expand Up @@ -679,4 +679,14 @@ class CORE_EXPORT QgsConstWkbPtr
inline operator const unsigned char *() const { return mP; }
};

/** namespace where QgsGeometry-based algorithms lie */
namespace QgsGeometryAlgorithms
{
/** compute the unary union on a list of geometries. May be faster than an iterative union on a set of geometries.
@param geometryList a list of QgsGeometry* as input
@returns the new computed QgsGeometry, or null
*/
QgsGeometry* unaryUnion( const QList<QgsGeometry*>& geometryList );
}

#endif
116 changes: 53 additions & 63 deletions src/core/symbology-ng/qgsinvertedpolygonrenderer.cpp
View file
Expand Up @@ -172,9 +172,7 @@ bool QgsInvertedPolygonRenderer::renderFeature( QgsFeature& feature, QgsRenderCo

if ( ! mSymbolCategories.contains( catId ) )
{
// the exterior ring must be a square in the destination CRS
CombinedFeature cFeat;
cFeat.multiPolygon.append( mExtentPolygon );
// store the first feature
cFeat.feature = feature;
mSymbolCategories.insert( catId, mSymbolCategories.count() );
Expand All @@ -197,61 +195,15 @@ bool QgsInvertedPolygonRenderer::renderFeature( QgsFeature& feature, QgsRenderCo

if ( mPreprocessingEnabled )
{
// preprocessing
if ( ! cFeat.feature.geometry() )
// fix the polygon if it is not valid
if ( ! geom->isGeosValid() )
{
// first feature: add the current geometry
cFeat.feature.setGeometry( new QgsGeometry( *geom ) );
}
else
{
// other features: combine them (union)
QgsGeometry* combined = cFeat.feature.geometry()->combine( geom.data() );
if ( combined && combined->isGeosValid() )
{
cFeat.feature.setGeometry( combined );
}
geom.reset( geom->buffer( 0, 0 ) );
}
}
else
{
// No preprocessing involved.
// We build here a "reversed" geometry of all the polygons
//
// The final geometry is a multipolygon F, with :
// * the first polygon of F having the current extent as its exterior ring
// * each polygon's exterior ring is added as interior ring of the first polygon of F
// * each polygon's interior ring is added as new polygons in F
//
// No validity check is done, on purpose, it will be very slow and painting
// operations do not need geometries to be valid

QgsMultiPolygon multi;
if (( geom->wkbType() == QGis::WKBPolygon ) ||
( geom->wkbType() == QGis::WKBPolygon25D ) )
{
multi.append( geom->asPolygon() );
}
else if (( geom->wkbType() == QGis::WKBMultiPolygon ) ||
( geom->wkbType() == QGis::WKBMultiPolygon25D ) )
{
multi = geom->asMultiPolygon();
}

for ( int i = 0; i < multi.size(); i++ )
{
// add the exterior ring as interior ring to the first polygon
cFeat.multiPolygon[0].append( multi[i][0] );
// add the geometry to the list of geometries for this feature
cFeat.geometries.append( geom.take() );

// add interior rings as new polygons
for ( int j = 1; j < multi[i].size(); j++ )
{
QgsPolygon new_poly;
new_poly.append( multi[i][j] );
cFeat.multiPolygon.append( new_poly );
}
}
}
return true;
}

Expand All @@ -268,23 +220,61 @@ void QgsInvertedPolygonRenderer::stopRender( QgsRenderContext& context )

for ( FeatureCategoryVector::iterator cit = mFeaturesCategories.begin(); cit != mFeaturesCategories.end(); ++cit )
{
QgsFeature feat( cit->feature );
if ( !mPreprocessingEnabled )
QgsFeature& feat = cit->feature;
if ( mPreprocessingEnabled )
{
// no preprocessing - the final polygon has already been prepared
feat.setGeometry( QgsGeometry::fromMultiPolygon( cit->multiPolygon ) );
// compute the unary union on the polygons
QScopedPointer<QgsGeometry> unioned( QgsGeometryAlgorithms::unaryUnion( cit->geometries ) );
// compute the difference with the extent
QScopedPointer<QgsGeometry> rect( QgsGeometry::fromPolygon( mExtentPolygon ) );
QgsGeometry *final = rect->difference( const_cast<QgsGeometry*>(unioned.data()) );
if ( final )
{
feat.setGeometry( final );
}
}
else
{
// preprocessing mode - we still have to invert (using difference)
if ( feat.geometry() )
// No preprocessing involved.
// We build here a "reversed" geometry of all the polygons
//
// The final geometry is a multipolygon F, with :
// * the first polygon of F having the current extent as its exterior ring
// * each polygon's exterior ring is added as interior ring of the first polygon of F
// * each polygon's interior ring is added as new polygons in F
//
// No validity check is done, on purpose, it will be very slow and painting
// operations do not need geometries to be valid
QgsMultiPolygon finalMulti;
finalMulti.append( mExtentPolygon );
foreach( QgsGeometry* geom, cit->geometries )
{
QScopedPointer<QgsGeometry> rect( QgsGeometry::fromPolygon( mExtentPolygon ) );
QgsGeometry *final = rect->difference( feat.geometry() );
if ( final )
QgsMultiPolygon multi;
if (( geom->wkbType() == QGis::WKBPolygon ) ||
( geom->wkbType() == QGis::WKBPolygon25D ) )
{
multi.append( geom->asPolygon() );
}
else if (( geom->wkbType() == QGis::WKBMultiPolygon ) ||
( geom->wkbType() == QGis::WKBMultiPolygon25D ) )
{
multi = geom->asMultiPolygon();
}

for ( int i = 0; i < multi.size(); i++ )
{
feat.setGeometry( final );
// add the exterior ring as interior ring to the first polygon
finalMulti[0].append( multi[i][0] );

// add interior rings as new polygons
for ( int j = 1; j < multi[i].size(); j++ )
{
QgsPolygon new_poly;
new_poly.append( multi[i][j] );
finalMulti.append( new_poly );
}
}
feat.setGeometry( QgsGeometry::fromMultiPolygon( finalMulti ) );
}
}
mSubRenderer->renderFeature( feat, mContext );
Expand Down
4 changes: 2 additions & 2 deletions src/core/symbology-ng/qgsinvertedpolygonrenderer.h
View file
Expand Up @@ -130,8 +130,8 @@ class CORE_EXPORT QgsInvertedPolygonRenderer : public QgsFeatureRendererV2
/** Structure where the reversed geometry is built during renderFeature */
struct CombinedFeature
{
QgsMultiPolygon multiPolygon; //< the final combined geometry
QgsFeature feature; //< one feature (for attriute-based rendering)
QList<QgsGeometry*> geometries; //< list of geometries
QgsFeature feature; //< one feature (for attriute-based rendering)
};
typedef QVector<CombinedFeature> FeatureCategoryVector;
/** where features are stored, based on the index of their symbol category @see mSymbolCategories */
Expand Down

0 comments on commit b2782ee

Please sign in to comment.