Merge branch 'develop' into tunnel

IFC4x3/Constants/c/CONTOURLINE_30oVU06B13Hw29vsovjfJn.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<DocConstant xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="CONTOURLINE_30oVU06B13Hw29vsovjfJn" Name="CONTOURLINE" UniqueId="c0c9f780-18b0-4347-a089-e76cb9b694f1">
+	<Documentation>Annotation used to illustrate lines connecting points of equal elevation or depth, on a map or chart.
+
+&gt;EXAMPLE Typically used in cartography, geography, or geology maps, where the spacing of lines at constant intervals of elevation may be used as an indication of slope.</Documentation>
+</DocConstant>
+

IFC4x3/Constants/d/DIMENSION_0yn9BV2W91YBdVw9PNqRJ6.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<DocConstant xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="DIMENSION_0yn9BV2W91YBdVw9PNqRJ6" Name="DIMENSION" UniqueId="3cc492df-0a02-4188-b9df-e89657d1b4c6">
+	<Documentation>Annotation used to illustrate the measurement or size of an object, often accompanied by numerical values.</Documentation>
+</DocConstant>
+

IFC4x3/Constants/i/ISOBAR_3IJjq8889EewanR4cGwspS.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<DocConstant xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="ISOBAR_3IJjq8889EewanR4cGwspS" Name="ISOBAR" UniqueId="d24edd08-2082-4ea3-a931-6c4990eb6cdc">
+	<Documentation>Annotation used to illustrate lines connecting points of equal pressure on a map or chart.
+
+&gt;EXAMPLE Typically used on weather maps or to show pressure gradient in spaces, chambers or externally.</Documentation>
+</DocConstant>
+

IFC4x3/Constants/i/ISOLUX_0U5W79Z7P8894oHKPIPONx.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<DocConstant xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="ISOLUX_0U5W79Z7P8894oHKPIPONx" Name="ISOLUX" UniqueId="1e1601c9-8c76-4820-9132-4546526585fb">
+	<Documentation>Annotation used to illustrate lines connecting points of equal illuminance or light intensity.
+
+&gt;EXAMPLE Typically used in lighting design or photometry to show the distribution of illumination levels and/or day lighting in a space or externally.</Documentation>
+</DocConstant>
+

IFC4x3/Constants/i/ISOTHERM_2koIfWNpD3dOkE6Q8YXArJ.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<DocConstant xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="ISOTHERM_2koIfWNpD3dOkE6Q8YXArJ" Name="ISOTHERM" UniqueId="aec92a60-5f33-439d-8b8e-19a22284ad53">
+	<Documentation>Annotation used to illustrate lines connecting points of equal temperature on a map or chart.
+
+&gt;EXAMPLE Typically used in to show the heating or cooling distribution within a space or to show temperature distribution on a geographic map.</Documentation>
+</DocConstant>
+

IFC4x3/Constants/k/KILOPOINT_04lMKO3TX7iuTAK7xaIR10.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<DocConstant xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="KILOPOINT_04lMKO3TX7iuTAK7xaIR10" Name="KILOPOINT" UniqueId="04bd6518-0dd8-47b3-874a-507ee449b040">
+	<Documentation>Kilo point</Documentation>
+</DocConstant>
+

IFC4x3/Constants/l/LEADER_2LaYi9ivzC5xPCTYEno1so.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<DocConstant xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="LEADER_2LaYi9ivzC5xPCTYEno1so" Name="LEADER" UniqueId="95922b09-b39f-4c17-b64c-7623b1c81db2">
+	<Documentation>Annotation that includes a line or arrow.
+
+&gt;EXAMPLE Typically used to connect an object to a specific point of reference or to an explanation.</Documentation>
+</DocConstant>
+

IFC4x3/Constants/m/MILEPOINT_29sFZrnybFQP2rA6f23AYS.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<DocConstant xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="MILEPOINT_29sFZrnybFQP2rA6f23AYS" Name="MILEPOINT" UniqueId="89d8f8f5-c7c9-4f69-90b5-286a420ca89c">
+	<Documentation>Mile point</Documentation>
+</DocConstant>
+

