@xeokit/xeokit-sdk 2.4.0-alpha-43 → 2.4.0-alpha-45

package/dist/xeokit-sdk.cjs.js

@@ -103094,7 +103094,13 @@ class MetaObject {
         this.type = params.type;
 
         /**
-         * Optional {@link PropertySet}s used by this MetaObject.
+         * IDs of PropertySets associated with this MetaObject.
+         * @type {[]|*}
+         */
+        this.propertySetIds = params.propertySetIds;
+
+        /**
+         * The {@link PropertySet}s associated with this MetaObject.
          *
          * @property propertySets
          * @type {PropertySet[]}
@@ -103282,7 +103288,7 @@ class PropertySet {
     /**
      * @private
      */
-    constructor(id, originalSystemId, name, type, properties) {
+    constructor(params) {
 
         /**
          * Globally-unique ID for this PropertySet.
@@ -103292,7 +103298,7 @@ class PropertySet {
          * @property id
          * @type {String}
          */
-        this.id = id;
+        this.id = params.id;
 
         /**
          * ID of the corresponding object within the originating system, if any.
@@ -103300,7 +103306,7 @@ class PropertySet {
          * @type {String}
          * @abstract
          */
-        this.originalSystemId = originalSystemId;
+        this.originalSystemId = params.originalSystemId;
 
         /**
          * The MetaModels that share this PropertySet.
@@ -103314,7 +103320,7 @@ class PropertySet {
          * @property name
          * @type {String}
          */
-        this.name = name;
+        this.name = params.name;
 
         /**
          * Type of this PropertySet.
@@ -103322,7 +103328,7 @@ class PropertySet {
          * @property type
          * @type {String}
          */
-        this.type = type;
+        this.type = params.type;
 
         /**
          * Properties within this PropertySet.
@@ -103332,7 +103338,8 @@ class PropertySet {
          */
         this.properties = [];
 
-        if (properties) {
+        if (params.properties) {
+            const properties = params.properties;
             for (let i = 0, len = properties.length; i < len; i++) {
                 const property = properties[i];
                 this.properties.push(new Property(property.name,  property.value, property.type, property.valueType, property.description));
@@ -103520,6 +103527,7 @@ class MetaScene {
                 const metaObjectData = metaModelData.metaObjects[i];
                 const type = metaObjectData.type;
                 const id = metaObjectData.id;
+                const propertySetIds = metaObjectData.propertySets | metaObjectData.propertySetIds;
                 let metaObject = this.metaObjects[id];
                 if (!metaObject) {
                     metaObject = new MetaObject({
@@ -103527,7 +103535,7 @@ class MetaScene {
                         parentId: metaObjectData.parent,
                         type,
                         name: metaObjectData.name,
-                        propertySetIds: metaObjectData.propertySetIds
+                        propertySetIds
                     });
                     this.metaObjects[id] = metaObject;
                 }
@@ -103547,6 +103555,19 @@ class MetaScene {
             if (metaObject.children) {
                 metaObject.children = [];
             }
+
+            // Re-link each MetaObject's property sets
+
+            if (metaObject.propertySets) {
+                metaObject.propertySets = [];
+            }
+            if (metaObject.propertySetIds) {
+                for (let i = 0, len = metaObject.propertySetIds.length; i < len; i++) {
+                    const propertySetId = metaObject.propertySetIds[i];
+                    const propertySet = this.propertySets[propertySetId];
+                    metaObject.propertySets.push(propertySet);
+                }
+            }
         }
 
         for (let objectId in this.metaObjects) {
@@ -103593,14 +103614,18 @@ class MetaScene {
 
                 // Globalize MetaObject property set IDs
 
-                const propertySetIds = metaObjectData.propertySetIds;
-                if (propertySetIds) {
-                    const propertySetGlobalIds = [];
-                    for (let j = 0, lenj = propertySetIds.length; j < lenj; j++) {
-                        propertySetGlobalIds.push(math.globalizeObjectId(modelId, propertySetIds[j]));
+                if (globalize) {
+                    const propertySetIds = metaObjectData.propertySetIds;
+                    if (propertySetIds) {
+                        const propertySetGlobalIds = [];
+                        for (let j = 0, lenj = propertySetIds.length; j < lenj; j++) {
+                            propertySetGlobalIds.push(math.globalizeObjectId(modelId, propertySetIds[j]));
+                        }
+                        metaObjectData.propertySetIds = propertySetGlobalIds;
+                        metaObjectData.originalSystemPropertySetIds = propertySetIds;
                     }
-                    metaObjectData.propertySetIds = propertySetGlobalIds;
-                    metaObjectData.originalSystemPropertySetIds = propertySetIds;
+                } else {
+                    metaObjectData.originalSystemPropertySetIds = metaObjectData.propertySetIds;
                 }
             }
         }
@@ -103683,6 +103708,19 @@ class MetaScene {
             if (metaObject.children) {
                 metaObject.children = [];
             }
+
+            // Re-link each MetaObject's property sets
+
+            if (metaObject.propertySets) {
+                metaObject.propertySets = [];
+            }
+            if (metaObject.propertySetIds) {
+                for (let i = 0, len = metaObject.propertySetIds.length; i < len; i++) {
+                    const propertySetId = metaObject.propertySetIds[i];
+                    const propertySet = this.propertySets[propertySetId];
+                    metaObject.propertySets.push(propertySet);
+                }
+            }
         }
 
         this.metaObjectsByType = {};

package/dist/xeokit-sdk.es.js

@@ -103090,7 +103090,13 @@ class MetaObject {
         this.type = params.type;
 
         /**
-         * Optional {@link PropertySet}s used by this MetaObject.
+         * IDs of PropertySets associated with this MetaObject.
+         * @type {[]|*}
+         */
+        this.propertySetIds = params.propertySetIds;
+
+        /**
+         * The {@link PropertySet}s associated with this MetaObject.
          *
          * @property propertySets
          * @type {PropertySet[]}
@@ -103278,7 +103284,7 @@ class PropertySet {
     /**
      * @private
      */
-    constructor(id, originalSystemId, name, type, properties) {
+    constructor(params) {
 
         /**
          * Globally-unique ID for this PropertySet.
@@ -103288,7 +103294,7 @@ class PropertySet {
          * @property id
          * @type {String}
          */
-        this.id = id;
+        this.id = params.id;
 
         /**
          * ID of the corresponding object within the originating system, if any.
@@ -103296,7 +103302,7 @@ class PropertySet {
          * @type {String}
          * @abstract
          */
-        this.originalSystemId = originalSystemId;
+        this.originalSystemId = params.originalSystemId;
 
         /**
          * The MetaModels that share this PropertySet.
@@ -103310,7 +103316,7 @@ class PropertySet {
          * @property name
          * @type {String}
          */
-        this.name = name;
+        this.name = params.name;
 
         /**
          * Type of this PropertySet.
@@ -103318,7 +103324,7 @@ class PropertySet {
          * @property type
          * @type {String}
          */
-        this.type = type;
+        this.type = params.type;
 
         /**
          * Properties within this PropertySet.
@@ -103328,7 +103334,8 @@ class PropertySet {
          */
         this.properties = [];
 
-        if (properties) {
+        if (params.properties) {
+            const properties = params.properties;
             for (let i = 0, len = properties.length; i < len; i++) {
                 const property = properties[i];
                 this.properties.push(new Property(property.name,  property.value, property.type, property.valueType, property.description));
@@ -103516,6 +103523,7 @@ class MetaScene {
                 const metaObjectData = metaModelData.metaObjects[i];
                 const type = metaObjectData.type;
                 const id = metaObjectData.id;
+                const propertySetIds = metaObjectData.propertySets | metaObjectData.propertySetIds;
                 let metaObject = this.metaObjects[id];
                 if (!metaObject) {
                     metaObject = new MetaObject({
@@ -103523,7 +103531,7 @@ class MetaScene {
                         parentId: metaObjectData.parent,
                         type,
                         name: metaObjectData.name,
-                        propertySetIds: metaObjectData.propertySetIds
+                        propertySetIds
                     });
                     this.metaObjects[id] = metaObject;
                 }
@@ -103543,6 +103551,19 @@ class MetaScene {
             if (metaObject.children) {
                 metaObject.children = [];
             }
+
+            // Re-link each MetaObject's property sets
+
+            if (metaObject.propertySets) {
+                metaObject.propertySets = [];
+            }
+            if (metaObject.propertySetIds) {
+                for (let i = 0, len = metaObject.propertySetIds.length; i < len; i++) {
+                    const propertySetId = metaObject.propertySetIds[i];
+                    const propertySet = this.propertySets[propertySetId];
+                    metaObject.propertySets.push(propertySet);
+                }
+            }
         }
 
         for (let objectId in this.metaObjects) {
@@ -103589,14 +103610,18 @@ class MetaScene {
 
                 // Globalize MetaObject property set IDs
 
-                const propertySetIds = metaObjectData.propertySetIds;
-                if (propertySetIds) {
-                    const propertySetGlobalIds = [];
-                    for (let j = 0, lenj = propertySetIds.length; j < lenj; j++) {
-                        propertySetGlobalIds.push(math.globalizeObjectId(modelId, propertySetIds[j]));
+                if (globalize) {
+                    const propertySetIds = metaObjectData.propertySetIds;
+                    if (propertySetIds) {
+                        const propertySetGlobalIds = [];
+                        for (let j = 0, lenj = propertySetIds.length; j < lenj; j++) {
+                            propertySetGlobalIds.push(math.globalizeObjectId(modelId, propertySetIds[j]));
+                        }
+                        metaObjectData.propertySetIds = propertySetGlobalIds;
+                        metaObjectData.originalSystemPropertySetIds = propertySetIds;
                     }
-                    metaObjectData.propertySetIds = propertySetGlobalIds;
-                    metaObjectData.originalSystemPropertySetIds = propertySetIds;
+                } else {
+                    metaObjectData.originalSystemPropertySetIds = metaObjectData.propertySetIds;
                 }
             }
         }
@@ -103679,6 +103704,19 @@ class MetaScene {
             if (metaObject.children) {
                 metaObject.children = [];
             }
+
+            // Re-link each MetaObject's property sets
+
+            if (metaObject.propertySets) {
+                metaObject.propertySets = [];
+            }
+            if (metaObject.propertySetIds) {
+                for (let i = 0, len = metaObject.propertySetIds.length; i < len; i++) {
+                    const propertySetId = metaObject.propertySetIds[i];
+                    const propertySet = this.propertySets[propertySetId];
+                    metaObject.propertySets.push(propertySet);
+                }
+            }
         }
 
         this.metaObjectsByType = {};