bruce-cesium 5.2.8 → 5.2.9

package/dist/bruce-cesium.umd.js

@@ -16843,6 +16843,10 @@
                 // It's pretty expensive so we save it for a few seconds inbetween checks.
                 this.somethingIsolated = null;
                 this.somethingIsolatedDateTime = null;
+                // Entity ID -> rego.
+                // We retain this information as a quick look-up on what has been registered.
+                // This lets us properly assign siblings to the same rego when hierarchy items are marked as collapsed.
+                this.loadedCesiumEntities = {};
                 const { viewer, register: visualsManager, getters, item } = params;
                 this.viewer = viewer;
                 this.getters = getters;
@@ -17146,6 +17150,26 @@
                         }
                     }
                     feature.show = !hide;
+                    // Already exists, so we add this graphic as a sibling.
+                    if (this.loadedCesiumEntities[rego.entityId]) {
+                        rego = this.loadedCesiumEntities[rego.entityId];
+                        if (!rego.visual) {
+                            // No parent graphic.
+                            rego.visual = feature;
+                        }
+                        else if (rego.visual == feature) ;
+                        else {
+                            const visual = rego.visual;
+                            // Sibling graphic.
+                            if (!visual._siblingGraphics) {
+                                visual._siblingGraphics = [];
+                            }
+                            if (visual._siblingGraphics.indexOf(feature) < 0) {
+                                visual._siblingGraphics.push(feature);
+                            }
+                        }
+                    }
+                    this.loadedCesiumEntities[rego.entityId] = rego;
                     this.visualsManager.AddRego({
                         rego,
                         requestRender: false
@@ -17159,6 +17183,9 @@
                         menuItemId: this.item.id,
                         doRemove: false
                     });
+                    // Might have to do something smarter since siblings could still be OK.
+                    this.loadedCesiumEntities[rego.entityId] = null;
+                    delete this.loadedCesiumEntities[rego.entityId];
                 }
             }
             getMetaByGeomId(geomId, tileset) {
@@ -17171,9 +17198,9 @@
                 if (!modelTree) {
                     return null;
                 }
-                return this.digMetaByGeomId(geomId, modelTree, [], 0);
+                return this.digMetaByGeomId(geomId, modelTree, [], 0, null);
             }
-            digMetaByGeomId(geomId, branch, path, depth) {
+            digMetaByGeomId(geomId, branch, path, depth, firstFoundCollapsedBranch) {
                 if (this.hasHitDepthLimit || depth > 10) {
                     if (!this.hasHitDepthLimit) {
                         console.error("digMetaByGeomId: depth > 10. Disabling further attempts.");
@@ -17183,12 +17210,19 @@
                 }
                 path = [].concat(path);
                 path.push(branch.id);
+                if (!firstFoundCollapsedBranch && branch.collapsed) {
+                    firstFoundCollapsedBranch = branch;
+                }
                 if (branch.geomId == geomId) {
-                    return { id: path[path.length - 1], typeId: branch.typeId, name: branch.name };
+                    // If we collapsed on a higher branch then we return it instead.
+                    if (firstFoundCollapsedBranch) {
+                        branch = firstFoundCollapsedBranch;
+                    }
+                    return { id: branch.id, typeId: branch.typeId, name: branch.name };
                 }
                 else if (branch.children) {
                     for (let i = 0; i < branch.children.length; i++) {
-                        let meta = this.digMetaByGeomId(geomId, branch.children[i], path, depth + 1);
+                        let meta = this.digMetaByGeomId(geomId, branch.children[i], path, depth + 1, firstFoundCollapsedBranch);
                         if (meta) {
                             return meta;
                         }
@@ -29882,7 +29916,7 @@
         }
     }
 
-    const VERSION = "5.2.8";
+    const VERSION = "5.2.9";
 
     exports.VERSION = VERSION;
     exports.isHistoricMetadataChanged = isHistoricMetadataChanged;