Minor fixes

This commit is contained in:
Dion Moult
2023-10-26 13:08:15 +11:00
parent 11eefab4fc
commit 682990a30d
2 changed files with 10 additions and 9 deletions
+1 -1
View File
@@ -313,7 +313,7 @@ class Geometry(blenderbim.core.tool.Geometry):
return ( return (
subcontext.ContextType, subcontext.ContextType,
subcontext.ContextIdentifier, subcontext.ContextIdentifier,
subcontext.TargetView, getattr(subcontext, "TargetView", None),
) )
@classmethod @classmethod
+9 -8
View File
@@ -282,20 +282,20 @@ def get_contact_data(ifc_file, element):
"CreatedOn": get_created_on(element), "CreatedOn": get_created_on(element),
"Category": ",".join(roles), "Category": ",".join(roles),
"Company": getattr(organization, "Name", None), "Company": getattr(organization, "Name", None),
"Phone": get_pao_address(person, organisation, "TelephoneNumbers"), "Phone": get_pao_address(person, organization, "TelephoneNumbers"),
"ExternalSystem": get_external_system(element), "ExternalSystem": get_external_system(element),
"ExternalObject": element.is_a(), "ExternalObject": element.is_a(),
"ExternalIdentifier": element.GlobalId, "ExternalIdentifier": element.GlobalId,
"Department": get_pao_address(person, organisation, "InternalLocation"), "Department": get_pao_address(person, organization, "InternalLocation"),
"OrganizationCode": getattr(organization, "Id", getattr(organization, "Identification", None)), "OrganizationCode": getattr(organization, "Id", getattr(organization, "Identification", None)),
"GivenName": getattr(person, "GivenName", None), "GivenName": getattr(person, "GivenName", None),
"FamilyName": getattr(person, "FamilyName", None), "FamilyName": getattr(person, "FamilyName", None),
"Street": get_pao_address(person, organisation, "AddressLines"), "Street": get_pao_address(person, organization, "AddressLines"),
"PostalBox": get_pao_address(person, organisation, "PostalBox"), "PostalBox": get_pao_address(person, organization, "PostalBox"),
"Town": get_pao_address(person, organisation, "Town"), "Town": get_pao_address(person, organization, "Town"),
"StateRegion": get_pao_address(person, organisation, "Region"), "StateRegion": get_pao_address(person, organization, "Region"),
"PostalCode": get_pao_address(person, organisation, "PostalCode"), "PostalCode": get_pao_address(person, organization, "PostalCode"),
"Country": get_pao_address(person, organisation, "Country"), "Country": get_pao_address(person, organization, "Country"),
} }
@@ -417,6 +417,7 @@ def get_space_data(ifc_file, element):
"ExternalSystem": get_external_system(element), "ExternalSystem": get_external_system(element),
"ExternalObject": element.is_a(), "ExternalObject": element.is_a(),
"ExternalIdentifier": element.GlobalId, "ExternalIdentifier": element.GlobalId,
# Stopped here
"RoomTag": room_tag, "RoomTag": room_tag,
"UsableHeight": usable_height, "UsableHeight": usable_height,
"GrossArea": gross_area, "GrossArea": gross_area,