support 25D layers in network analysis library (fix #11952)

This commit is contained in:
Alexander Bruy 2016-06-23 15:22:35 +03:00
parent 70b9296f37
commit 904dc21625
2 changed files with 2 additions and 3 deletions

View File

@ -52,7 +52,6 @@ const QgsGraphArc& QgsGraph::arc( int idx ) const
return mGraphArc[ idx ]; return mGraphArc[ idx ];
} }
int QgsGraph::vertexCount() const int QgsGraph::vertexCount() const
{ {
return mGraphVertexes.size(); return mGraphVertexes.size();

View File

@ -162,9 +162,9 @@ void QgsLineVectorLayerDirector::makeGraph( QgsGraphBuilderInterface *builder, c
while ( fit.nextFeature( feature ) ) while ( fit.nextFeature( feature ) )
{ {
QgsMultiPolyline mpl; QgsMultiPolyline mpl;
if ( feature.constGeometry()->wkbType() == QGis::WKBMultiLineString ) if ( feature.constGeometry()->wkbType() == QGis::WKBMultiLineString || feature.constGeometry()->wkbType() == QGis::WKBMultiLineString25D )
mpl = feature.constGeometry()->asMultiPolyline(); mpl = feature.constGeometry()->asMultiPolyline();
else if ( feature.constGeometry()->wkbType() == QGis::WKBLineString ) else if ( feature.constGeometry()->wkbType() == QGis::WKBLineString || feature.constGeometry()->wkbType() == QGis::WKBLineString25D )
mpl.push_back( feature.constGeometry()->asPolyline() ); mpl.push_back( feature.constGeometry()->asPolyline() );
QgsMultiPolyline::iterator mplIt; QgsMultiPolyline::iterator mplIt;