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

Support also curved geometries for tracing (fixes #15109)

Browse Source
This commit is contained in:
Martin Dobias 2016-06-30 17:04:47 +02:00
parent 5f6627624e
commit bf07d2bf58
2 changed files with 49 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/core/qgstracer.cpp
View File

@ -408,6 +408,20 @@ void resetGraph( QgsTracerGraph& g )
void extractLinework( const QgsGeometry* g, QgsMultiPolyline& mpl ) void extractLinework( const QgsGeometry* g, QgsMultiPolyline& mpl )
{ {
// segmentize curved geometries - we will use noding algorithm from GEOS
// to find all intersections a bit later (so we need them segmentized anyway)
QScopedPointer<QgsGeometry> segmentizedGeom;
if ( QgsWKBTypes::isCurvedType( g->geometry()->wkbType() ) )
{
QgsAbstractGeometryV2* segmentizedGeomV2 = g->geometry()->segmentize();
if ( !segmentizedGeomV2 )
return;
// temporarily replace the original geometry by our segmentized one
segmentizedGeom.reset( new QgsGeometry( segmentizedGeomV2 ) );
g = segmentizedGeom.data();
}
switch ( QgsWKBTypes::flatType( g->geometry()->wkbType() ) ) switch ( QgsWKBTypes::flatType( g->geometry()->wkbType() ) )
{ {
case QgsWKBTypes::LineString: case QgsWKBTypes::LineString:

35
tests/src/core/testqgstracer.cpp
View File

@ -34,6 +34,7 @@ class TestQgsTracer : public QObject
void testLayerUpdates(); void testLayerUpdates();
void testExtent(); void testExtent();
void testReprojection(); void testReprojection();
void testCurved();
private: private:
@ -319,6 +320,40 @@ void TestQgsTracer::testReprojection()
QCOMPARE( points1.count(), 2 ); QCOMPARE( points1.count(), 2 );
} }
void TestQgsTracer::testCurved()
{
QStringList wkts;
wkts << "CIRCULARSTRING(0 0, 10 10, 20 0)";
/* This shape - half of a circle (r = 10)
* 10,10 _
* / \
* 0,0 | | 20,0
*/
QgsVectorLayer* vl = make_layer( wkts );
QgsTracer tracer;
tracer.setLayers( QList<QgsVectorLayer*>() << vl );
QgsPolyline points1 = tracer.findShortestPath( QgsPoint( 0, 0 ), QgsPoint( 10, 10 ) );
QVERIFY( points1.count() != 0 );
QgsGeometry* tmpG1 = QgsGeometry::fromPolyline( points1 );
double l = tmpG1->length();
delete tmpG1;
// fuzzy comparison of QCOMPARE is too strict for this case
double full_circle_length = 2 * M_PI * 10;
QVERIFY( qAbs( l - full_circle_length / 4 ) < 0.01 );
QCOMPARE( points1[0], QgsPoint( 0, 0 ) );
QCOMPARE( points1[points1.count()-1], QgsPoint( 10, 10 ) );
delete vl;
}
QTEST_MAIN( TestQgsTracer ) QTEST_MAIN( TestQgsTracer )
#include "testqgstracer.moc" #include "testqgstracer.moc"