IFC4x3/Constants/s/SURVEY_0bUzI9_Mz1gOrZ$Cjje63Y.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<DocConstant xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="SURVEY_0bUzI9_Mz1gOrZ$Cjje63Y" Name="SURVEY" UniqueId="257bd489-f96f-41a9-8d63-fccb6da060e2">
+	<Documentation>Annotation used for survey information, such as survey points, survey lines or survey areas.
+
+&gt;EXAMPLE Typically used in surveying or mapping to indicate the location, elevation, or other relevant data about a specific point or area.
+&gt;NOTE The shape representation of the _IfcAnnotation_ indicates if it is a survey point, survey line, survey area or any other type of representation connected to survey.</Documentation>
+</DocConstant>
+

IFC4x3/Constants/s/SYMBOL_3vP2xXztvFBg7Qtz1PsrtH.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<DocConstant xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="SYMBOL_3vP2xXztvFBg7Qtz1PsrtH" Name="SYMBOL" UniqueId="f9642ee1-f77e-4f2e-a1da-dfd059db5dd1">
+	<Documentation>Annotation that employs graphical symbols or icons to represent specific meanings.</Documentation>
+</DocConstant>
+

IFC4x3/Constants/t/TEXT_2xYMbndJb1U9AQip7Vkanz.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<DocConstant xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="TEXT_2xYMbndJb1U9AQip7Vkanz" Name="TEXT" UniqueId="bb896971-9d39-4178-929a-b331dfba4c7d">
+	<Documentation>A textual annotation.</Documentation>
+</DocConstant>
+

IFC4x3/Sections/Core data schemas/Schemas/IfcProductExtension/Entities/IfcRelAssociatesMaterial/DocEntity.xml

@@ -24,8 +24,6 @@
   SIZEOF(TYPEOF(temp) * [   
     'IFCPRODUCTEXTENSION.IFCELEMENT', 
     'IFCPRODUCTEXTENSION.IFCELEMENTTYPE',
-    'IFCSHAREDBLDGELEMENTS.IFCWINDOWSTYLE',
-    'IFCSHAREDBLDGELEMENTS.IFCDOORSTYLE',
     'IFCSTRUCTURALANALYSISDOMAIN.IFCSTRUCTURALMEMBER',
     'IFCPRODUCTEXTENSION.IFCPORT',
     'IFCSHAREDINFRASTRUCTUREELEMENTS.IFCGEOSCIENCEOBSERVATION']) = 0) 

IFC4x3/Sections/Core data schemas/Schemas/IfcProductExtension/Entities/IfcVirtualElement/DocEntity.xml

@@ -7,10 +7,16 @@
 	</Localization>
 	<Attributes>
 		<DocAttribute Name="PredefinedType" UniqueId="89972bc8-05b7-43af-8ade-b8ac3769243a" DefinedType="IfcVirtualElementTypeEnum">
-			<Definition>
-				<DocEnumeration xsi:nil="true" href="IfcVirtualElementTypeEnum" />
-			</Definition>
+			<Documentation>A list of types to further identify the object. Some property sets may be specifically applicable to one of these types.
+
+				&gt;NOTE If the object has an associated IfcTypeObject with a PredefinedType, then this attribute shall not be used.</Documentation>
 		</DocAttribute>
 	</Attributes>
+	<WhereRules>
+		<DocWhereRule Name="HasObjectType" UniqueId="c8515ad8-d2a8-4a06-a9cb-da9c1f3be613">
+			<Documentation>The attribute ObjectType shall be given if the predefined type is set to USERDEFINED.</Documentation>
+			<Expression>NOT EXISTS(PredefinedType) OR (PredefinedType &lt;&gt; IfcVirtualElementTypeEnum.USERDEFINED) OR EXISTS(SELF\IfcObject.ObjectType);</Expression>
+		</DocWhereRule>
+	</WhereRules>
 </DocEntity>
 

IFC4x3/Sections/Core data schemas/Schemas/IfcProductExtension/Entities/IfcVirtualElement/Documentation.md

@@ -10,3 +10,5 @@ The _IfcVirtualElement_ is mainly used to define a virtual boundary between two
 
 { .change-ifc2x3}
 > IFC2x2 CHANGE  The entity _IfcVirtualElement_ has been added. Upward compatibility for file based exchange is guaranteed.
