Merge pull request #82 from zhoub/bo-dev-gmlmultigeometry

Support <gml:MultiGeometry> element
jklimke · Nov 9, 2023 · 6bf3424 · 6bf3424
2 parents 3a08f9b + 85c2ebe
commit 6bf3424
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 0 deletions.
diff --git a/sources/include/parser/nodetypes.h b/sources/include/parser/nodetypes.h
@@ -132,6 +132,7 @@ namespace citygml {
         NODETYPE( GML, MultiCurve )
         NODETYPE( GML, MultiSurface )
         NODETYPE( GML, MultiSolid )
+        NODETYPE( GML, MultiGeometry )
 
         NODETYPE( GML, CompositeCurve )
         NODETYPE( GML, CompositeSurface )

diff --git a/sources/src/parser/geometryelementparser.cpp b/sources/src/parser/geometryelementparser.cpp
@@ -61,6 +61,7 @@ namespace citygml {
                 geometryTypeIDSet.insert(NodeType::GML_SurfaceNode.typeID());
 				geometryTypeIDSet.insert(NodeType::GML_MultiCurveNode.typeID());
                 geometryTypeIDSet.insert(NodeType::GML_MultiPointNode.typeID());
+                geometryTypeIDSet.insert(NodeType::GML_MultiGeometryNode.typeID());
                 geometryTypeIDSetInitialized = true;
 
             }

diff --git a/sources/src/parser/nodetypes.cpp b/sources/src/parser/nodetypes.cpp
@@ -202,6 +202,7 @@ namespace citygml {
                 INITIALIZE_NODE( GML, MultiCurve )
                 INITIALIZE_NODE( GML, MultiSurface )
                 INITIALIZE_NODE( GML, MultiSolid )
+                INITIALIZE_NODE( GML, MultiGeometry )
 
                 INITIALIZE_NODE( GML, CompositeCurve )
                 INITIALIZE_NODE( GML, CompositeSurface )
@@ -577,6 +578,7 @@ namespace citygml {
     DEFINE_NODE( GML, MultiCurve )
     DEFINE_NODE( GML, MultiSurface )
     DEFINE_NODE( GML, MultiSolid )
+    DEFINE_NODE( GML, MultiGeometry )
 
     DEFINE_NODE( GML, CompositeCurve )
     DEFINE_NODE( GML, CompositeSurface )