aothms
commented
2 years ago --- tmp/a/IFC.exp 2022-02-13 13:27:47.060651800 +0100
+++ tmp/b/IFC.exp 2022-02-16 14:01:00.583031300 +0100
@@ -763,44 +763,42 @@
TYPE IfcBuildingElementPartTypeEnum = ENUMERATION OF
(APRON
,ARMOURUNIT
,INSULATION
,NOTDEFINED
,PRECASTPANEL
,SAFETYCAGE
,USERDEFINED);
END_TYPE;
-TYPE IfcBuildingElementProxyTypeEnum = ENUMERATION OF
- (COMPLEX
- ,ELEMENT
- ,NOTDEFINED
- ,PARTIAL
- ,PROVISIONFORSPACE
- ,PROVISIONFORVOID
- ,USERDEFINED);
-END_TYPE;
-
TYPE IfcBuildingSystemTypeEnum = ENUMERATION OF
(EROSIONPREVENTION
,FENESTRATION
,FOUNDATION
,LOADBEARING
,NOTDEFINED
,OUTERSHELL
,PRESTRESSING
,REINFORCING
,SHADING
,TRANSPORT
,USERDEFINED);
END_TYPE;
+TYPE IfcBuiltElementProxyTypeEnum = ENUMERATION OF
+ (COMPLEX
+ ,ELEMENT
+ ,NOTDEFINED
+ ,PARTIAL
+ ,USERDEFINED);
+END_TYPE;
+
TYPE IfcBuiltSystemTypeEnum = ENUMERATION OF
(EROSIONPREVENTION
,FENESTRATION
,FOUNDATION
,LOADBEARING
,MOORING
,NOTDEFINED
,OUTERSHELL
,PRESTRESSING
,REINFORCING
@@ -4542,60 +4540,40 @@
END_ENTITY;
ENTITY IfcBuildingElementPartType
SUBTYPE OF (IfcElementComponentType);
PredefinedType : IfcBuildingElementPartTypeEnum;
WHERE
CorrectPredefinedType : (PredefinedType <> IfcBuildingElementPartTypeEnum.USERDEFINED) OR
((PredefinedType = IfcBuildingElementPartTypeEnum.USERDEFINED) AND EXISTS(SELF\IfcElementType.ElementType));
END_ENTITY;
-ENTITY IfcBuildingElementProxy
- SUBTYPE OF (IfcBuiltElement);
- PredefinedType : OPTIONAL IfcBuildingElementProxyTypeEnum;
- WHERE
- HasObjectName : EXISTS(SELF\IfcRoot.Name);
- CorrectPredefinedType : NOT(EXISTS(PredefinedType)) OR
- (PredefinedType <> IfcBuildingElementProxyTypeEnum.USERDEFINED) OR
- ((PredefinedType = IfcBuildingElementProxyTypeEnum.USERDEFINED) AND EXISTS (SELF\IfcObject.ObjectType));
- CorrectTypeAssigned : (SIZEOF(IsTypedBy) = 0) OR
- ('IFC4X3_DEV.IFCBUILDINGELEMENTPROXYTYPE' IN TYPEOF(SELF\IfcObject.IsTypedBy[1].RelatingType));
-END_ENTITY;
-
-ENTITY IfcBuildingElementProxyType
- SUBTYPE OF (IfcBuiltElementType);
- PredefinedType : IfcBuildingElementProxyTypeEnum;
- WHERE
- CorrectPredefinedType : (PredefinedType <> IfcBuildingElementProxyTypeEnum.USERDEFINED) OR
-((PredefinedType = IfcBuildingElementProxyTypeEnum.USERDEFINED) AND EXISTS(SELF\IfcElementType.ElementType));
-END_ENTITY;
-
ENTITY IfcBuildingStorey
SUBTYPE OF (IfcSpatialStructureElement);
Elevation : OPTIONAL IfcLengthMeasure;
END_ENTITY;
ENTITY IfcBuildingSystem
SUBTYPE OF (IfcSystem);
PredefinedType : OPTIONAL IfcBuildingSystemTypeEnum;
LongName : OPTIONAL IfcLabel;
WHERE
CorrectPredefinedType : NOT(EXISTS(PredefinedType)) OR
(PredefinedType <> IfcBuildingSystemTypeEnum.USERDEFINED) OR
((PredefinedType = IfcBuildingSystemTypeEnum.USERDEFINED) AND EXISTS (SELF\IfcObject.ObjectType));
END_ENTITY;
ENTITY IfcBuiltElement
SUPERTYPE OF (ONEOF
(IfcBeam
,IfcBearing
- ,IfcBuildingElementProxy
+ ,IfcBuiltElementProxy
,IfcChimney
,IfcColumn
,IfcCourse
,IfcCovering
,IfcCurtainWall
,IfcDeepFoundation
,IfcDoor
,IfcEarthworksElement
,IfcFooting
,IfcKerb
@@ -4616,25 +4594,45 @@
,IfcTrackElement
,IfcWall
,IfcWindow))
SUBTYPE OF (IfcElement);
WHERE
MaxOneMaterialAssociation : SIZEOF (QUERY(temp <* SELF\IfcObjectDefinition.HasAssociations |
'IFC4X3_DEV.IFCRELASSOCIATESMATERIAL' IN TYPEOF(temp)
)) <= 1;
END_ENTITY;
+ENTITY IfcBuiltElementProxy
+ SUBTYPE OF (IfcBuiltElement);
+ PredefinedType : OPTIONAL IfcBuiltElementProxyTypeEnum;
+ WHERE
+ HasObjectName : EXISTS(SELF\IfcRoot.Name);
+ CorrectPredefinedType : NOT(EXISTS(PredefinedType)) OR
+ (PredefinedType <> IfcBuildingElementProxyTypeEnum.USERDEFINED) OR
+ ((PredefinedType = IfcBuildingElementProxyTypeEnum.USERDEFINED) AND EXISTS (SELF\IfcObject.ObjectType));
+ CorrectTypeAssigned : (SIZEOF(IsTypedBy) = 0) OR
+ ('IFC4X3_DEV.IFCBUILDINGELEMENTPROXYTYPE' IN TYPEOF(SELF\IfcObject.IsTypedBy[1].RelatingType));
+END_ENTITY;
+
+ENTITY IfcBuiltElementProxyType
+ SUBTYPE OF (IfcBuiltElementType);
+ PredefinedType : IfcBuiltElementProxyTypeEnum;
+ WHERE
+ CorrectPredefinedType : (PredefinedType <> IfcBuildingElementProxyTypeEnum.USERDEFINED) OR
+((PredefinedType = IfcBuildingElementProxyTypeEnum.USERDEFINED) AND EXISTS(SELF\IfcElementType.ElementType));
+END_ENTITY;
+
ENTITY IfcBuiltElementType
SUPERTYPE OF (ONEOF
(IfcBeamType
,IfcBearingType
- ,IfcBuildingElementProxyType
+ ,IfcBuiltElementProxyType
,IfcChimneyType
,IfcColumnType
,IfcCourseType
,IfcCoveringType
,IfcCurtainWallType
,IfcDeepFoundationType
,IfcDoorType
,IfcFootingType
,IfcKerbType
,IfcMemberType
Naming consistency. There is the desire to keep the entity and undeprecate.