+
+> IFC4.3.0.0-CHANGE Virtual elements can now be used for void provisions and clearance to replace existing functionality on _IfcBuildingElementProxy_.

IFC4x3/Sections/Core data schemas/Schemas/IfcProductExtension/Types/IfcAnnotationTypeEnum/DocEnumeration.xml

@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <DocEnumeration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" Name="IfcAnnotationTypeEnum" UniqueId="469eba27-516c-41d4-b021-d56e4e960ebb">
 	<Constants>
-		<DocConstant xsi:nil="true" href="ASSUMEDPOINT_3reTam0_v1_xR9Cp_tbrCz" />
-		<DocConstant xsi:nil="true" href="ASBUILTAREA_1GqT215CzEOPMpaERlWkqA" />
-		<DocConstant xsi:nil="true" href="ASBUILTLINE_2PVqtTOCH2a8hDkyRfWZT_" />
-		<DocConstant xsi:nil="true" href="NON_PHYSICAL_SIGNAL_29M9iosMPAt95pX0XMsWlM" />
-		<DocConstant xsi:nil="true" href="ASSUMEDLINE_3KoBmqa2XEAehiZezAhu1R" />
-		<DocConstant xsi:nil="true" href="WIDTHEVENT_1ygENDmMj2XA1ndX3MLrux" />
-		<DocConstant xsi:nil="true" href="ASSUMEDAREA_2q$hwGYfv6R85b7Uy5iQJz" />
-		<DocConstant xsi:nil="true" href="SUPERELEVATIONEVENT_2T_vCkBWTC2AFgqirchRJw" />
-		<DocConstant xsi:nil="true" href="ASBUILTPOINT_3_QCsR1LH1H8l9zpru1ojH" />
+		<DocConstant xsi:nil="true" href="CONTOURLINE_30oVU06B13Hw29vsovjfJn" />
+		<DocConstant xsi:nil="true" href="DIMENSION_0yn9BV2W91YBdVw9PNqRJ6" />
+		<DocConstant xsi:nil="true" href="ISOBAR_3IJjq8889EewanR4cGwspS" />
+		<DocConstant xsi:nil="true" href="ISOLUX_0U5W79Z7P8894oHKPIPONx" />
+		<DocConstant xsi:nil="true" href="ISOTHERM_2koIfWNpD3dOkE6Q8YXArJ" />
+		<DocConstant xsi:nil="true" href="LEADER_2LaYi9ivzC5xPCTYEno1so" />
+		<DocConstant xsi:nil="true" href="SURVEY_0bUzI9_Mz1gOrZ$Cjje63Y" />
+		<DocConstant xsi:nil="true" href="SYMBOL_3vP2xXztvFBg7Qtz1PsrtH" />
+		<DocConstant xsi:nil="true" href="TEXT_2xYMbndJb1U9AQip7Vkanz" />
 		<DocConstant xsi:nil="true" href="USERDEFINED_3UZX$zKKD12RotG6dmTF8v" />
 		<DocConstant xsi:nil="true" href="NOTDEFINED_0$hF15nkf79uy7wMtnpx$z" />
 	</Constants>

IFC4x3/Sections/Core data schemas/Schemas/IfcProductExtension/Types/IfcReferentTypeEnum/DocEnumeration.xml

@@ -4,12 +4,16 @@
 		<DocLocalization Locale="en" Name="Referent Type Enum" />
 	</Localization>
 	<Constants>
-		<DocConstant xsi:nil="true" href="STATION_3mZYci1kzBIfEoa0zx_hua" />
-		<DocConstant xsi:nil="true" href="REFERENCEMARKER_37hLLOhCD2TeXGmYxseRku" />
-		<DocConstant xsi:nil="true" href="LANDMARK_2T_Mjk41nC4Rw2antpeR1i" />
 		<DocConstant xsi:nil="true" href="BOUNDARY_3q7n1HNHLAyflKLDtQrdbK" />
 		<DocConstant xsi:nil="true" href="INTERSECTION_0zqNMuub18ohwzalcYuHnk" />
