bimatter-viewer-react 0.11.11 → 0.11.12

package/lib/{IFCLoader-CrJVqtat.js → IFCLoader-5oUOfYbb.js}

@@ -191338,139 +191338,148 @@ var x_ = class {
 		this.clearPropertyCaches(), this.spatialLinesCache.clear(), this.spatialTreeChunksCache.clear();
 	}
 	async getPropertiesAsBlobs(e, t, n, r) {
-		let i = await this.getAllRelDefinesByProps(e), a = i.size, o = t.size, s = {}, c = this.parser.GetLineIDsWithType(e, Cd).get(0);
-		if (c === void 0) return s;
-		let l = await this.getItemPropertiesBatch(e, i), u = /* @__PURE__ */ new Set(), d = /* @__PURE__ */ new Set();
-		for (let e of l.values()) {
+		let i = await this.getAllRelDefinesByProps(e), a = i.size, o = t.size, s = await this.getMaterialsByElement(e), c = {}, l = this.parser.GetLineIDsWithType(e, Cd).get(0);
+		if (l === void 0) return c;
+		let u = await this.getItemPropertiesBatch(e, i), d = /* @__PURE__ */ new Set(), f = /* @__PURE__ */ new Set();
+		for (let e of u.values()) {
 			if (!e) continue;
 			let t = y_(e.RelatingPropertyDefinition);
-			t !== null && u.add(t);
-			for (let t of b_(e.RelatedObjects)) d.add(t);
-		}
-		let f = await this.getItemPropertiesBatch(e, u), p = /* @__PURE__ */ new Set();
-		for (let e of f.values()) if (e) {
-			for (let t of b_(e.HasProperties)) p.add(t);
-			for (let t of b_(e.Quantities)) p.add(t);
-		}
-		await this.getItemPropertiesBatch(e, p);
-		let m = new Set(t);
-		for (let e of d) m.add(e);
-		m.add(c), await this.getItemPropertiesBatch(e, m);
-		let ee = await this.getItemProperty(e, c) ?? {
-			id: c,
+			t !== null && d.add(t);
+			for (let t of b_(e.RelatedObjects)) f.add(t);
+		}
+		let p = await this.getTypePropertySetIDsByElement(e);
+		for (let [e, t] of p) f.add(e), t.forEach((e) => d.add(e));
+		let m = await this.getItemPropertiesBatch(e, d), ee = /* @__PURE__ */ new Set();
+		for (let e of m.values()) if (e) {
+			for (let t of b_(e.HasProperties)) ee.add(t);
+			for (let t of b_(e.Quantities)) ee.add(t);
+		}
+		await this.getItemPropertiesBatch(e, ee);
+		let te = /* @__PURE__ */ new Map(), ne = (t) => {
+			let n = te.get(t);
+			return n || (n = this.createPropertySet(e, t), te.set(t, n)), n;
+		}, re = /* @__PURE__ */ new Map();
+		for (let [e, t] of p) {
+			let n = [];
+			for (let e of t) n = this.mergePropertySet(n, await ne(e));
+			re.set(e, n);
+		}
+		let h = new Set(t);
+		for (let e of f) h.add(e);
+		h.add(l), await this.getItemPropertiesBatch(e, h);
+		let ie = await this.getItemProperty(e, l) ?? {
+			id: l,
 			props: {},
 			sets: []
 		};
-		ee.sets = [], s[c] = ee;
-		let te = 0;
+		ie.sets = [], c[l] = ie;
+		let ae = 0;
 		for (let t of i) {
 			let r = await this.getItemProperty(e, t);
 			if (r) {
 				let t = y_(r.RelatingPropertyDefinition);
 				if (t === null) continue;
-				let n = await this.getPropertySetData(e, t), i = {
-					id: t,
-					guid: "null",
-					name: "null",
-					props: [],
-					isQuantities: !1
-				};
-				n && (n.HasProperties || n.Quantities) && (i = {
-					id: t,
-					guid: this.getStringValue(n.GlobalId) ?? "null",
-					name: this.getStringValue(n.Name) ?? "null",
-					props: n.HasProperties ? n.HasProperties : n.Quantities ? n.Quantities : [],
-					isQuantities: !!n.Quantities
-				});
-				let a = b_(r.RelatedObjects);
-				for (let t of a) if (s[t]) s[t].sets ??= [], s[t].sets.push(i);
+				let n = await ne(t), i = b_(r.RelatedObjects);
+				for (let t of i) if (c[t]) c[t].sets ??= [], c[t].sets = this.mergePropertySet(c[t].sets, n);
 				else {
-					let n = await this.getItemProperty(e, t);
-					if (n) {
-						let e = this.getStringValue(n.GlobalId), r = n.Name, a = n.ObjectType, o = n.LongName, c = this.getStringValue(n.type), l = {
-							name: r,
+					let r = await this.getItemProperty(e, t);
+					if (r) {
+						let e = this.getStringValue(r.GlobalId), i = r.Name, a = r.ObjectType, o = r.LongName, l = this.getStringValue(r.type), u = {
+							Material: s.get(t),
+							PredefinedType: r.PredefinedType,
+							name: i,
 							typeName: a,
 							longName: o,
-							type: c,
+							type: l,
 							elevation: void 0
 						};
-						s[t] = {
+						c[t] = {
 							id: t,
 							guid: e,
-							props: l,
-							sets: [i]
-						}, c === "IfcBuildingStorey" && (l.elevation = n.Elevation);
-					} else s[t] = {
+							props: u,
+							sets: this.mergePropertySet(re.get(t) ?? [], n)
+						}, l === "IfcBuildingStorey" && (u.elevation = r.Elevation);
+					} else c[t] = {
 						id: t,
 						guid: "null",
 						props: {
+							Material: s.get(t),
+							PredefinedType: "null",
 							name: "null",
 							typeName: "null",
 							longName: "null",
 							type: "null",
 							elevation: void 0
 						},
-						sets: [i]
+						sets: this.mergePropertySet(re.get(t) ?? [], n)
 					};
 				}
 			}
-			te += 1, this.shouldEmitProgress(te, a) && n?.({
-				loaded: te,
+			ae += 1, this.shouldEmitProgress(ae, a) && n?.({
+				loaded: ae,
 				phase: "propertySets",
 				total: a
 			});
 		}
-		let ne = 0, re = /* @__PURE__ */ new Set(), h = (e) => {
-			if (re.has(e)) return;
-			let t = s[e];
-			t && (re.add(e), r?.({
+		let oe = 0, se = /* @__PURE__ */ new Set(), ce = (e) => {
+			if (se.has(e)) return;
+			let t = c[e];
+			t && (se.add(e), r?.({
 				elementID: e,
 				props: t
 			}));
 		};
-		Object.keys(s).forEach((e) => {
+		Object.keys(c).forEach((e) => {
 			let t = Number(e);
-			Number.isFinite(t) && h(t);
+			Number.isFinite(t) && ce(t);
 		});
 		for (let r of t) {
-			if (s[r]) {
-				h(r), ne += 1, this.shouldEmitProgress(ne, o) && n?.({
-					loaded: ne,
+			if (c[r]) {
+				ce(r), oe += 1, this.shouldEmitProgress(oe, o) && n?.({
+					loaded: oe,
 					phase: "elements",
 					total: o
 				});
 				continue;
 			}
 			let t = await this.getItemProperty(e, r);
-			t ? s[r] = {
-				id: r,
-				guid: this.getStringValue(t.GlobalId),
-				props: {
-					name: t.Name,
-					typeName: t.ObjectType,
-					longName: t.LongName,
-					type: this.getStringValue(t.type),
-					elevation: void 0
-				},
-				sets: []
-			} : s[r] = {
+			if (t) {
+				let e = this.getStringValue(t.GlobalId), n = t.Name, i = t.ObjectType, a = t.LongName, o = this.getStringValue(t.type);
+				c[r] = {
+					id: r,
+					guid: e,
+					props: {
+						Material: s.get(r),
+						PredefinedType: t.PredefinedType,
+						name: n,
+						typeName: i,
+						longName: a,
+						type: o,
+						elevation: void 0
+					},
+					sets: [...re.get(r) ?? []]
+				};
+			} else c[r] = {
 				id: r,
 				guid: "null",
 				props: {
+					Material: s.get(r),
+					PredefinedType: "null",
 					name: "null",
 					typeName: "null",
 					longName: "null",
 					type: "null",
 					elevation: void 0
 				},
-				sets: []
-			}, h(r), ne += 1, this.shouldEmitProgress(ne, o) && n?.({
-				loaded: ne,
+				sets: [...re.get(r) ?? []]
+			};
+			ce(r), oe += 1, this.shouldEmitProgress(oe, o) && n?.({
+				loaded: oe,
 				phase: "elements",
 				total: o
 			});
 		}
-		return s;
+		return c;
 	}
 	async getItemProperty(e, t, n = !1) {
 		let r = this.getItemPropertyCacheKey(e, t, n), i = this.itemPropertyCache.get(r);
@@ -191618,6 +191627,145 @@ var x_ = class {
 		for (let e = 0; e < r; e++) n.add(t.get(e));
 		return n;
 	}
+	async getTypePropertySetIDsByElement(e) {
+		let t = this.parser.GetLineIDsWithType(e, M), n = [];
+		for (let e = 0; e < t.size(); e += 1) n.push(t.get(e));
+		let r = await this.getItemPropertiesBatch(e, n), i = /* @__PURE__ */ new Set();
+		for (let e of r.values()) {
+			if (!e) continue;
+			let t = y_(e.RelatingType);
+			t !== null && i.add(t);
+		}
+		let a = await this.getItemPropertiesBatch(e, i), o = /* @__PURE__ */ new Map();
+		for (let e of r.values()) {
+			if (!e) continue;
+			let t = y_(e.RelatingType);
+			if (t === null) continue;
+			let n = a.get(t);
+			if (!n) continue;
+			let r = b_(n.HasPropertySets);
+			if (r.length !== 0) for (let t of b_(e.RelatedObjects)) o.set(t, r);
+		}
+		return o;
+	}
+	async createPropertySet(e, t) {
+		let n = await this.getPropertySetData(e, t);
+		return !n || !n.HasProperties && !n.Quantities ? {
+			id: t,
+			guid: "null",
+			name: "null",
+			props: [],
+			isQuantities: !1
+		} : {
+			id: t,
+			guid: this.getStringValue(n.GlobalId) ?? "null",
+			name: this.getStringValue(n.Name) ?? "null",
+			props: n.HasProperties ?? n.Quantities ?? [],
+			isQuantities: !!n.Quantities
+		};
+	}
+	mergePropertySet(e, t) {
+		let n = this.getPropertySetMergeName(t);
+		if (!n) return [...e, t];
+		let r = e.findIndex((e) => this.getPropertySetMergeName(e) === n);
+		if (r === -1) return [...e, t];
+		let i = e[r], a = [...e];
+		return a[r] = {
+			...i,
+			...t,
+			props: this.mergePropertySetProps(i.props, t.props)
+		}, a;
+	}
+	getPropertySetMergeName(e) {
+		let t = this.getStringValue(e.name)?.trim();
+		return t && t !== "null" ? t : void 0;
+	}
+	mergePropertySetProps(e, t) {
+		if (Array.isArray(e) && Array.isArray(t)) {
+			let n = [...e], r = /* @__PURE__ */ new Map();
+			return n.forEach((e, t) => {
+				let n = this.getPropertyMergeName(e);
+				n && r.set(n, t);
+			}), t.forEach((e) => {
+				let t = this.getPropertyMergeName(e), i = t ? r.get(t) : void 0;
+				i === void 0 ? (t && r.set(t, n.length), n.push(e)) : n[i] = e;
+			}), n;
+		}
+		return e && t && typeof e == "object" && typeof t == "object" && !Array.isArray(e) && !Array.isArray(t) ? {
+			...e,
+			...t
+		} : t ?? e;
+	}
+	getPropertyMergeName(e) {
+		if (!e || typeof e != "object" || Array.isArray(e)) return;
+		let t = e;
+		return this.getStringValue(t.Name ?? t.name)?.trim() || void 0;
+	}
+	async getMaterialsByElement(e) {
+		let t = this.parser.GetLineIDsWithType(e, id), n = [];
+		for (let e = 0; e < t.size(); e += 1) n.push(t.get(e));
+		let r = await this.getItemPropertiesBatch(e, n), i = /* @__PURE__ */ new Set();
+		for (let e of r.values()) {
+			if (!e) continue;
+			let t = y_(e.RelatingMaterial);
+			t !== null && i.add(t);
+		}
+		let a = await this.getItemPropertiesBatch(e, i, !0), o = /* @__PURE__ */ new Map();
+		for (let e of r.values()) {
+			if (!e) continue;
+			let t = y_(e.RelatingMaterial);
+			if (t === null) continue;
+			let n = a.get(t);
+			if (!n) continue;
+			let r = this.getMaterialNames(n);
+			if (r.length !== 0) for (let t of b_(e.RelatedObjects)) {
+				let e = o.get(t) ?? /* @__PURE__ */ new Set();
+				r.forEach((t) => e.add(t)), o.set(t, e);
+			}
+		}
+		let s = this.parser.GetLineIDsWithType(e, M), c = [];
+		for (let e = 0; e < s.size(); e += 1) c.push(s.get(e));
+		let l = await this.getItemPropertiesBatch(e, c);
+		for (let e of l.values()) {
+			if (!e) continue;
+			let t = y_(e.RelatingType);
+			if (t === null) continue;
+			let n = o.get(t);
+			if (n) for (let t of b_(e.RelatedObjects)) {
+				let e = o.get(t) ?? /* @__PURE__ */ new Set();
+				n.forEach((t) => e.add(t)), o.set(t, e);
+			}
+		}
+		let u = /* @__PURE__ */ new Map();
+		return o.forEach((e, t) => {
+			let n = [...e];
+			u.set(t, n.length === 1 ? n[0] : n);
+		}), u;
+	}
+	getMaterialNames(e) {
+		let t = /* @__PURE__ */ new Set(), n = /* @__PURE__ */ new Set(), r = (e) => {
+			if (!e || typeof e != "object" || n.has(e)) return;
+			if (n.add(e), Array.isArray(e)) {
+				e.forEach(r);
+				return;
+			}
+			if (v_(e)) {
+				r(e.value);
+				return;
+			}
+			let i = e, a = v_(i.type) ? i.type.value : i.type;
+			if (a === 1838606355 || typeof a == "string" && a.replace(/[^a-z0-9]/gi, "").toUpperCase() === "IFCMATERIAL") {
+				let e = this.getStringValue(i.Name);
+				e && t.add(e);
+			}
+			Object.values(i).forEach(r);
+		};
+		if (r(e), t.size === 0) {
+			let n = this.getStringValue(e.Name) ?? this.getStringValue(e.LayerSetName);
+			n && t.add(n);
+		}
+		return [...t];
+	}
 	async getSpatialStructure(e, t = !1) {
 		let n = await this.getSpatialTreeChunks(e), r = await this.getSpatialLineMap(e, n), i = this.getProjectID(e);
 		if (i === void 0) return {

package/lib/Loaders/IFCLoader/PropertySerializer.d.ts

@@ -10,14 +10,17 @@ type IfcLineData = Record<string, IfcRawValue> & {
     expressID?: number;
     Elevation?: BmtPropertyValue;
     GlobalId?: BmtPropertyValue;
+    HasPropertySets?: IfcRawValue[];
     HasProperties?: BmtPropertyRecord[];
     HasQuantities?: IfcRawValue[];
     LongName?: BmtPropertyValue;
     Name?: BmtPropertyValue;
     ObjectType?: BmtPropertyValue;
+    PredefinedType?: BmtPropertyValue;
     Quantities?: BmtPropertyRecord[];
     RelatedObjects?: number[];
     RelatingPropertyDefinition?: number;
+    RelatingType?: number;
     type?: number | string;
 };
 type PropertyRelationConfig = {
@@ -68,6 +71,14 @@ export declare class PropertySerializer {
     getElementsAssembly(modelID: number): Promise<IfcElementsAssembly>;
     private formatItemProperties;
     private getAllRelDefinesByProps;
+    private getTypePropertySetIDsByElement;
+    private createPropertySet;
+    private mergePropertySet;
+    private getPropertySetMergeName;
+    private mergePropertySetProps;
+    private getPropertyMergeName;
+    private getMaterialsByElement;
+    private getMaterialNames;
     getSpatialStructure(modelID: number, includeProperties?: boolean): Promise<BmtModelStructureNode>;
     getRelatedProperties(modelID: number, elementID: number, propsName: PropertyRelationConfig, recursive?: boolean): Promise<IfcLineData[]>;
     getChunks(modelID: number, chunks: SpatialTreeChunks, propNames: PropertyRelationConfig): Promise<void>;