@thatopen/components 2.4.3 → 2.4.5

package/dist/core/Components/index.d.ts

@@ -6,7 +6,7 @@ export declare class Components implements Disposable {
     /**
      * The version of the @thatopen/components library.
      */
-    static readonly release = "2.4.3";
+    static readonly release = "2.4.5";
     /** {@link Disposable.onDisposed} */
     readonly onDisposed: Event<void>;
     /**

package/dist/ifc/IfcPropertiesManager/index.d.ts

@@ -284,6 +284,6 @@ export declare class IfcPropertiesManager extends Component implements Disposabl
         handle: WEBIFC.Handle<unknown>;
     }>;
     registerChange(model: FragmentsGroup, ...expressID: number[]): void;
-    private newSingleProperty;
+    newSingleProperty(model: FragmentsGroup, type: string, name: string, value: string | number | boolean): Promise<WEBIFC.IFC4.IfcPropertySingleValue | WEBIFC.IFC2X3.IfcPropertySingleValue | WEBIFC.IFC4X3.IfcPropertySingleValue>;
 }
 export * from "./src";

package/dist/index.cjs

@@ -6312,7 +6312,7 @@ const _Components = class _Components {
 /**
  * The version of the @thatopen/components library.
  */
-__publicField(_Components, "release", "2.4.3");
+__publicField(_Components, "release", "2.4.5");
 let Components = _Components;
 class SimpleWorld extends Base {
   constructor() {
@@ -12775,6 +12775,9 @@ class ProjectionManager {
   setupOrthoCamera(height, width) {
     this._component.controls.mouseButtons.wheel = CameraControls.ACTION.ZOOM;
     this._component.controls.mouseButtons.middle = CameraControls.ACTION.ZOOM;
+    this._component.controls.touches.two = CameraControls.ACTION.TOUCH_ZOOM_TRUCK;
+    this._component.controls.touches.three = CameraControls.ACTION.TOUCH_ZOOM_TRUCK;
+    this._component.controls.dollySpeed = 5;
     const pCamera = this._component.threePersp;
     const oCamera = this._component.threeOrtho;
     oCamera.zoom = 1;
@@ -12801,6 +12804,9 @@ class ProjectionManager {
     pCamera.position.copy(oCamera.position);
     pCamera.quaternion.copy(oCamera.quaternion);
     this._component.controls.mouseButtons.wheel = CameraControls.ACTION.DOLLY;
+    this._component.controls.touches.two = CameraControls.ACTION.TOUCH_DOLLY_TRUCK;
+    this._component.controls.touches.three = CameraControls.ACTION.TOUCH_DOLLY_TRUCK;
+    this._component.controls.dollySpeed = 5;
     if (this.matchOrthoDistanceEnabled) {
       this._component.controls.distance = this.getDistance();
     } else {
@@ -21106,10 +21112,8 @@ function readDocType$1(xmlData, i) {
           i += 8;
         else if (hasBody && isNotation(xmlData, i))
           i += 9;
-        else if (isComment)
-          comment = true;
         else
-          throw new Error("Invalid DOCTYPE");
+          comment = true;
         angleBracketsCount++;
         exp = "";
       } else if (xmlData[i] === ">") {
@@ -21153,11 +21157,6 @@ function readEntityExp(xmlData, i) {
   }
   return [entityName2, val2, i];
 }
-function isComment(xmlData, i) {
-  if (xmlData[i + 1] === "!" && xmlData[i + 2] === "-" && xmlData[i + 3] === "-")
-    return true;
-  return false;
-}
 function isEntity(xmlData, i) {
   if (xmlData[i + 1] === "!" && xmlData[i + 2] === "E" && xmlData[i + 3] === "N" && xmlData[i + 4] === "T" && xmlData[i + 5] === "I" && xmlData[i + 6] === "T" && xmlData[i + 7] === "Y")
     return true;
@@ -23198,7 +23197,7 @@ ${users}
       Comment: CommentText,
       Viewpoint: Viewpoint2
     } = markupComment;
-    if (!(Guid && CommentDate && Author && (Comment || Viewpoint2)))
+    if (!(Guid && CommentDate && Author && Comment))
       return null;
     const viewpoints = this.components.get(Viewpoints);
     const comment = new Comment(this.components, CommentText ?? "");
@@ -26760,7 +26759,7 @@ class MiniMap {
     this._camera.left = frustumSize * aspect / -2;
     this._camera.right = frustumSize * aspect / 2;
     this._camera.top = frustumSize / 2;
-    this._camera.bottom = -frustumSize / 2;
+    this._camera.bottom = -1 / 2;
     this._camera.updateProjectionMatrix();
     this.onResize.trigger(size);
   }
@@ -27248,10 +27247,10 @@ class IDSFacet {
         let minPass = true;
         let maxPass = true;
         if (min !== void 0) {
-          minPass = minInclusive ? value <= min : value < min;
+          minPass = minInclusive ? value >= min : value > min;
         }
         if (max !== void 0) {
-          maxPass = maxInclusive ? value >= max : value > max;
+          maxPass = maxInclusive ? value <= max : value < max;
         }
         pass = minPass && maxPass;
       }
@@ -27294,12 +27293,12 @@ const getParameterXML = (name, parameter) => {
   if (!parameter)
     return parameterXML;
   if (parameter.type === "simple") {
-    parameterXML = `<ids:simpleValue>${parameter.parameter}</ids:simpleValue>`;
+    parameterXML = `<simpleValue>${parameter.parameter}</simpleValue>`;
   }
   if (parameter.type === "enumeration") {
     const value = parameter.parameter;
     parameterXML = `<xs:restriction base="xs:string">
-    ${value.map((v) => `<xs:enumeration value="${v}" />`).join("\r\n")}
+    ${value.map((v) => `<xs:enumeration value="${v}" />`).join("\n")}
     </xs:restriction>`;
   }
   if (parameter.type === "pattern") {
@@ -27308,9 +27307,44 @@ const getParameterXML = (name, parameter) => {
       <xs:pattern value="${value}" />
     </xs:restriction>`;
   }
-  const xml = `<ids:${name[0].toLowerCase() + name.slice(1)}>
+  if (parameter.type === "bounds") {
+    const { min, minInclusive, max, maxInclusive } = parameter.parameter;
+    let minTag = "";
+    if (min !== void 0) {
+      minTag = `<xs:min${minInclusive ? "Inclusive" : "Exclusive"} value="${min}">`;
+    }
+    let maxTag = "";
+    if (max !== void 0) {
+      maxTag = `<xs:max${maxInclusive ? "Inclusive" : "Exclusive"} value="${max}">`;
+    }
+    parameterXML = `<xs:restriction base="xs:double">
+      ${minTag}
+      ${maxTag}
+    </xs:restriction>`;
+  }
+  if (parameter.type === "length") {
+    const { length, min, max } = parameter.parameter;
+    let lengthTag = "";
+    if (length !== void 0 && min === void 0 && max === void 0) {
+      lengthTag = `<xs:length value="${length}" />`;
+    }
+    let minTag = "";
+    if (min !== void 0 && length === void 0) {
+      minTag = `<xs:minLength value="${min}" />`;
+    }
+    let maxTag = "";
+    if (max !== void 0 && length === void 0) {
+      maxTag = `<xs:maxLength value="${max}" />`;
+    }
+    parameterXML = `<xs:restriction base="xs:string">
+      ${lengthTag}
+      ${minTag}
+      ${maxTag}
+    </xs:restriction>`;
+  }
+  const xml = `<${name[0].toLowerCase() + name.slice(1)}>
     ${parameterXML}
-  </ids:${name[0].toLowerCase() + name.slice(1)}>`;
+  </${name[0].toLowerCase() + name.slice(1)}>`;
   return xml;
 };
 class IDSAttribute extends IDSFacet {
@@ -27329,10 +27363,10 @@ class IDSAttribute extends IDSFacet {
       attributes += `cardinality="${this.cardinality}"`;
       attributes += this.instructions ? `instructions="${this.instructions}"` : "";
     }
-    return `<ids:attribute ${attributes}>
+    return `<attribute ${attributes}>
   ${nameXML}
   ${valueXML}
-</ids:attribute>`;
+</attribute>`;
   }
   // This can be very ineficcient as we do not have an easy way to get an entity based on an attribute
   // Right now, all entities must be iterated.
@@ -27468,10 +27502,10 @@ class IDSClassification extends IDSFacet {
       attributes += this.uri ? `uri=${this.uri}` : "";
       attributes += this.instructions ? `instructions="${this.instructions}"` : "";
     }
-    return `<ids:classification ${attributes}>
+    return `<classification ${attributes}>
   ${systemXML}
   ${valueXML}
-</ids:classification>`;
+</classification>`;
   }
   async getEntities(model, collector = {}) {
     var _a;
@@ -27749,10 +27783,10 @@ class IDSEntity extends IDSFacet {
       attributes += `cardinality="${this.cardinality}"`;
       attributes += this.instructions ? `instructions="${this.instructions}"` : "";
     }
-    return `<ids:entity ${attributes}>
+    return `<entity ${attributes}>
   ${nameXML}
   ${predefinedTypeXML}
-</ids:entity>`;
+</entity>`;
   }
   // IFCSURFACESTYLEREFRACTION is not present in the FragmentsGroup
   // IFCSURFACESTYLERENDERING is not present in the FragmentsGroup
@@ -27890,11 +27924,11 @@ class IDSProperty extends IDSFacet {
       attributes += this.uri ? `uri=${this.uri}` : "";
       attributes += this.instructions ? `instructions="${this.instructions}"` : "";
     }
-    return `<ids:property ${dataTypeXML} ${attributes}>
+    return `<property ${dataTypeXML} ${attributes}>
   ${propertySetXML}
   ${baseNameXML}
   ${valueXML}
-</ids:property>`;
+</property>`;
   }
   async getEntities(model, collector = {}) {
     var _a, _b;
@@ -27976,16 +28010,15 @@ class IDSProperty extends IDSFacet {
       this.testResult.push(result2);
       const sets = await this.getPsets(model, expressID);
       const matchingSets = sets.filter((set) => {
-        var _a2;
         const result3 = this.evalRequirement(
-          ((_a2 = set.Name) == null ? void 0 : _a2.value) ?? null,
+          set.Name ?? null,
           this.propertySet,
           "PropertySet"
         );
         if (!result3)
           return false;
         checks.push({
-          currentValue: set.Name.value,
+          currentValue: set.Name,
           parameter: "PropertySet",
           pass: true,
           requiredValue: this.propertySet.parameter
@@ -28002,8 +28035,7 @@ class IDSProperty extends IDSFacet {
         continue;
       }
       for (const set of matchingSets) {
-        const itemsAttrName = this.getItemsAttrName(set.type);
-        if (!itemsAttrName) {
+        if (!("Properties" in set)) {
           checks.push({
             currentValue: null,
             parameter: "BaseName",
@@ -28012,7 +28044,7 @@ class IDSProperty extends IDSFacet {
           });
           continue;
         }
-        const items = set[itemsAttrName];
+        const items = set.Properties;
         const matchingItems = items.filter((item) => {
           var _a2;
           if (this._unsupportedTypes.includes(item.type)) {
@@ -28067,18 +28099,22 @@ class IDSProperty extends IDSFacet {
       (name) => name.endsWith("Value") || name.endsWith("Values")
     );
   }
-  async getPsetProps(model, attrs, propsListName) {
-    const attrsClone = structuredClone(attrs);
+  async simplifyPset(model, attrs, propsListName) {
+    var _a;
     const props = [];
-    const list = attrsClone[propsListName];
+    const list = attrs[propsListName];
     if (!list)
-      return props;
+      return attrs;
     for (const { value } of list) {
       const propAttrs = await model.getProperties(value);
       if (propAttrs)
         props.push(propAttrs);
     }
-    attrsClone[propsListName] = props;
+    const attrsClone = {
+      Name: (_a = attrs.Name) == null ? void 0 : _a.value,
+      Properties: props,
+      type: attrs.type
+    };
     return attrsClone;
   }
   async getTypePsets(model, expressID) {
@@ -28096,13 +28132,14 @@ class IDSProperty extends IDSFacet {
       if (!(psetAttrs && "HasProperties" in psetAttrs && Array.isArray(psetAttrs.HasProperties))) {
         continue;
       }
-      const pset = await this.getPsetProps(model, psetAttrs, "HasProperties");
+      const pset = await this.simplifyPset(model, psetAttrs, "HasProperties");
       sets.push(pset);
     }
     return sets;
   }
   async getPsets(model, expressID) {
-    const sets = await this.getTypePsets(model, expressID);
+    var _a;
+    const typePsets = await this.getTypePsets(model, expressID);
     const indexer = this.components.get(IfcRelationsIndexer);
     const definitions = indexer.getEntityRelations(
       model,
@@ -28110,7 +28147,8 @@ class IDSProperty extends IDSFacet {
       "IsDefinedBy"
     );
     if (!definitions)
-      return sets;
+      return typePsets;
+    const sets = [];
     for (const definitionID of definitions) {
       const attrs = await model.getProperties(definitionID);
       if (!attrs)
@@ -28118,8 +28156,25 @@ class IDSProperty extends IDSFacet {
       const propsListName = this.getItemsAttrName(attrs.type);
       if (!propsListName)
         continue;
-      const pset = await this.getPsetProps(model, attrs, propsListName);
-      sets.push(pset);
+      const occurencePset = await this.simplifyPset(
+        model,
+        attrs,
+        propsListName
+      );
+      const typePset = typePsets.find(
+        ({ Name }) => Name === occurencePset.Name
+      );
+      if (typePset) {
+        for (const prop of typePset.Properties) {
+          const name = (_a = prop.Name) == null ? void 0 : _a.value;
+          const existingProp = occurencePset.Properties.find(
+            ({ Name }) => Name.value === name
+          );
+          if (!existingProp)
+            occurencePset.Properties.push(prop);
+        }
+      }
+      sets.push(occurencePset);
     }
     return sets;
   }
@@ -28292,14 +28347,14 @@ class IDSSpecification {
     const identifier = this.identifier ? `identifier="${this.identifier}"` : "";
     const description = this.description ? `description="${this.description}"` : "";
     const instructions = this.instructions ? `instructions="${this.instructions}"` : "";
-    const xml = `<ids:specification ifcVersion="${[...this.ifcVersion].join(" ")}" ${name} ${identifier} ${description} ${instructions}>
-      <ids:applicability minOccurs="1" maxOccurs="unbounded">
-        ${[...this.applicability].map((facet) => facet.serialize("applicability"))}
-      </ids:applicability>
-      <ids:requirements>
-        ${[...this.requirements].map((facet) => facet.serialize("requirement"))}
-      </ids:requirements>
-    </ids:specification>`;
+    const xml = `<specification ifcVersion="${[...this.ifcVersion].join(" ")}" ${name} ${identifier} ${description} ${instructions}>
+      <applicability minOccurs="1" maxOccurs="unbounded">
+        ${[...this.applicability].map((facet) => facet.serialize("applicability")).join("\n")}
+      </applicability>
+      <requirements>
+        ${[...this.requirements].map((facet) => facet.serialize("requirement")).join("\n")}
+      </requirements>
+    </specification>`;
     return xml;
   }
 }
@@ -28548,22 +28603,22 @@ const _IDSSpecifications = class _IDSSpecifications extends Component {
    */
   export(info, specifications = this.list.values()) {
     const _specifications = specifications ?? this.list;
-    const xml = `<ids:ids xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://standards.buildingsmart.org/IDS http://standards.buildingsmart.org/IDS/1.0/ids.xsd" xmlns:ids="http://standards.buildingsmart.org/IDS">
+    const xml = `<ids xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://standards.buildingsmart.org/IDS http://standards.buildingsmart.org/IDS/1.0/ids.xsd" xmlns:ids="http://standards.buildingsmart.org/IDS">
   <!-- Made with That Open Engine ${Components.release} (https://github.com/thatopen/engine_components) -->
-  <ids:info>
-    <ids:title>${info.title}</ids:title>
-    ${info.copyright ? `<ids:copyright>${info.copyright}</ids:copyright>` : ""}
-    ${info.version ? `<ids:version>${info.version}</ids:version>` : ""}
-    ${info.description ? `<ids:description>${info.description}</ids:description>` : ""}
-    ${info.author ? `<ids:author>${info.author}</ids:author>` : ""}
-    ${info.date ? `<ids:date>${info.date.toISOString().split("T")[0]}</ids:date>` : ""}
-    ${info.purpose ? `<ids:purpose>${info.purpose}</ids:purpose>` : ""}
-    ${info.milestone ? `<ids:milestone>${info.milestone}</ids:milestone>` : ""}
-  </ids:info>
-  <ids:specifications>
+  <info>
+    <title>${info.title}</title>
+    ${info.copyright ? `<copyright>${info.copyright}</copyright>` : ""}
+    ${info.version ? `<version>${info.version}</version>` : ""}
+    ${info.description ? `<description>${info.description}</description>` : ""}
+    ${info.author ? `<author>${info.author}</author>` : ""}
+    ${info.date ? `<date>${info.date.toISOString().split("T")[0]}</date>` : ""}
+    ${info.purpose ? `<purpose>${info.purpose}</purpose>` : ""}
+    ${info.milestone ? `<milestone>${info.milestone}</milestone>` : ""}
+  </info>
+  <specifications>
     ${[..._specifications].map((spec) => spec.serialize()).join("\n")}
-  </ids:specifications>
-</ids:ids>`;
+  </specifications>
+</ids>`;
     return xml;
   }
 };