+		<DocConstant xsi:nil="true" href="KILOPOINT_04lMKO3TX7iuTAK7xaIR10" />
+		<DocConstant xsi:nil="true" href="LANDMARK_2T_Mjk41nC4Rw2antpeR1i" />
+		<DocConstant xsi:nil="true" href="MILEPOINT_29sFZrnybFQP2rA6f23AYS" />
 		<DocConstant xsi:nil="true" href="POSITION_0A_EeaX8fClRhysKUHwrUQ" />
+		<DocConstant xsi:nil="true" href="REFERENCEMARKER_37hLLOhCD2TeXGmYxseRku" />
+		<DocConstant xsi:nil="true" href="STATION_3mZYci1kzBIfEoa0zx_hua" />
+		<DocConstant xsi:nil="true" href="SUPERELEVATIONEVENT_2T_vCkBWTC2AFgqirchRJw" />
+		<DocConstant xsi:nil="true" href="WIDTHEVENT_1ygENDmMj2XA1ndX3MLrux" />
 		<DocConstant xsi:nil="true" href="USERDEFINED_283KskxxL3VAyddoFEcTKp" />
 		<DocConstant xsi:nil="true" href="NOTDEFINED_1jVLeMcaf2cgAhlEsTekzr" />
 	</Constants>

IFC4x3/Sections/Core data schemas/Schemas/IfcProductExtension/Types/IfcVirtualElementTypeEnum/DocEnumeration.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<DocEnumeration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="IfcVirtualElementTypeEnum" Name="IfcVirtualElementTypeEnum" UniqueId="a28fdf84-8ede-44bd-96ea-b74c66ca5c64" DiagramNumber="1">
-	<DiagramRectangle xsi:type="DocRectangle" X="0" Y="0" Width="400" Height="100" />
+<DocEnumeration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" Name="IfcVirtualElementTypeEnum" UniqueId="a28fdf84-8ede-44bd-96ea-b74c66ca5c64" DiagramNumber="1">
 	<Constants>
 		<DocConstant xsi:nil="true" href="BOUNDARY_0D9uazImf8vO$PVKzXao_2" />
 		<DocConstant xsi:nil="true" href="CLEARANCE_0hS5MhQVv57hIehqvLOgZ9" />

IFC4x3/Sections/Resource definition data schemas/Schemas/IfcGeometricModelResource/Entities/IfcRevolvedAreaSolid/DocEntity.xml

@@ -21,7 +21,7 @@
 	<WhereRules>
 		<DocWhereRule Name="AxisStartInXY" UniqueId="a9e33584-c5f8-4d10-9735-557802c9e6cf">
 			<Documentation>The start of the axis shall lie in the XY plane of the position coordinate system.</Documentation>
-			<Expression>Axis.Location.Coordinates[3] = 0.0</Expression>
+			<Expression>(&apos;IFC4X3_ADD2.IFCCARTESIANPOINT&apos; IN TYPEOF(Axis.Location)) AND (Axis.Location\IfcCartesianPoint.Coordinates[3] = 0.0)</Expression>
 		</DocWhereRule>
 		<DocWhereRule Name="AxisDirectionInXY" UniqueId="37af1dd7-3b31-40a3-864e-ab12bcd8bd97">
 			<Documentation>The direction of the axis shall be parallel to the XY plane of the position coordinate system.</Documentation>

IFC4x3/Sections/Resource definition data schemas/Schemas/IfcGeometryResource/Entities/IfcCartesianPoint/DocEntity.xml

@@ -9,10 +9,6 @@
 		<DocAttribute Name="Coordinates" UniqueId="4a8b21fa-0aa6-4d2a-b0ce-55d5777e3b0f" DefinedType="IfcLengthMeasure" AggregationType="1" AggregationLower="1" AggregationUpper="3">
 			<Documentation>The first, second, and third coordinate of the point location. If placed in a two or three dimensional rectangular Cartesian coordinate system, Coordinates[1] is the X coordinate, Coordinates[2] is the Y coordinate, and Coordinates[3] is the Z coordinate.</Documentation>
 		</DocAttribute>
