Fix hierarchy loading

qgis · Apr 8, 2021 · b061162 · b061162
1 parent cadbbd0
commit b061162
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/src/core/pointcloud/qgsremoteeptpointcloudindex.cpp b/src/core/pointcloud/qgsremoteeptpointcloudindex.cpp
@@ -45,7 +45,10 @@
 
 ///@cond PRIVATE
 
-QgsRemoteEptPointCloudIndex::QgsRemoteEptPointCloudIndex() : QgsEptPointCloudIndex() { }
+QgsRemoteEptPointCloudIndex::QgsRemoteEptPointCloudIndex() : QgsEptPointCloudIndex()
+{
+  mHierarchyNodes.insert( IndexedPointCloudNode( 0, 0, 0, 0 ) );
+}
 
 QgsRemoteEptPointCloudIndex::~QgsRemoteEptPointCloudIndex() = default;
 
@@ -54,6 +57,7 @@ QList<IndexedPointCloudNode> QgsRemoteEptPointCloudIndex::nodeChildren( const In
   QList<IndexedPointCloudNode> lst;
   if ( !loadNodeHierarchy( n ) )
     return lst;
+
   int d = n.d() + 1;
   int x = n.x() * 2;
   int y = n.y() * 2;
@@ -158,17 +162,14 @@ bool QgsRemoteEptPointCloudIndex::loadNodeHierarchy( const IndexedPointCloudNode
     while ( currentNode.d() >= 0 );
   }
 
-  QSet<IndexedPointCloudNode> toBeLoaded;
-  toBeLoaded.insert( IndexedPointCloudNode::fromString( QStringLiteral( "0-0-0-0" ) ) );
-
   for ( int i = nodePathToRoot.size() - 1; i >= 0 && !mHierarchy.contains( nodeId ); --i )
   {
     IndexedPointCloudNode node = nodePathToRoot[i];
     //! The hierarchy of the node is found => No need to load its file
     if ( mHierarchy.contains( node ) )
       continue;
 
-    if ( !toBeLoaded.contains( node ) )
+    if ( !mHierarchyNodes.contains( node ) )
       continue;
 
     const QString fileUrl = QStringLiteral( "%1/ept-hierarchy/%2.json" ).arg( mUrlDirectoryPart, node.toString() );
@@ -201,15 +202,11 @@ bool QgsRemoteEptPointCloudIndex::loadNodeHierarchy( const IndexedPointCloudNode
     {
       QString nodeIdStr = it.key();
       int nodePointCount = it.value().toInt();
+      IndexedPointCloudNode nodeId = IndexedPointCloudNode::fromString( nodeIdStr );
       if ( nodePointCount > 0 )
-      {
-        IndexedPointCloudNode nodeId = IndexedPointCloudNode::fromString( nodeIdStr );
         mHierarchy[nodeId] = nodePointCount;
-      }
       else if ( nodePointCount == -1 )
-      {
-        toBeLoaded.insert( IndexedPointCloudNode::fromString( nodeIdStr ) );
-      }
+        mHierarchyNodes.insert( nodeId );
     }
   }
 

diff --git a/src/core/pointcloud/qgsremoteeptpointcloudindex.h b/src/core/pointcloud/qgsremoteeptpointcloudindex.h
@@ -26,6 +26,7 @@
 #include <QList>
 #include <QFile>
 #include <QUrl>
+#include <QSet>
 
 #include "qgspointcloudindex.h"
 #include "qgspointcloudattribute.h"
@@ -67,6 +68,9 @@ class CORE_EXPORT QgsRemoteEptPointCloudIndex: public QgsEptPointCloudIndex
     QString mUrlFileNamePart;
 
     QUrl mUrl;
+
+    //! Contains the nodes that will have */ept-hierarchy/d-x-y-z.json file
+    mutable QSet<IndexedPointCloudNode> mHierarchyNodes;
 };
 
 ///@endcond