mirror of
https://github.com/IfcOpenShell/IfcOpenShell.git
synced 2026-08-10 01:41:57 +00:00
Fix failing tests from refactor which I really should've done before the release
This commit is contained in:
@@ -55,9 +55,7 @@ class Usecase:
|
||||
ifcopenshell.api.run("spatial.remove_container", model, product=wall)
|
||||
"""
|
||||
self.file = file
|
||||
self.settings = {"product": None}
|
||||
for key, value in settings.items():
|
||||
self.settings[key] = value
|
||||
self.settings = {"product": product}
|
||||
|
||||
def execute(self):
|
||||
contained_in_structure = self.settings["product"].ContainedInStructure
|
||||
|
||||
@@ -18,34 +18,7 @@
|
||||
|
||||
import ifcopenshell
|
||||
import ifcopenshell.api
|
||||
|
||||
|
||||
ASSIGNABLE_DICT = {
|
||||
"IfcZone": ("IfcZone", "IfcSpace", "IfcSpatialZone"),
|
||||
"IfcBuiltSystem": (
|
||||
"IfcBuiltElement",
|
||||
"IfcFurnishingElement",
|
||||
"IfcElementAssembly",
|
||||
"IfcTransportElement",
|
||||
),
|
||||
"IfcBuildingSystem": (
|
||||
"IfcBuildingElement",
|
||||
"IfcFurnishingElement",
|
||||
"IfcElementAssembly",
|
||||
"IfcTransportElement",
|
||||
),
|
||||
"IfcDistributionSystem": ("IfcDistributionElement",),
|
||||
"IfcStructuralAnalysisModel": ("IfcStructuralMember", "IfcStructuralConnection"),
|
||||
"IfcSystem": ("IfcProduct",),
|
||||
"IfcGroup": ("IfcObjectDefinition",),
|
||||
}
|
||||
|
||||
|
||||
def is_assignable(product, system) -> bool:
|
||||
for assignable in ASSIGNABLE_DICT.get(system.is_a(), ()):
|
||||
if product.is_a(assignable):
|
||||
return True
|
||||
return False
|
||||
import ifcopenshell.util.system
|
||||
|
||||
|
||||
class Usecase:
|
||||
@@ -82,7 +55,7 @@ class Usecase:
|
||||
def execute(self):
|
||||
system = self.settings["system"]
|
||||
product = self.settings["product"]
|
||||
if not is_assignable(product, system):
|
||||
if not ifcopenshell.util.system.is_assignable(product, system):
|
||||
raise TypeError(f"You cannot assign an {product.is_a()} to an {system.is_a()}")
|
||||
|
||||
if not self.settings["system"].IsGroupedBy:
|
||||
|
||||
Reference in New Issue
Block a user