Tests and tweaks

xeokit · Jan 9, 2024 · c3447a3 · c3447a3
1 parent c1d1133
commit c3447a3
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 12 deletions.
diff --git a/packages/data/src/DataModel.ts b/packages/data/src/DataModel.ts
@@ -353,7 +353,7 @@ export class DataModel extends Component {
                     }
                 }
             }
-            dataObject = new DataObject(this.data, this, id, dataObjectParams.name, dataObjectParams.description, dataObjectParams.type, propertySets);
+            dataObject = new DataObject(this.data, this, id, dataObjectParams.originalSystemId, dataObjectParams.name, dataObjectParams.description, dataObjectParams.type, propertySets);
             this.objects[id] = dataObject;
             this.data.objects[id] = dataObject;
             if (!this.data.objectsByType[type]) {
@@ -549,23 +549,24 @@ export class DataModel extends Component {
             dataModelParams.propertySets?.push(propertySetParams);
         }
         for (let id in this.objects) {
-            const object = this.objects[id];
-            const objectParams = <DataObjectParams>{
+            const dataObject = this.objects[id];
+            const dataObjectParams = <DataObjectParams>{
                 id,
-                type: object.type,
-                name: object.name,
+                originalSystemId: dataObject.originalSystemId,
+                type: dataObject.type,
+                name: dataObject.name,
                 propertySetIds: []
             };
-            if (object.description !== undefined) {
-                objectParams.description = object.description;
+            if (dataObject.description !== undefined) {
+                dataObjectParams.description = dataObject.description;
             }
-            if (object.propertySets) {
-                for (let i = 0, len = object.propertySets.length; i < len; i++) {
-                    const propertySet = object.propertySets[i];
-                    objectParams.propertySetIds?.push(propertySet.id);
+            if (dataObject.propertySets) {
+                for (let i = 0, len = dataObject.propertySets.length; i < len; i++) {
+                    const propertySet = dataObject.propertySets[i];
+                    dataObjectParams.propertySetIds?.push(propertySet.id);
                 }
             }
-            dataModelParams.objects?.push(objectParams);
+            dataModelParams.objects?.push(dataObjectParams);
         }
         for (let i = 0, len = this.relationships.length; i < len; i++) {
             const relationship = this.relationships[i];

diff --git a/packages/data/src/DataObject.ts b/packages/data/src/DataObject.ts
@@ -30,6 +30,12 @@ export class DataObject {
      */
     public readonly id: string;
 
+    /**
+     * ID of this DataObject within the originating system, is any. Defaults to the value of
+     * {@link @xeokit/data!DataObject.id | DataObject.id}.
+     */
+    originalSystemId?: string;
+
     /**
      * Human-readable name.
      */
@@ -75,6 +81,7 @@ export class DataObject {
         data: Data,
         model: DataModel,
         id: string,
+        originalSysteId: string,
         name: string,
         description: string | undefined,
         type: number,
@@ -83,6 +90,7 @@ export class DataObject {
         this.data = data;
         this.models = [model];
         this.id = id;
+        this.originalSystemId = originalSysteId || id;
         this.name = name;
         this.description = description;
         this.type = type;

diff --git a/packages/data/src/DataObjectParams.ts b/packages/data/src/DataObjectParams.ts
@@ -14,6 +14,12 @@ export interface DataObjectParams {
      */
     id: string;
 
+    /**
+     * ID of this DataObject within the originating system, is any. Defaults to the value of
+     * {@link @xeokit/data!DataObject.id | DataObject.id}.
+     */
+    originalSystemId?: string;
+
     /**
      * The {@link @xeokit/data!DataObject} type.
      */