Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-08-13 10:57:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revise the modern COBie 2.4 implementation to also allow PointOfContact/WarrantyPeriod

Browse Source 
Legacy COBie 2.4 allowed this but not sure why it dropped off.
This commit is contained in:
Dion Moult
2025-02-10 17:26:51 +11:00
parent 1d2214efd9
commit 11c6b55f7c
2 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcfm/ifcfm/cobie24.py
+16 -7
View File
@@ -486,12 +486,11 @@ def get_type_data(ifc_file: ifcopenshell.file, element: ifcopenshell.entity_inst
sustainability_performance = None
for pset_name, props in ifcopenshell.util.element.get_psets(element).items():
pset_warranty_type = None
if pset_name == "COBie_Warranty":
warranty_guarantor_parts = props.get("WarrantyGuarantorParts", None)
warranty_guarantor_labor = props.get("WarrantyGuarantorLabor", None)
warranty_duration_parts = props.get("WarrantyDurationParts", None)
warranty_duration_labor = props.get("WarrantyDurationLabor", None)
warranty_guarantor_parts = warranty_guarantor_parts or props.get("WarrantyGuarantorParts", None)
warranty_guarantor_labor = warranty_guarantor_labor or props.get("WarrantyGuarantorLabor", None)
warranty_duration_parts = warranty_duration_parts or props.get("WarrantyDurationParts", None)
warranty_duration_labor = warranty_duration_labor or props.get("WarrantyDurationLabor", None)
warranty_duration_unit = props.get("WarrantyDurationUnit", None)
warranty_description = props.get("WarrantyDescription", None)
elif pset_name == "COBie_Asset":
@@ -522,6 +521,18 @@ def get_type_data(ifc_file: ifcopenshell.file, element: ifcopenshell.entity_inst
manufacturer = props.get("Manufacturer", None)
model_number = props.get("ModelLabel", None)
model_reference = props.get("ModelReference", None)
elif pset_name == "Pset_Warranty":
# The legacy COBie 2.4 relied on WarrantyIdentifier. This is almost
# certainly a mistake since you can only have a single property set
# of the same name, so it's not possible to have two psets
# targeting both parts and labor. In the new version, we do away
# with this, assuming the user either specifically targets
# COBie_Waranty, or if they use the built-in Pset_Warranty, we
# assume it affects both type sof warranty.
warranty_guarantor_parts = warranty_guarantor_parts or props.get("PointOfContact", None)
warranty_guarantor_labor = warranty_guarantor_labor or props.get("PointOfContact", None)
warranty_duration_parts = warranty_duration_parts or props.get("WarrantyPeriod", None)
warranty_duration_labor = warranty_duration_labor or props.get("WarrantyPeriod", None)
return {
"Name": val(element.Name),
@@ -565,8 +576,6 @@ def get_type_data(ifc_file: ifcopenshell.file, element: ifcopenshell.entity_inst
def get_component_data(ifc_file: ifcopenshell.file, element: ifcopenshell.entity_instance) -> dict[str, Any]:
space = ifcopenshell.util.element.get_container(element)
space_name = space.Name if space.is_a("IfcSpace") else None
systems = ifcopenshell.util.system.get_element_systems(element)
system = systems[0].Name if systems else None
type_name = None
relating_type = ifcopenshell.util.element.get_type(element)
src/ifcfm/ifcfm/cobie24legacy.py
+2 -4
View File
@@ -571,7 +571,7 @@ def get_type_data(ifc_file: ifcopenshell.file, element: ifcopenshell.entity_inst
if pset_warranty_type == "parts" and val(value):
if name == "PointOfContact":
# https://github.com/buildingSMART/IFC4.3.x-development/issues/698
warranty_guarantor_parts = str(value)
pset_metadata["warranty_guarantor_parts"] = str(value)
elif name == "WarrantyPeriod":
warranty_duration_parts = str(value)
unit = get_property_unit(pset, name)
@@ -579,7 +579,7 @@ def get_type_data(ifc_file: ifcopenshell.file, element: ifcopenshell.entity_inst
elif pset_warranty_type == "labor" and val(value):
if name == "PointOfContact":
# https://github.com/buildingSMART/IFC4.3.x-development/issues/698
warranty_guarantor_labor = str(value)
pset_metadata["warranty_guarantor_labor"] = str(value)
elif name == "WarrantyPeriod":
warranty_duration_labor = str(value)
unit = get_property_unit(pset, name)
@@ -635,8 +635,6 @@ def get_type_data(ifc_file: ifcopenshell.file, element: ifcopenshell.entity_inst
def get_component_data(ifc_file: ifcopenshell.file, element: ifcopenshell.entity_instance) -> dict[str, Any]:
space = ifcopenshell.util.element.get_container(element)
space_name = space.Name if space.is_a("IfcSpace") else None
systems = ifcopenshell.util.system.get_element_systems(element)
system = systems[0].Name if systems else None
type_name = None
relating_type = ifcopenshell.util.element.get_type(element)