-		<DocAttribute Name="Dim" UniqueId="c2afcb8b-ad08-4d95-85a2-a02e4d8a7167" DefinedType="IfcDimensionCount">
-			<Documentation>The space dimensionality of this class, determined by the number of coordinates in the List of Coordinates.</Documentation>
-			<Derived>HIINDEX(Coordinates)</Derived>
-		</DocAttribute>
 	</Attributes>
 	<WhereRules>
 		<DocWhereRule Name="CP2Dor3D" UniqueId="f356a020-47e4-4f2c-9fc7-c2f7c060caab">

IFC4x3/Sections/Resource definition data schemas/Schemas/IfcGeometryResource/Entities/IfcPoint/DocEntity.xml

@@ -5,5 +5,11 @@
 		<DocLocalization Locale="en" Name="Point" />
 		<DocLocalization Locale="fr" Name="Point" />
 	</Localization>
+	<Attributes>
+		<DocAttribute Name="Dim" UniqueId="637e4d5d-3def-47a6-9dc9-b72243a5ce1e" DefinedType="IfcDimensionCount">
+			<Documentation>The space dimensionality of this abstract class, handled by a function specific for concrete subtypes. Determined by the number of coordinate components in case of IfcCartesianPoint or by the dimensionality of the basis curve or surface in other cases.</Documentation>
+			<Derived>IfcPointDim(SELF)</Derived>
+		</DocAttribute>
+	</Attributes>
 </DocEntity>
 

IFC4x3/Sections/Resource definition data schemas/Schemas/IfcGeometryResource/Entities/IfcPointByDistanceExpression/DocEntity.xml

@@ -17,9 +17,6 @@
 			<Documentation>Offset parallel to the basis curve after applying DistanceAlong, OffsetLateral, and OffsetVertical to reach locations for the case of a tangentially discontinuous basis curve.</Documentation>
 		</DocAttribute>
 		<DocAttribute Name="BasisCurve" UniqueId="34db6f8c-9ffe-48a5-8dc4-c64009e04d63" DefinedType="IfcCurve" />
-		<DocAttribute Name="Dim" UniqueId="d323dd4b-31c3-49e2-a83b-0374e7f9420d" DefinedType="IfcDimensionCount">
-			<Derived>BasisCurve.Dim</Derived>
-		</DocAttribute>
 	</Attributes>
 </DocEntity>
 

IFC4x3/Sections/Resource definition data schemas/Schemas/IfcGeometryResource/Entities/IfcPointOnCurve/DocEntity.xml

@@ -12,10 +12,6 @@
 		<DocAttribute Name="PointParameter" UniqueId="5ee320ad-16c4-44d7-a272-c4c6f7d2deb2" DefinedType="IfcParameterValue">
 			<Documentation>The parameter value of the point location.</Documentation>
 		</DocAttribute>
-		<DocAttribute Name="Dim" UniqueId="46656360-14de-4bbe-ac9f-e3771d59a218" DefinedType="IfcDimensionCount">
-			<Documentation>The space dimensionality of this class, determined by the space dimensionality of the basis curve.</Documentation>
-			<Derived>BasisCurve.Dim</Derived>
-		</DocAttribute>
 	</Attributes>
 </DocEntity>
 

IFC4x3/Sections/Resource definition data schemas/Schemas/IfcGeometryResource/Entities/IfcPointOnSurface/DocEntity.xml

@@ -15,10 +15,6 @@
 		<DocAttribute Name="PointParameterV" UniqueId="8e50f05b-a118-43a2-89da-73538af766d3" DefinedType="IfcParameterValue">
 			<Documentation>The second parameter value of the point location.</Documentation>
 		</DocAttribute>
-		<DocAttribute Name="Dim" UniqueId="dc74b17c-6d54-4257-9dea-ce9933fd62a9" DefinedType="IfcDimensionCount">
-			<Documentation>The space dimensionality of this class, determined by the space dimensionality of the basis surface.</Documentation>
-			<Derived>BasisSurface.Dim</Derived>
-		</DocAttribute>
 	</Attributes>
 </DocEntity>
 

IFC4x3/Sections/Resource definition data schemas/Schemas/IfcGeometryResource/Entities/IfcSpiral/DocEntity.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <DocEntity xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" Name="IfcSpiral" UniqueId="9ad572b1-a346-43b9-b36c-a3e0d66e934c" BaseDefinition="IfcCurve">
 	<Attributes>
