Merge pull request #60 from HarutakaMatsumoto/develop

Implemented all parts of ReliefComponent except RectifiedGridCoverage
jklimke · Oct 26, 2021 · d10ec50 · d10ec50
2 parents 486fc96 + a716a9d
commit d10ec50
Show file tree

Hide file tree

Showing 8 changed files with 50 additions and 8 deletions.
diff --git a/sources/include/citygml/cityobject.h b/sources/include/citygml/cityobject.h
@@ -39,6 +39,11 @@ namespace citygml {
             COT_SolitaryVegetationObject    = 1ll<< 13,
             COT_WaterBody                   = 1ll<< 14,
             COT_ReliefFeature               = 1ll<< 15,
+            COT_ReliefComponent             = 1ll<< 35,
+            COT_TINRelief                   = 1ll<< 36,
+            COT_MassPointRelief             = 1ll<< 37,
+            COT_BreaklineRelief             = 1ll<< 38,
+            COT_RasterRelief                = 1ll<< 39,
             COT_LandUse                     = 1ll<< 16,
             COT_Tunnel                      = 1ll<< 17,
             COT_Bridge                      = 1ll<< 18,

diff --git a/sources/include/citygml/geometry.h b/sources/include/citygml/geometry.h
@@ -34,7 +34,8 @@ namespace citygml {
             GT_InteriorWall     = 1 << 6,
             GT_Ceiling          = 1 << 7,
             GT_OuterCeiling     = 1 << 8,
-            GT_OuterFloor       = 1 << 9
+            GT_OuterFloor       = 1 << 9,
+            GT_Tin              = 1 << 10,
         };
 
         unsigned int getLOD() const;

diff --git a/sources/include/parser/nodetypes.h b/sources/include/parser/nodetypes.h
@@ -146,9 +146,11 @@ namespace citygml {
         NODETYPE( GML, Shell )
         NODETYPE( GML, PolyhedralSurface )
         NODETYPE( GML, Surface )
-        NODETYPE( GML, PolygonPatch)
+        NODETYPE( GML, PolygonPatch )
 
         NODETYPE( GML, LineString )
+
+        NODETYPE( GML, RectifiedGridCoverage )
 
         // BLDG
         NODETYPE( BLDG, Building )

diff --git a/sources/src/citygml/citygmlfactory.cpp b/sources/src/citygml/citygmlfactory.cpp
@@ -58,6 +58,8 @@ namespace citygml {
             return Geometry::GeometryType::GT_OuterCeiling;
         case CityObject::CityObjectsType::COT_OuterFloorSurface:
             return Geometry::GeometryType::GT_OuterFloor;
+        case CityObject::CityObjectsType::COT_TINRelief:
+            return Geometry::GeometryType::GT_Tin;
         default:
             return Geometry::GeometryType::GT_Unknown;
         }

diff --git a/sources/src/citygml/geometry.cpp b/sources/src/citygml/geometry.cpp
@@ -96,6 +96,8 @@ namespace citygml {
             return "OuterCeiling";
         case GeometryType::GT_OuterFloor:
             return "OuterFloor";
+        case GeometryType::GT_Tin:
+            return "Tin";
         default:
             return "Unknown";
         }

diff --git a/sources/src/parser/cityobjectelementparser.cpp b/sources/src/parser/cityobjectelementparser.cpp
@@ -93,6 +93,11 @@ namespace citygml {
                 typeIDTypeMap.insert(HANDLE_TYPE(BLDG, OuterFloorSurface));
                 typeIDTypeMap.insert(HANDLE_TYPE(GRP, CityObjectGroup));
                 typeIDTypeMap.insert(HANDLE_TYPE(DEM, ReliefFeature));
+                typeIDTypeMap.insert(HANDLE_TYPE(DEM, ReliefComponent));
+                typeIDTypeMap.insert(HANDLE_TYPE(DEM, TINRelief));
+                typeIDTypeMap.insert(HANDLE_TYPE(DEM, MassPointRelief));
+                typeIDTypeMap.insert(HANDLE_TYPE(DEM, BreaklineRelief));
+                typeIDTypeMap.insert(HANDLE_TYPE(DEM, RasterRelief));
                 typeIDTypeMap.insert(HANDLE_TYPE(BLDG, IntBuildingInstallation));
 
                 typeIDTypeMapInitialized = true;
@@ -280,14 +285,27 @@ namespace citygml {
                    || node == NodeType::GRP_ParentNode
                    || node == NodeType::TRANS_TrafficAreaNode
                    || node == NodeType::TRANS_AuxiliaryTrafficAreaNode
-                   || node == NodeType::WTR_BoundedByNode) {
+                   || node == NodeType::WTR_BoundedByNode
+                   || node == NodeType::DEM_ReliefComponentNode
+                   || node == NodeType::DEM_TINReliefNode
+                   || node == NodeType::DEM_MassPointReliefNode
+                   || node == NodeType::DEM_BreaklineReliefNode
+                   || node == NodeType::DEM_RasterReliefNode
+                   || node == NodeType::DEM_GridNode) {
             setParserForNextElement(new CityObjectElementParser(m_documentParser, m_factory, m_logger, [this](CityObject* obj) {
                                         m_model->addChildCityObject(obj);
                                     }));
         } else if (node == NodeType::APP_AppearanceNode // Compatibility with CityGML 1.0 (in CityGML 2 CityObjects can only contain appearanceMember elements)
                    || node == NodeType::APP_AppearanceMemberNode) {
 
             setParserForNextElement(new AppearanceElementParser(m_documentParser, m_factory, m_logger));
+        } else if (node == NodeType::DEM_ExtentNode
+                   || node == NodeType::DEM_TinNode
+                   || node == NodeType::DEM_ReliefPointsNode
+                   || node == NodeType::DEM_RidgeOrValleyLinesNode
+                   || node == NodeType::DEM_BreaklinesNode) {
+
+            parseGeometryForLODLevel(std::stoi(m_model->getAttribute("dem:lod")));
         } else if (node == NodeType::BLDG_Lod1MultiCurveNode
                    || node == NodeType::BLDG_Lod1MultiSurfaceNode
                    || node == NodeType::BLDG_Lod1SolidNode
@@ -380,13 +398,13 @@ namespace citygml {
                    || node == NodeType::CORE_ExternalReferenceNode
                    || node == NodeType::GML_MultiPointNode
                    || node == NodeType::GRP_GeometryNode
-                   || node == NodeType::DEM_ReliefComponentNode
                    || node == NodeType::GEN_Lod0GeometryNode
                    || node == NodeType::GEN_Lod0ImplicitRepresentationNode
                    || node == NodeType::GEN_Lod0TerrainIntersectionNode
                    || node == NodeType::TRANS_Lod0NetworkNode
                    || node == NodeType::WTR_Lod0MultiCurveNode
-                   || node == NodeType::WTR_Lod0MultiSurfaceNode) {
+                   || node == NodeType::WTR_Lod0MultiSurfaceNode
+                   || node == NodeType::GML_RectifiedGridCoverageNode) {
             CITYGML_LOG_INFO(m_logger, "Skipping CityObject child element <" << node  << ">  at " << getDocumentLocation() << " (Currently not supported!)");
             setParserForNextElement(new SkipElementParser(m_documentParser, m_logger, node));
             return true;
@@ -504,6 +522,15 @@ namespace citygml {
                     || node == NodeType::LUSE_Lod3MultiSurfaceNode
                     || node == NodeType::LUSE_Lod4MultiSurfaceNode
                     || node == NodeType::DEM_ReliefComponentNode
+                    || node == NodeType::DEM_TINReliefNode
+                    || node == NodeType::DEM_MassPointReliefNode
+                    || node == NodeType::DEM_BreaklineReliefNode
+                    || node == NodeType::DEM_RasterReliefNode
+                    || node == NodeType::DEM_TinNode
+                    || node == NodeType::DEM_ReliefPointsNode
+                    || node == NodeType::DEM_RidgeOrValleyLinesNode
+                    || node == NodeType::DEM_BreaklinesNode
+                    || node == NodeType::DEM_GridNode
                     || node == NodeType::GEN_Lod0GeometryNode
                     || node == NodeType::GEN_Lod0ImplicitRepresentationNode
                     || node == NodeType::GEN_Lod0TerrainIntersectionNode

diff --git a/sources/src/parser/geometryelementparser.cpp b/sources/src/parser/geometryelementparser.cpp
@@ -60,6 +60,7 @@ namespace citygml {
                 geometryTypeIDSet.insert(NodeType::GML_PolyhedralSurfaceNode.typeID());
                 geometryTypeIDSet.insert(NodeType::GML_SurfaceNode.typeID());
 				geometryTypeIDSet.insert(NodeType::GML_MultiCurveNode.typeID());
+                geometryTypeIDSet.insert(NodeType::GML_MultiPointNode.typeID());
                 geometryTypeIDSetInitialized = true;
 
             }
@@ -138,7 +139,7 @@ namespace citygml {
             };
 
             setParserForNextElement(new SequenceParser(m_documentParser, m_logger, patchParserFactory, node));
-
+            return true;
         }
 
         return GMLObjectElementParser::parseChildElementStartTag(node, attributes);

diff --git a/sources/src/parser/nodetypes.cpp b/sources/src/parser/nodetypes.cpp
@@ -587,9 +587,11 @@ namespace citygml {
     DEFINE_NODE( GML, Shell )
     DEFINE_NODE( GML, PolyhedralSurface )
     DEFINE_NODE( GML, Surface )
-    DEFINE_NODE( GML, PolygonPatch)
+    DEFINE_NODE( GML, PolygonPatch )
 
-    DEFINE_NODE( GML, LineString)
+    DEFINE_NODE( GML, LineString )
+
+    DEFINE_NODE( GML, RectifiedGridCoverage )
 
     // BLDG
     DEFINE_NODE( BLDG, Building )