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

alexbruy · alexbruy · commit 8b57da3ab12b · 2016-06-23T15:24:07.000+03:00
(cherry picked from commit 904dc21)
diff --git a/src/analysis/network/qgsgraph.cpp b/src/analysis/network/qgsgraph.cpp
@@ -52,7 +52,6 @@ const QgsGraphArc& QgsGraph::arc( int idx ) const
   return mGraphArc[ idx ];
 }
 
-
 int QgsGraph::vertexCount() const
 {
   return mGraphVertexes.size();
diff --git a/src/analysis/network/qgslinevectorlayerdirector.cpp b/src/analysis/network/qgslinevectorlayerdirector.cpp
@@ -162,9 +162,9 @@ void QgsLineVectorLayerDirector::makeGraph( QgsGraphBuilderInterface *builder, c
   while ( fit.nextFeature( feature ) )
   {
     QgsMultiPolyline mpl;
-    if ( feature.constGeometry()->wkbType() == QGis::WKBMultiLineString )
+    if ( feature.constGeometry()->wkbType() == QGis::WKBMultiLineString || feature.constGeometry()->wkbType() == QGis::WKBMultiLineString25D )
       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() );
 
     QgsMultiPolyline::iterator mplIt;

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,6 @@ const QgsGraphArc& QgsGraph::arc( int idx ) const`
`52`	`52`	`return mGraphArc[ idx ];`
`53`	`53`	`}`
`54`	`54`
`55`		`-`
`56`	`55`	`int QgsGraph::vertexCount() const`
`57`	`56`	`{`
`58`	`57`	`return mGraphVertexes.size();`