From 19345ff5386f60fb6b3042e0611ea12492b7fd0a Mon Sep 17 00:00:00 2001 From: Andrej730 Date: Mon, 18 Sep 2023 12:07:19 +0500 Subject: [PATCH] Remove orphaned IfcPropertyEnumeration MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Noticed a couple hundreds of orphaned IfcPropertyEnumeration in my .ifc like below 😁 IFCPROPERTYENUMERATION('Status',(IFCLABEL('NEW'),IFCLABEL('EXISTING'),IFCLABEL('DEMOLISH'),IFCLABEL('TEMPORARY'),IFCLABEL('OTHER'),IFCLABEL('NOTKNOWN'),IFCLABEL('UNSET')),$); --- .../ifcopenshell/api/pset/remove_pset.py | 9 +++++-- .../test/api/pset/test_remove_pset.py | 24 +++++++++++++++++++ 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/src/ifcopenshell-python/ifcopenshell/api/pset/remove_pset.py b/src/ifcopenshell-python/ifcopenshell/api/pset/remove_pset.py index 322fb46356..44aa512ab3 100644 --- a/src/ifcopenshell-python/ifcopenshell/api/pset/remove_pset.py +++ b/src/ifcopenshell-python/ifcopenshell/api/pset/remove_pset.py @@ -65,8 +65,13 @@ class Usecase: elif self.settings["pset"].is_a() in ("IfcMaterialProperties", "IfcProfileProperties"): properties = self.settings["pset"].Properties or [] for prop in properties: - if self.file.get_total_inverses(prop) == 1: - self.file.remove(prop) + if self.file.get_total_inverses(prop) != 1: + continue + if prop.is_a("IfcPropertyEnumeratedValue"): + enumeration = prop.EnumerationReference + if self.file.get_total_inverses(enumeration) == 1: + self.file.remove(enumeration) + self.file.remove(prop) self.file.remove(self.settings["pset"]) for element in to_purge: self.file.remove(element) diff --git a/src/ifcopenshell-python/test/api/pset/test_remove_pset.py b/src/ifcopenshell-python/test/api/pset/test_remove_pset.py index 3ce8d0127e..1685f158e8 100644 --- a/src/ifcopenshell-python/test/api/pset/test_remove_pset.py +++ b/src/ifcopenshell-python/test/api/pset/test_remove_pset.py @@ -83,3 +83,27 @@ class TestRemovePset(test.bootstrap.IFC4): pset2.HasProperties = pset.HasProperties ifcopenshell.api.run("pset.remove_pset", self.file, product=element, pset=pset) assert pset2.HasProperties + + def test_removing_a_pset_with_enumeration(self): + element = ifcopenshell.api.run("root.create_entity", self.file, ifc_class="IfcWall") + pset = ifcopenshell.api.run("pset.add_pset", self.file, product=element, name="Pset_WallCommon") + ifcopenshell.api.run("pset.edit_pset", self.file, pset=pset, properties={"Status": ["NEW"]}) + ifcopenshell.api.run("pset.remove_pset", self.file, product=element, pset=pset) + assert len(self.file.by_type("IfcPropertyEnumeration")) == 0 + + def test_removing_a_pset_with_shared_enumeration(self): + element = ifcopenshell.api.run("root.create_entity", self.file, ifc_class="IfcWall") + pset = ifcopenshell.api.run("pset.add_pset", self.file, product=element, name="Pset_WallCommon") + ifcopenshell.api.run("pset.edit_pset", self.file, pset=pset, properties={"Status": ["NEW"]}) + + element2 = ifcopenshell.api.run("root.create_entity", self.file, ifc_class="IfcWall") + pset2 = ifcopenshell.api.run("pset.add_pset", self.file, product=element2, name="Pset_WallCommon") + ifcopenshell.api.run("pset.edit_pset", self.file, pset=pset2, properties={"Status": ["NEW"]}) + + enumeration1 = pset.HasProperties[0].EnumerationReference + enumeration2 = pset2.HasProperties[0].EnumerationReference + pset2.HasProperties[0].EnumerationReference = enumeration1 + self.file.remove(enumeration2) + + ifcopenshell.api.run("pset.remove_pset", self.file, product=element, pset=pset) + assert len(self.file.by_type("IfcPropertyEnumeration")) == 1