-		<DocAttribute Name="Position" UniqueId="0d9d870b-f98f-422b-ab82-c52967f6b656" DefinedType="IfcAxis2Placement" AttributeFlags="1" />
+		<DocAttribute Name="Position" UniqueId="0d9d870b-f98f-422b-ab82-c52967f6b656" DefinedType="IfcAxis2Placement" />
 	</Attributes>
 </DocEntity>
 

IFC4x3/Sections/Resource definition data schemas/Schemas/IfcGeometryResource/Functions/IfcPointDim/DocFunction.xml

@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<DocFunction xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" Name="IfcPointDim" UniqueId="9766766c-25a3-409e-9d99-d47790245118" />
+

IFC4x3/Sections/Resource definition data schemas/Schemas/IfcGeometryResource/Functions/IfcPointDim/Documentation.md

@@ -0,0 +1,5 @@
+This function checks the dimensionality of the various subtypes of IfcPoint.
+
+Returns the number of coordinate components in case of IfcCartesianPoint or the dimensionality of the basis curve or surface in other cases.
+
+> HISTORY  New function in IFC4.3.0.1

IFC4x3/Sections/Resource definition data schemas/Schemas/IfcGeometryResource/Functions/IfcPointDim/Expression.txt

@@ -0,0 +1,16 @@
+ (Point : IfcPoint)
+ : IfcDimensionCount;
+
+  IF ('IFC4X3_ADD2.IFCCARTESIANPOINT' IN TYPEOF(Point))
+    THEN RETURN(HIINDEX(Point\IfcCartesianPoint.Coordinates));
+  END_IF;
+  IF ('IFC4X3_ADD2.IFCPOINTBYDISTANCEEXPRESSION' IN TYPEOF(Point))
+    THEN RETURN(Point\IfcPointByDistanceExpression.BasisCurve.Dim);
+  END_IF;
+  IF ('IFC4X3_ADD2.IFCPOINTONCURVE' IN TYPEOF(Point))
+    THEN RETURN(Point\IfcPointOnCurve.BasisCurve.Dim);
+  END_IF;
+  IF ('IFC4X3_ADD2.IFCPOINTONSURFACE' IN TYPEOF(Point))
+    THEN RETURN(Point\IfcPointOnSurface.BasisSurface.Dim);
+  END_IF;
+  RETURN (?);

IFC4x3/Sections/Resource definition data schemas/Schemas/IfcGeometryResource/Types/IfcCurveMeasureSelect/DocSelect.xml

@@ -5,3 +5,4 @@
 		<DocSelectItem Name="IfcLengthMeasure" UniqueId="ea35632d-740b-40e1-968d-de8a492a0e4e" />
 	</Selects>
 </DocSelect>
+

IFC4x3/Sections/Resource definition data schemas/Schemas/IfcMeasureResource/Types/IfcCountMeasure/DocDefined.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<DocDefined xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" Name="IfcCountMeasure" UniqueId="db0ab29e-50b3-4287-9272-e06513097a5a" DefinedType="NUMBER">
+<DocDefined xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" Name="IfcCountMeasure" UniqueId="db0ab29e-50b3-4287-9272-e06513097a5a" DefinedType="INTEGER">
 	<Localization>
 		<DocLocalization Locale="en" Name="Count Measure" />
 		<DocLocalization Locale="fr" Name="Mesure du nombre" />
 	</Localization>
-	<Definition xsi:type="DocPrimitive" xsi:nil="true" href="NUMBER_3AYiD8s_rAOu2IDHGD82pn" />
+	<Definition xsi:type="DocPrimitive" xsi:nil="true" href="INTEGER_0Bo9r4fCj07e5rVk1a6n_D" />
 </DocDefined>
 

IFC4x3/Sections/Resource definition data schemas/Schemas/IfcMeasureResource/Types/IfcCountMeasure/Documentation.md

@@ -1,7 +1,9 @@
 A count measure is the value of a count of items.
 
-Type: NUMBER
+Type: INTEGER
 
 > NOTE  Type adapted from **count_measure** defined in ISO 10303-41.
 
 > HISTORY  New type in IFC1.5.1.
+
+> HISTORY IFC4.3.0.0 Type changed from NUMBER to INTEGER