Standardisation of predefined types for system fittings issue 142

[aothms]

--- tmp/a/IFC.exp   2022-03-20 22:06:11.274693300 +0100
+++ tmp/b/IFC.exp   2022-03-22 21:11:58.066295400 +0100
@@ -808,23 +808,25 @@
    ,NOTDEFINED);
 END_TYPE;

 TYPE IfcBurnerTypeEnum = ENUMERATION OF
    (USERDEFINED
    ,NOTDEFINED);
 END_TYPE;

 TYPE IfcCableCarrierFittingTypeEnum = ENUMERATION OF
    (BEND
+   ,CONNECTOR
    ,CROSS
-   ,REDUCER
+   ,JUNCTION
    ,TEE
+   ,TRANSITION
    ,USERDEFINED
    ,NOTDEFINED);
 END_TYPE;

 TYPE IfcCableCarrierSegmentTypeEnum = ENUMERATION OF
    (CABLEBRACKET
    ,CABLELADDERSEGMENT
    ,CABLETRAYSEGMENT
    ,CABLETRUNKINGSEGMENT
    ,CATENARYWIRE

[aothms]

diff -N -w -U10 tmp/a/psd/Pset_FittingJunction.xml tmp/b/psd/Pset_FittingJunction.xml
--- tmp/a/psd/Pset_FittingJunction.xml  2022-03-20 22:07:21.085094700 +0100
+++ tmp/b/psd/Pset_FittingJunction.xml  2022-03-22 21:11:57.913776500 +0100
@@ -1,25 +1,27 @@
 <?xml version="1.0" ?>
 <PropertySetDef xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" templatetype="PSET_TYPEDRIVENOVERRIDE" xsi:noNamespaceSchemaLocation="http://buildingSMART-tech.org/xml/psd/PSD_IFC4.xsd">
   <IfcVersion version="IFC4X3_DEV"/>
   <Name>Pset_FittingJunction</Name>
   <Definition>Properties about Fitting Junction.</Definition>
   <Applicability/>
   <ApplicableClasses>
     <ClassName>IfcCableFitting/JUNCTION</ClassName>
     <ClassName>IfcDuctFitting/JUNCTION</ClassName>
     <ClassName>IfcPipeFitting/JUNCTION</ClassName>
+    <ClassName>IfcCableCarrierFitting/JUNCTION</ClassName>
     <ClassName>IfcCableFittingType/JUNCTION</ClassName>
     <ClassName>IfcDuctFittingType/JUNCTION</ClassName>
     <ClassName>IfcPipeFittingType/JUNCTION</ClassName>
+    <ClassName>IfcCableCarrierFittingType/JUNCTION</ClassName>
   </ApplicableClasses>
-  <ApplicableTypeValue>IfcCableFitting/JUNCTION,IfcDuctFitting/JUNCTION,IfcPipeFitting/JUNCTION,IfcCableFittingType/JUNCTION,IfcDuctFittingType/JUNCTION,IfcPipeFittingType/JUNCTION</ApplicableTypeValue>
+  <ApplicableTypeValue>IfcCableFitting/JUNCTION,IfcDuctFitting/JUNCTION,IfcPipeFitting/JUNCTION,IfcCableCarrierFitting/JUNCTION,IfcCableFittingType/JUNCTION,IfcDuctFittingType/JUNCTION,IfcPipeFittingType/JUNCTION,IfcCableCarrierFittingType/JUNCTION</ApplicableTypeValue>
   <PropertyDefs>
     <PropertyDef>
       <Name>JunctionType</Name>
       <Definition>The type of junction. TEE=3 ports, CROSS = 4 ports.</Definition>
       <PropertyType>
         <TypePropertyEnumeratedValue>
           <EnumList name="PEnum_FittingJunctionType">
             <EnumItem>CROSS</EnumItem>
             <EnumItem>TEE</EnumItem>
             <EnumItem>OTHER</EnumItem>
diff -N -w -U10 tmp/a/psd/Pset_FittingTransition.xml tmp/b/psd/Pset_FittingTransition.xml
--- tmp/a/psd/Pset_FittingTransition.xml    2022-03-20 22:07:21.233697000 +0100
+++ tmp/b/psd/Pset_FittingTransition.xml    2022-03-22 21:11:57.951560000 +0100
@@ -1,25 +1,27 @@
 <?xml version="1.0" ?>
 <PropertySetDef xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" templatetype="PSET_TYPEDRIVENOVERRIDE" xsi:noNamespaceSchemaLocation="http://buildingSMART-tech.org/xml/psd/PSD_IFC4.xsd">
   <IfcVersion version="IFC4X3_DEV"/>
   <Name>Pset_FittingTransition</Name>
   <Definition>Properties about Fitting Transition.</Definition>
   <Applicability/>
   <ApplicableClasses>
     <ClassName>IfcCableFitting/TRANSITION</ClassName>
     <ClassName>IfcDuctFitting/TRANSITION</ClassName>
     <ClassName>IfcPipeFitting/TRANSITION</ClassName>
+    <ClassName>IfcCableCarrierFitting/TRANSITION</ClassName>
     <ClassName>IfcCableFittingType/TRANSITION</ClassName>
     <ClassName>IfcDuctFittingType/TRANSITION</ClassName>
     <ClassName>IfcPipeFittingType/TRANSITION</ClassName>
+    <ClassName>IfcCableCarrierFittingType/TRANSITION</ClassName>
   </ApplicableClasses>
-  <ApplicableTypeValue>IfcCableFitting/TRANSITION,IfcDuctFitting/TRANSITION,IfcPipeFitting/TRANSITION,IfcCableFittingType/TRANSITION,IfcDuctFittingType/TRANSITION,IfcPipeFittingType/TRANSITION</ApplicableTypeValue>
+  <ApplicableTypeValue>IfcCableFitting/TRANSITION,IfcDuctFitting/TRANSITION,IfcPipeFitting/TRANSITION,IfcCableCarrierFitting/TRANSITION,IfcCableFittingType/TRANSITION,IfcDuctFittingType/TRANSITION,IfcPipeFittingType/TRANSITION,IfcCableCarrierFittingType/TRANSITION</ApplicableTypeValue>
   <PropertyDefs>
     <PropertyDef>
       <Name>NominalLength</Name>
       <Definition>The nominal overall length of the object. The size information is provided in addition to the shape representation and the geometric parameters used within. In case of inconsistency between the geometric parameters and the size properties, provided in the attached property set, the geometric parameters take precedence.</Definition>
       <PropertyType>
         <TypePropertySingleValue>
           <DataType type="IfcPositiveLengthMeasure"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>