@xeokit/xeokit-sdk 2.5.2-beta-17 → 2.5.2-beta-19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xeokit/xeokit-sdk",
-  "version": "2.5.2-beta-17",
+  "version": "2.5.2-beta-19",
   "description": "Web Programming Toolkit for 3D/2D BIM and AEC Graphics",
   "module": "./dist/xeokit-sdk.es.js",
   "main": "./dist/xeokit-sdk.cjs.js",

package/src/plugins/TreeViewPlugin/TreeViewPlugin.js

@@ -976,7 +976,7 @@ export class TreeViewPlugin extends Plugin {
             buildingNode = {
                 nodeId: `${this._id}-${objectId}`,
                 objectId: objectId,
-                title: this._rootNames[metaObject.metaModels[0].id] || ((metaObjectName && metaObjectName !== "" && metaObjectName !== "Undefined" && metaObjectName !== "Default") ? metaObjectName : metaObjectType),
+                title: (metaObject.metaModels.length === 0) ? "na" : this._rootNames[metaObject.metaModels[0].id] || ((metaObjectName && metaObjectName !== "" && metaObjectName !== "Undefined" && metaObjectName !== "Default") ? metaObjectName : metaObjectType),
                 type: metaObjectType,
                 parent: null,
                 numEntities: 0,
@@ -1079,7 +1079,7 @@ export class TreeViewPlugin extends Plugin {
             rootNode = {
                 nodeId: `${this._id}-${objectId}`,
                 objectId: objectId,
-                title: this._rootNames[metaObject.metaModels[0].id] || ((metaObjectName && metaObjectName !== "" && metaObjectName !== "Undefined" && metaObjectName !== "Default") ? metaObjectName : metaObjectType),
+                title: metaObject.metaModels.length === 0 ? "na" : this._rootNames[metaObject.metaModels[0].id] || ((metaObjectName && metaObjectName !== "" && metaObjectName !== "Undefined" && metaObjectName !== "Default") ? metaObjectName : metaObjectType),
                 type: metaObjectType,
                 parent: null,
                 numEntities: 0,
@@ -1160,7 +1160,7 @@ export class TreeViewPlugin extends Plugin {
         const node = {
             nodeId: `${this._id}-${objectId}`,
             objectId: objectId,
-            title: (!parent) ? (this._rootNames[metaObject.metaModels[0].id] || metaObjectName) : (metaObjectName && metaObjectName !== "" && metaObjectName !== "Undefined" && metaObjectName !== "Default") ? metaObjectName : metaObjectType,
+            title: (!parent) ? metaObject.metaModels.length === 0 ? "na" : (this._rootNames[metaObject.metaModels[0].id] || metaObjectName) : (metaObjectName && metaObjectName !== "" && metaObjectName !== "Undefined" && metaObjectName !== "Default") ? metaObjectName : metaObjectType,
             type: metaObjectType,
             parent: parent,
             numEntities: 0,

package/src/viewer/metadata/MetaModel.js

@@ -217,9 +217,9 @@ class MetaModel {
                         external: metaObjectData.external,
                     });
                     this.metaScene.metaObjects[id] = metaObject;
-                    this.metaObjects.push(metaObject);
+                    metaObject.metaModels = [];
                 }
-                metaObject.metaModels.push(this);
+                this.metaObjects.push(metaObject);
                 if (!metaObjectData.parent) {
                     this.rootMetaObjects.push(metaObject);
                     metaScene.rootMetaObjects[id] = metaObject;
@@ -283,8 +283,8 @@ class MetaModel {
 
         // Relink MetaObjects to their MetaModels
 
-        for (let objectId in this.metaObjects) {
-            const metaObject = this.metaObjects[objectId];
+        for (let objectId in metaScene.metaObjects) {
+            const metaObject = metaScene.metaObjects[objectId];
             metaObject.metaModels = [];
         }
 

package/src/viewer/metadata/MetaScene.js

@@ -157,11 +157,11 @@ class MetaScene {
      *
      * Fires a "metaModelDestroyed" event with the value of the {@link MetaModel#id}.
      *
-     * @param {String} id ID of the target {@link MetaModel}.
+     * @param {String} metaModelId ID of the target {@link MetaModel}.
      */
-    destroyMetaModel(id) {
+    destroyMetaModel(metaModelId) {
 
-        const metaModel = this.metaModels[id];
+        const metaModel = this.metaModels[metaModelId];
         if (!metaModel) {
             return;
         }
@@ -171,12 +171,12 @@ class MetaScene {
         if (metaModel.propertySets) {
             for (let i = 0, len = metaModel.propertySets.length; i < len; i++) {
                 const propertySet = metaModel.propertySets[i];
-                if (propertySet.metaModels.length === 1) { // Property set owned by one model, delete
+                if (propertySet.metaModels.length === 1 && propertySet.metaModels[0].id === metaModelId) { // Property set owned only by this model, delete
                     delete this.propertySets[propertySet.id];
                 } else {
                     const newMetaModels = [];
                     for (let j = 0, lenj = propertySet.metaModels.length; j < lenj; j++) {
-                        if (propertySet.metaModels[j].id !== id) {
+                        if (propertySet.metaModels[j].id !== metaModelId) {
                             newMetaModels.push(propertySet.metaModels[j]);
                         }
                     }
@@ -192,7 +192,7 @@ class MetaScene {
                 const metaObject = metaModel.metaObjects[i];
                 const type = metaObject.type;
                 const id = metaObject.id;
-                if (metaObject.metaModels.length === 1) { // MetaObject owned by one model, delete
+                if (metaObject.metaModels.length === 1&& metaObject.metaModels[0].id === metaModelId) { // MetaObject owned only by this model, delete
                     delete this.metaObjects[id];
                     if (!metaObject.parent) {
                         delete this.rootMetaObjects[id];
@@ -245,7 +245,7 @@ class MetaScene {
             }
         }
 
-        delete this.metaModels[id];
+        delete this.metaModels[metaModelId];
 
         // Relink MetaObjects to their MetaModels
 
@@ -262,7 +262,7 @@ class MetaScene {
             }
         }
 
-        this.fire("metaModelDestroyed", id);
+        this.fire("metaModelDestroyed", metaModelId);
     }
 
     /**