Reverted citygmltest.cpp.

Fixed DEM_GridNode place
jklimke · Oct 26, 2021 · a716a9d · a716a9d
1 parent b49b076
commit a716a9d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/sources/src/parser/cityobjectelementparser.cpp b/sources/src/parser/cityobjectelementparser.cpp
@@ -290,7 +290,8 @@ namespace citygml {
                    || node == NodeType::DEM_TINReliefNode
                    || node == NodeType::DEM_MassPointReliefNode
                    || node == NodeType::DEM_BreaklineReliefNode
-                   || node == NodeType::DEM_RasterReliefNode) {
+                   || node == NodeType::DEM_RasterReliefNode
+                   || node == NodeType::DEM_GridNode) {
             setParserForNextElement(new CityObjectElementParser(m_documentParser, m_factory, m_logger, [this](CityObject* obj) {
                                         m_model->addChildCityObject(obj);
                                     }));
@@ -302,8 +303,7 @@ namespace citygml {
                    || node == NodeType::DEM_TinNode
                    || node == NodeType::DEM_ReliefPointsNode
                    || node == NodeType::DEM_RidgeOrValleyLinesNode
-                   || node == NodeType::DEM_BreaklinesNode
-                   || node == NodeType::DEM_GridNode) {
+                   || node == NodeType::DEM_BreaklinesNode) {
 
             parseGeometryForLODLevel(std::stoi(m_model->getAttribute("dem:lod")));
         } else if (node == NodeType::BLDG_Lod1MultiCurveNode

diff --git a/test/citygmltest.cpp b/test/citygmltest.cpp
@@ -120,9 +120,9 @@ int main( int argc, char **argv )
     if ( log )
     {
         std::cout << std::endl << "Objects hierarchy:" << std::endl;
-        const citygml::ConstCityObjects& roots = city->getRootCityObjects();
+//        const citygml::ConstCityObjects& roots = city->getRootCityObjects();
 
-        for ( unsigned int i = 0; i < roots.size(); i++ ) analyzeObject( roots[ i ], 2 );
+//        for ( unsigned int i = 0; i < roots.size(); i++ ) analyzeObject( roots[ i ], 2 );
     }
 
     std::cout << "Done." << std::endl;
@@ -132,8 +132,6 @@ int main( int argc, char **argv )
 
 void analyzeObject( const citygml::CityObject* object, unsigned int indent )
 {
-    std::cout
-    << object->getTypeAsString();
 //    for ( unsigned int i = 0; i < indent; i++ ) std::cout << " ";
 //        std::cout << "Object " << citygml::getCityObjectsClassName( object->getType() ) << ": " << object->getId() << std::endl;