[3d] Fix 3D polygon symbol to work with geometry collection

wonder-sk · wonder-sk · commit 06c9401c0621 · 2019-03-11T00:14:15.000+01:00
Some data sources report their geometry type as multi-surface (a collection of polygons and curve-polygons) and so we should handle them as well. (manually backported from 4a554d2)
diff --git a/src/3d/symbols/qgspolygon3dsymbol_p.cpp b/src/3d/symbols/qgspolygon3dsymbol_p.cpp
@@ -209,6 +209,21 @@ Qt3DRender::QGeometryRenderer *QgsPolygon3DSymbolEntityNode::renderer( const Qgs
           extrusionHeightPerPolygon.append( extrusionHeight );
       }
     }
+    else if ( const QgsGeometryCollection *gc = qgsgeometry_cast< const QgsGeometryCollection *>( g ) )
+    {
+      for ( int i = 0; i < gc->numGeometries(); ++i )
+      {
+        const QgsAbstractGeometry *g2 = gc->geometryN( i );
+        if ( QgsWkbTypes::flatType( g2->wkbType() ) != QgsWkbTypes::Polygon )
+          continue;
+        QgsPolygon *polyClone = static_cast< const QgsPolygon *>( g2 )->clone();
+        Qgs3DUtils::clampAltitudes( polyClone, symbol.altitudeClamping(), symbol.altitudeBinding(), height, map );
+        polygons.append( polyClone );
+        fids.append( f.id() );
+        if ( hasDDExtrusion )
+          extrusionHeightPerPolygon.append( extrusionHeight );
+      }
+    }
     else
       qDebug() << "not a polygon";
   }
