search

AECgeeks / infra-repo-issue-test-old1

0 stars 0 forks source link

IfcCountMeasure #108

Closed aothms closed 2 years ago

aothms commented 2 years ago

Model all NumberOf_ and _Count properties as IfcCountMeasure

aothms commented 2 years ago 
diff -N -w -U10 tmp/a/psd/Pset_AirTerminalTypeCommon.xml tmp/b/psd/Pset_AirTerminalTypeCommon.xml
--- tmp/a/psd/Pset_AirTerminalTypeCommon.xml    2022-02-14 21:40:01.176342000 +0100
+++ tmp/b/psd/Pset_AirTerminalTypeCommon.xml    2022-07-09 16:02:31.416181600 +0200
@@ -89,21 +89,21 @@
         <TypePropertySingleValue>
           <DataType type="IfcPositiveLengthMeasure"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>NumberOfSlots</Name>
       <Definition>Number of slots.</Definition>
       <PropertyType>
         <TypePropertySingleValue>
-          <DataType type="IfcInteger"/>
+          <DataType type="IfcCountMeasure"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>FlowPattern</Name>
       <Definition>Flow pattern.</Definition>
       <PropertyType>
         <TypePropertyEnumeratedValue>
           <EnumList name="PEnum_AirTerminalFlowPattern">
             <EnumItem>COMPACTJET</EnumItem>
diff -N -w -U10 tmp/a/psd/Pset_BuildingCommon.xml tmp/b/psd/Pset_BuildingCommon.xml
--- tmp/a/psd/Pset_BuildingCommon.xml   2022-02-14 21:40:11.786230700 +0100
+++ tmp/b/psd/Pset_BuildingCommon.xml   2022-07-09 16:02:31.448184100 +0200
@@ -100,21 +100,21 @@
           <DataType type="IfcAreaMeasure"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>NumberOfStoreys</Name>
       <Definition>The number of storeys within a building.
 Captured for those cases where the IfcBuildingStorey entity is not used. Note that if IfcBuilingStorey is asserted and the number of storeys in a building can be determined from it, then this approach should be used in preference to setting a property for the number of storeys.</Definition>
       <PropertyType>
         <TypePropertySingleValue>
-          <DataType type="IfcInteger"/>
+          <DataType type="IfcCountMeasure"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>YearOfConstruction</Name>
       <Definition>Year of construction of this building, including expected year of completion.</Definition>
       <PropertyType>
         <TypePropertySingleValue>
           <DataType type="IfcLabel"/>
         </TypePropertySingleValue>
diff -N -w -U10 tmp/a/psd/Pset_CableCarrierSegmentTypeCableTrunkingSegment.xml tmp/b/psd/Pset_CableCarrierSegmentTypeCableTrunkingSegment.xml
--- tmp/a/psd/Pset_CableCarrierSegmentTypeCableTrunkingSegment.xml  2022-02-14 21:39:57.754839500 +0100
+++ tmp/b/psd/Pset_CableCarrierSegmentTypeCableTrunkingSegment.xml  2022-07-09 16:02:31.479182800 +0200
@@ -8,16 +8,16 @@
   <ApplicableClasses>
     <ClassName>IfcCableCarrierSegment/CABLETRUNKINGSEGMENT</ClassName>
   </ApplicableClasses>
   <ApplicableTypeValue>IfcCableCarrierSegment/CABLETRUNKINGSEGMENT</ApplicableTypeValue>
   <PropertyDefs>
     <PropertyDef>
       <Name>NumberOfCompartments</Name>
       <Definition>The number of separate internal compartments within the trunking.</Definition>
       <PropertyType>
         <TypePropertySingleValue>
-          <DataType type="IfcInteger"/>
+          <DataType type="IfcCountMeasure"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
   </PropertyDefs>
 </PropertySetDef>
diff -N -w -U10 tmp/a/psd/Pset_CableFittingTypeFanout.xml tmp/b/psd/Pset_CableFittingTypeFanout.xml
--- tmp/a/psd/Pset_CableFittingTypeFanout.xml   2022-02-14 21:40:13.005429800 +0100
+++ tmp/b/psd/Pset_CableFittingTypeFanout.xml   2022-07-09 16:02:31.531185700 +0200
@@ -7,21 +7,21 @@
   <ApplicableClasses>
     <ClassName>IfcCableFitting/FANOUT</ClassName>
   </ApplicableClasses>
   <ApplicableTypeValue>IfcCableFitting/FANOUT</ApplicableTypeValue>
   <PropertyDefs>
     <PropertyDef>
       <Name>NumberOfTubes</Name>
       <Definition/>
       <PropertyType>
         <TypePropertySingleValue>
-          <DataType type="IfcInteger"/>
+          <DataType type="IfcCountMeasure"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>TubeDiameter</Name>
       <Definition/>
       <PropertyType>
         <TypePropertySingleValue>
           <DataType type="IfcPositiveLengthMeasure"/>
         </TypePropertySingleValue>
diff -N -w -U10 tmp/a/psd/Pset_CableSegmentOccurrence.xml tmp/b/psd/Pset_CableSegmentOccurrence.xml
--- tmp/a/psd/Pset_CableSegmentOccurrence.xml   2022-02-14 21:39:57.898455600 +0100
+++ tmp/b/psd/Pset_CableSegmentOccurrence.xml   2022-07-09 16:02:31.567185100 +0200
@@ -25,21 +25,21 @@
         <TypePropertySingleValue>
           <DataType type="IfcReal"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>NumberOfParallelCircuits</Name>
       <Definition>Number of parallel circuits.</Definition>
       <PropertyType>
         <TypePropertySingleValue>
-          <DataType type="IfcInteger"/>
+          <DataType type="IfcCountMeasure"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>InstallationMethod</Name>
       <Definition>Method of installation of cable/conductor. Installation methods are typically defined by reference in standards such as IEC 60364-5-52, table 52A-1 or BS7671 Appendix 4 Table 4A1 etc. Selection of the value to be used should be determined from such a standard according to local usage.</Definition>
       <PropertyType>
         <TypePropertySingleValue>
           <DataType type="IfcLabel"/>
         </TypePropertySingleValue>
diff -N -w -U10 tmp/a/psd/Pset_CableSegmentTypeCableSegment.xml tmp/b/psd/Pset_CableSegmentTypeCableSegment.xml
--- tmp/a/psd/Pset_CableSegmentTypeCableSegment.xml 2022-02-14 21:39:58.019132800 +0100
+++ tmp/b/psd/Pset_CableSegmentTypeCableSegment.xml 2022-07-09 16:02:31.620183400 +0200
@@ -188,21 +188,21 @@
         <TypePropertySingleValue>
           <DataType type="IfcPositiveLengthMeasure"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>NumberOfWires</Name>
       <Definition/>
       <PropertyType>
         <TypePropertySingleValue>
-          <DataType type="IfcInteger"/>
+          <DataType type="IfcCountMeasure"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>InsulationVoltage</Name>
       <Definition/>
       <PropertyType>
         <TypePropertySingleValue>
           <DataType type="IfcElectricVoltageMeasure"/>
         </TypePropertySingleValue>
diff -N -w -U10 tmp/a/psd/Pset_CableSegmentTypeConductorSegment.xml tmp/b/psd/Pset_CableSegmentTypeConductorSegment.xml
--- tmp/a/psd/Pset_CableSegmentTypeConductorSegment.xml 2022-02-14 21:39:58.162748900 +0100
+++ tmp/b/psd/Pset_CableSegmentTypeConductorSegment.xml 2022-07-09 16:02:31.661182500 +0200
@@ -187,21 +187,21 @@
         <TypePropertySingleValue>
           <DataType type="IfcPositiveLengthMeasure"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>NumberOfCores</Name>
       <Definition>The number of cores in Cable/Bus.</Definition>
       <PropertyType>
         <TypePropertySingleValue>
-          <DataType type="IfcInteger"/>
+          <DataType type="IfcCountMeasure"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>RatedVoltage</Name>
       <Definition>The range of allowed voltage that a device is certified to handle. The upper bound of this value is the maximum.</Definition>
       <PropertyType>
         <TypePropertyBoundedValue>
           <DataType type="IfcElectricVoltageMeasure"/>
         </TypePropertyBoundedValue>
diff -N -w -U10 tmp/a/psd/Pset_CableSegmentTypeFiberTubeSegment.xml tmp/b/psd/Pset_CableSegmentTypeFiberTubeSegment.xml
--- tmp/a/psd/Pset_CableSegmentTypeFiberTubeSegment.xml 2022-02-14 21:40:13.329561400 +0100
+++ tmp/b/psd/Pset_CableSegmentTypeFiberTubeSegment.xml 2022-07-09 16:02:31.700185000 +0200
@@ -32,16 +32,16 @@
             <EnumItem>YELLOW</EnumItem>
           </EnumList>
         </TypePropertyEnumeratedValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>NumberOfFibers</Name>
       <Definition/>
       <PropertyType>
         <TypePropertySingleValue>
-          <DataType type="IfcInteger"/>
+          <DataType type="IfcCountMeasure"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
   </PropertyDefs>
 </PropertySetDef>
diff -N -w -U10 tmp/a/psd/Pset_CableSegmentTypeOpticalCableSegment.xml tmp/b/psd/Pset_CableSegmentTypeOpticalCableSegment.xml
--- tmp/a/psd/Pset_CableSegmentTypeOpticalCableSegment.xml  2022-02-14 21:40:13.419165700 +0100
+++ tmp/b/psd/Pset_CableSegmentTypeOpticalCableSegment.xml  2022-07-09 16:02:31.735183400 +0200
@@ -7,21 +7,21 @@
   <ApplicableClasses>
     <ClassName>IfcCableSegment/OPTICALCABLESEGMENT</ClassName>
   </ApplicableClasses>
   <ApplicableTypeValue>IfcCableSegment/OPTICALCABLESEGMENT</ApplicableTypeValue>
   <PropertyDefs>
     <PropertyDef>
       <Name>NumberOfFibers</Name>
       <Definition/>
       <PropertyType>
         <TypePropertySingleValue>
-          <DataType type="IfcInteger"/>
+          <DataType type="IfcCountMeasure"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>OpticalCableStructure</Name>
       <Definition/>
       <PropertyType>
         <TypePropertyEnumeratedValue>
           <EnumList name="PEnum_OpticalCableStructureType">
             <EnumItem>BREAKOUT</EnumItem>
@@ -34,39 +34,39 @@
             <EnumItem>UNSET</EnumItem>
           </EnumList>
         </TypePropertyEnumeratedValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>NumberOfMultiModeFibers</Name>
       <Definition/>
       <PropertyType>
         <TypePropertySingleValue>
-          <DataType type="IfcInteger"/>
+          <DataType type="IfcCountMeasure"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>NumberOfSingleModeFibers</Name>
       <Definition/>
       <PropertyType>
         <TypePropertySingleValue>
-          <DataType type="IfcInteger"/>
+          <DataType type="IfcCountMeasure"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>NumberOfTubes</Name>
       <Definition/>
       <PropertyType>
         <TypePropertySingleValue>
-          <DataType type="IfcInteger"/>
+          <DataType type="IfcCountMeasure"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>FiberMode</Name>
       <Definition/>
       <PropertyType>
         <TypePropertyEnumeratedValue>
           <EnumList name="PEnum_FiberMode">
             <EnumItem>MULTIMODE</EnumItem>
aothms commented 2 years ago 
diff -N -w -U10 tmp/a/psd/Pset_CoaxialCable.xml tmp/b/psd/Pset_CoaxialCable.xml
--- tmp/a/psd/Pset_CoaxialCable.xml 2022-02-14 21:40:13.679704800 +0100
+++ tmp/b/psd/Pset_CoaxialCable.xml 2022-07-09 16:02:31.782189100 +0200
@@ -34,21 +34,21 @@
         <TypePropertySingleValue>
           <DataType type="IfcSoundPowerLevelMeasure"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>NumberOfCoaxialPairs</Name>
       <Definition/>
       <PropertyType>
         <TypePropertySingleValue>
-          <DataType type="IfcInteger"/>
+          <DataType type="IfcCountMeasure"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>PropagationSpeedCoefficient</Name>
       <Definition/>
       <PropertyType>
         <TypePropertySingleValue>
           <DataType type="IfcRatioMeasure"/>
         </TypePropertySingleValue>
diff -N -w -U10 tmp/a/psd/Pset_CommunicationsApplianceTypeIpNetworkEquipment.xml tmp/b/psd/Pset_CommunicationsApplianceTypeIpNetworkEquipment.xml
--- tmp/a/psd/Pset_CommunicationsApplianceTypeIpNetworkEquipment.xml    2022-02-14 21:40:14.044765800 +0100
+++ tmp/b/psd/Pset_CommunicationsApplianceTypeIpNetworkEquipment.xml    2022-07-09 16:02:31.817183200 +0200
@@ -7,39 +7,39 @@
   <ApplicableClasses>
     <ClassName>IfcCommunicationsAppliance/IPNETWORKEQUIPMENT</ClassName>
   </ApplicableClasses>
   <ApplicableTypeValue>IfcCommunicationsAppliance/IPNETWORKEQUIPMENT</ApplicableTypeValue>
   <PropertyDefs>
     <PropertyDef>
       <Name>NumberOfSlots</Name>
       <Definition>Number of slots.</Definition>
       <PropertyType>
         <TypePropertySingleValue>
-          <DataType type="IfcInteger"/>
+          <DataType type="IfcCountMeasure"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>EquipmentCapacity</Name>
       <Definition/>
       <PropertyType>
         <TypePropertySingleValue>
           <DataType type="IfcIntegerCountRateMeasure"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>NumberOfCoolingFans</Name>
       <Definition/>
       <PropertyType>
         <TypePropertySingleValue>
-          <DataType type="IfcInteger"/>
+          <DataType type="IfcCountMeasure"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>SupportedProtocol</Name>
       <Definition/>
       <PropertyType>
         <TypePropertySingleValue>
           <DataType type="IfcLabel"/>
         </TypePropertySingleValue>
diff -N -w -U10 tmp/a/psd/Pset_CommunicationsApplianceTypeOpticalLineTerminal.xml tmp/b/psd/Pset_CommunicationsApplianceTypeOpticalLineTerminal.xml
--- tmp/a/psd/Pset_CommunicationsApplianceTypeOpticalLineTerminal.xml   2022-02-14 21:40:14.180366500 +0100
+++ tmp/b/psd/Pset_CommunicationsApplianceTypeOpticalLineTerminal.xml   2022-07-09 16:02:31.852182300 +0200
@@ -7,21 +7,21 @@
   <ApplicableClasses>
     <ClassName>IfcCommunicationsAppliance/OPTICALLINETERMINAL</ClassName>
   </ApplicableClasses>
   <ApplicableTypeValue>IfcCommunicationsAppliance/OPTICALLINETERMINAL</ApplicableTypeValue>
   <PropertyDefs>
     <PropertyDef>
       <Name>NumberOfSlots</Name>
       <Definition>Number of slots.</Definition>
       <PropertyType>
         <TypePropertySingleValue>
-          <DataType type="IfcInteger"/>
+          <DataType type="IfcCountMeasure"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>NumberOfInterfaces</Name>
       <Definition/>
       <PropertyType>
         <TypePropertyTableValue>
           <Expression/>
           <DefiningValue>
diff -N -w -U10 tmp/a/psd/Pset_CommunicationsApplianceTypeTelecommand.xml tmp/b/psd/Pset_CommunicationsApplianceTypeTelecommand.xml
--- tmp/a/psd/Pset_CommunicationsApplianceTypeTelecommand.xml   2022-02-14 21:40:14.302040500 +0100
+++ tmp/b/psd/Pset_CommunicationsApplianceTypeTelecommand.xml   2022-07-09 16:02:31.886183000 +0200
@@ -22,16 +22,16 @@
             <DataType type="IfcInteger"/>
           </DefinedValue>
         </TypePropertyTableValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>NumberOfCPUs</Name>
       <Definition/>
       <PropertyType>
         <TypePropertySingleValue>
-          <DataType type="IfcInteger"/>
+          <DataType type="IfcCountMeasure"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
   </PropertyDefs>
 </PropertySetDef>
diff -N -w -U10 tmp/a/psd/Pset_CommunicationsApplianceTypeTransportEquipment.xml tmp/b/psd/Pset_CommunicationsApplianceTypeTransportEquipment.xml
--- tmp/a/psd/Pset_CommunicationsApplianceTypeTransportEquipment.xml    2022-02-14 21:40:14.424712800 +0100
+++ tmp/b/psd/Pset_CommunicationsApplianceTypeTransportEquipment.xml    2022-07-09 16:02:31.926184200 +0200
@@ -25,21 +25,21 @@
         <TypePropertySingleValue>
           <DataType type="IfcLabel"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>NumberOfSlots</Name>
       <Definition>Number of slots.</Definition>
       <PropertyType>
         <TypePropertySingleValue>
-          <DataType type="IfcInteger"/>
+          <DataType type="IfcCountMeasure"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>TransportEquipmentType</Name>
       <Definition/>
       <PropertyType>
         <TypePropertyEnumeratedValue>
           <EnumList name="PEnum_TransportEquipmentType">
             <EnumItem>MPLS_TP</EnumItem>
diff -N -w -U10 tmp/a/psd/Pset_CoolingTowerTypeCommon.xml tmp/b/psd/Pset_CoolingTowerTypeCommon.xml
--- tmp/a/psd/Pset_CoolingTowerTypeCommon.xml   2022-02-14 21:40:02.247041000 +0100
+++ tmp/b/psd/Pset_CoolingTowerTypeCommon.xml   2022-07-09 16:02:31.960182800 +0200
@@ -145,21 +145,21 @@
             <EnumItem>WETBULBTEMPRESET</EnumItem>
           </EnumList>
         </TypePropertyEnumeratedValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>NumberOfCells</Name>
       <Definition>Number of cells in one cooling tower unit.</Definition>
       <PropertyType>
         <TypePropertySingleValue>
-          <DataType type="IfcInteger"/>
+          <DataType type="IfcCountMeasure"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>BasinReserveVolume</Name>
       <Definition>Volume between operating and overflow levels in cooling tower basin.</Definition>
       <PropertyType>
         <TypePropertySingleValue>
           <DataType type="IfcVolumeMeasure"/>
         </TypePropertySingleValue>
diff -N -w -U10 tmp/a/psd/Pset_CurrentInstrumentTransformer.xml tmp/b/psd/Pset_CurrentInstrumentTransformer.xml
--- tmp/a/psd/Pset_CurrentInstrumentTransformer.xml 2022-02-14 21:40:14.569325900 +0100
+++ tmp/b/psd/Pset_CurrentInstrumentTransformer.xml 2022-07-09 16:02:31.996185700 +0200
@@ -54,21 +54,21 @@
         <TypePropertySingleValue>
           <DataType type="IfcPowerMeasure"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>NumberOfPhases</Name>
       <Definition/>
       <PropertyType>
         <TypePropertySingleValue>
-          <DataType type="IfcInteger"/>
+          <DataType type="IfcCountMeasure"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>PrimaryFrequency</Name>
       <Definition>The frequency that is going to be transformed and that runs into the transformer on the primary side.</Definition>
       <PropertyType>
         <TypePropertySingleValue>
           <DataType type="IfcFrequencyMeasure"/>
         </TypePropertySingleValue>
diff -N -w -U10 tmp/a/psd/Pset_DistributionChamberElementTypeManhole.xml tmp/b/psd/Pset_DistributionChamberElementTypeManhole.xml
--- tmp/a/psd/Pset_DistributionChamberElementTypeManhole.xml    2022-02-14 21:40:25.484372200 +0100
+++ tmp/b/psd/Pset_DistributionChamberElementTypeManhole.xml    2022-07-09 16:02:32.034184400 +0200
@@ -142,30 +142,30 @@
         <TypePropertySingleValue>
           <DataType type="IfcBoolean"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>NumberOfCableEntries</Name>
       <Definition/>
       <PropertyType>
         <TypePropertySingleValue>
-          <DataType type="IfcInteger"/>
+          <DataType type="IfcCountMeasure"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>NumberOfManholeCovers</Name>
       <Definition/>
       <PropertyType>
         <TypePropertySingleValue>
-          <DataType type="IfcInteger"/>
+          <DataType type="IfcCountMeasure"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>TypeOfShaft</Name>
       <Definition/>
       <PropertyType>
         <TypePropertyEnumeratedValue>
           <EnumList name="PEnum_TypeOfShaft">
             <EnumItem>DIVERSIONSHAFT</EnumItem>
diff -N -w -U10 tmp/a/psd/Pset_DistributionSystemTypeElectrical.xml tmp/b/psd/Pset_DistributionSystemTypeElectrical.xml
--- tmp/a/psd/Pset_DistributionSystemTypeElectrical.xml 2022-02-14 21:40:26.151944800 +0100
+++ tmp/b/psd/Pset_DistributionSystemTypeElectrical.xml 2022-07-09 16:02:32.067184500 +0200
@@ -67,21 +67,21 @@
         <TypePropertySingleValue>
           <DataType type="IfcPositiveRatioMeasure"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>NumberOfLiveConductors</Name>
       <Definition>Number of live conductors within this circuit. Either this property or the ConductorFunction property (if only one) may be asserted.</Definition>
       <PropertyType>
         <TypePropertySingleValue>
-          <DataType type="IfcInteger"/>
+          <DataType type="IfcCountMeasure"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>MaximumAllowedVoltageDrop</Name>
       <Definition>The maximum voltage drop across the circuit that must not be exceeded. 
 There are two  voltage drop limit settings that may be applied; one for sub-main circuits, and one in each Distribution Board or Consumer Unit for final circuits connected to that board. The settings should limit the overall voltage drop to the required level. Default settings of 1.5% for sub-main circuits and 2.5% for final circuits, giving an overall limit of 4% may be applied.
 NOTE: This value may also be specified as a constraint within an IFC model if required but is included within the property set at this stage pending implementation of the required capabilities within software applications.</Definition>
       <PropertyType>
         <TypePropertySingleValue>
aothms commented 2 years ago 
diff -N -w -U10 tmp/a/psd/Pset_DistributionSystemTypeOverheadContactlineSystem.xml tmp/b/psd/Pset_DistributionSystemTypeOverheadContactlineSystem.xml
--- tmp/a/psd/Pset_DistributionSystemTypeOverheadContactlineSystem.xml  2022-02-14 21:40:15.468923100 +0100
+++ tmp/b/psd/Pset_DistributionSystemTypeOverheadContactlineSystem.xml  2022-07-09 16:02:32.100182400 +0200
@@ -70,21 +70,21 @@
         <TypePropertySingleValue>
           <DataType type="IfcPositiveLengthMeasure"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>NumberOfOverlappingSpans</Name>
       <Definition/>
       <PropertyType>
         <TypePropertySingleValue>
-          <DataType type="IfcInteger"/>
+          <DataType type="IfcCountMeasure"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>PantographType</Name>
       <Definition/>
       <PropertyType>
         <TypePropertySingleValue>
           <DataType type="IfcLabel"/>
         </TypePropertySingleValue>
diff -N -w -U10 tmp/a/psd/Pset_ElectricFlowStorageDeviceTypeCapacitor.xml tmp/b/psd/Pset_ElectricFlowStorageDeviceTypeCapacitor.xml
--- tmp/a/psd/Pset_ElectricFlowStorageDeviceTypeCapacitor.xml   2022-02-14 21:40:15.779123700 +0100
+++ tmp/b/psd/Pset_ElectricFlowStorageDeviceTypeCapacitor.xml   2022-07-09 16:02:32.130189500 +0200
@@ -7,16 +7,16 @@
   <ApplicableClasses>
     <ClassName>IfcElectricFlowStorageDevice/CAPACITOR</ClassName>
   </ApplicableClasses>
   <ApplicableTypeValue>IfcElectricFlowStorageDevice/CAPACITOR</ApplicableTypeValue>
   <PropertyDefs>
     <PropertyDef>
       <Name>NumberOfPhases</Name>
       <Definition/>
       <PropertyType>
         <TypePropertySingleValue>
-          <DataType type="IfcInteger"/>
+          <DataType type="IfcCountMeasure"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
   </PropertyDefs>
 </PropertySetDef>
diff -N -w -U10 tmp/a/psd/Pset_ElectricFlowStorageDeviceTypeInductor.xml tmp/b/psd/Pset_ElectricFlowStorageDeviceTypeInductor.xml
--- tmp/a/psd/Pset_ElectricFlowStorageDeviceTypeInductor.xml    2022-02-14 21:40:15.852932300 +0100
+++ tmp/b/psd/Pset_ElectricFlowStorageDeviceTypeInductor.xml    2022-07-09 16:02:32.161188900 +0200
@@ -16,16 +16,16 @@
         <TypePropertySingleValue>
           <DataType type="IfcInductanceMeasure"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>NumberOfPhases</Name>
       <Definition/>
       <PropertyType>
         <TypePropertySingleValue>
-          <DataType type="IfcInteger"/>
+          <DataType type="IfcCountMeasure"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
   </PropertyDefs>
 </PropertySetDef>
diff -N -w -U10 tmp/a/psd/Pset_ElectricalDeviceCommon.xml tmp/b/psd/Pset_ElectricalDeviceCommon.xml
--- tmp/a/psd/Pset_ElectricalDeviceCommon.xml   2022-02-14 21:39:58.329342500 +0100
+++ tmp/b/psd/Pset_ElectricalDeviceCommon.xml   2022-07-09 16:02:32.183184700 +0200
@@ -62,21 +62,21 @@
             <EnumItem>UNSET</EnumItem>
           </EnumList>
         </TypePropertyEnumeratedValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>NumberOfPoles</Name>
       <Definition>The number of live lines that is intended to be handled by the device.</Definition>
       <PropertyType>
         <TypePropertySingleValue>
-          <DataType type="IfcInteger"/>
+          <DataType type="IfcCountMeasure"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>HasProtectiveEarth</Name>
       <Definition>Indicates whether the electrical device has a protective earth connection (=TRUE) or not (= FALSE).</Definition>
       <PropertyType>
         <TypePropertySingleValue>
           <DataType type="IfcBoolean"/>
         </TypePropertySingleValue>
diff -N -w -U10 tmp/a/psd/Pset_ElementAssemblyTypeHeadSpan.xml tmp/b/psd/Pset_ElementAssemblyTypeHeadSpan.xml
--- tmp/a/psd/Pset_ElementAssemblyTypeHeadSpan.xml  2022-02-14 21:40:16.316517900 +0100
+++ tmp/b/psd/Pset_ElementAssemblyTypeHeadSpan.xml  2022-07-09 16:02:32.215182900 +0200
@@ -14,21 +14,21 @@
       <Definition/>
       <PropertyType>
         <TypePropertyReferenceValue reftype="IfcExternalReference"/>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>NumberOfTracksCrossed</Name>
       <Definition/>
       <PropertyType>
         <TypePropertySingleValue>
-          <DataType type="IfcInteger"/>
+          <DataType type="IfcCountMeasure"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>Span</Name>
       <Definition>Clear span for this object.

 The shape information is provided in addition to the shape representation and the geometric parameters used within. In cases of inconsistency between the geometric parameters and the shape properties, provided in the attached property, the geometric parameters take precedence. For geometry editing applications, like CAD: this value should be write-only.</Definition>
       <PropertyType>
         <TypePropertySingleValue>
diff -N -w -U10 tmp/a/psd/Pset_ElementAssemblyTypeRigidFrame.xml tmp/b/psd/Pset_ElementAssemblyTypeRigidFrame.xml
--- tmp/a/psd/Pset_ElementAssemblyTypeRigidFrame.xml    2022-02-14 21:40:16.490053500 +0100
+++ tmp/b/psd/Pset_ElementAssemblyTypeRigidFrame.xml    2022-07-09 16:02:32.250186200 +0200
@@ -23,21 +23,21 @@
         <TypePropertySingleValue>
           <DataType type="IfcForceMeasure"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>NumberOfTracksCrossed</Name>
       <Definition/>
       <PropertyType>
         <TypePropertySingleValue>
-          <DataType type="IfcInteger"/>
+          <DataType type="IfcCountMeasure"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>Span</Name>
       <Definition>Clear span for this object.

 The shape information is provided in addition to the shape representation and the geometric parameters used within. In cases of inconsistency between the geometric parameters and the shape properties, provided in the attached property, the geometric parameters take precedence. For geometry editing applications, like CAD: this value should be write-only.</Definition>
       <PropertyType>
         <TypePropertySingleValue>
diff -N -w -U10 tmp/a/psd/Pset_ElementAssemblyTypeSupportingAssembly.xml tmp/b/psd/Pset_ElementAssemblyTypeSupportingAssembly.xml
--- tmp/a/psd/Pset_ElementAssemblyTypeSupportingAssembly.xml    2022-02-14 21:40:16.666581800 +0100
+++ tmp/b/psd/Pset_ElementAssemblyTypeSupportingAssembly.xml    2022-07-09 16:02:32.285183000 +0200
@@ -7,21 +7,21 @@
   <ApplicableClasses>
     <ClassName>IfcElementAssembly/SUPPORTINGASSEMBLY</ClassName>
   </ApplicableClasses>
   <ApplicableTypeValue>IfcElementAssembly/SUPPORTINGASSEMBLY</ApplicableTypeValue>
   <PropertyDefs>
     <PropertyDef>
       <Name>NumberOfCantilevers</Name>
       <Definition/>
       <PropertyType>
         <TypePropertySingleValue>
-          <DataType type="IfcInteger"/>
+          <DataType type="IfcCountMeasure"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>TypeOfSupportingSystem</Name>
       <Definition/>
       <PropertyType>
         <TypePropertyEnumeratedValue>
           <EnumList name="PEnum_SupportingSystemType">
             <EnumItem>ENDCATENARYSUPPORT</EnumItem>
diff -N -w -U10 tmp/a/psd/Pset_FireSuppressionTerminalTypeFireHydrant.xml tmp/b/psd/Pset_FireSuppressionTerminalTypeFireHydrant.xml
--- tmp/a/psd/Pset_FireSuppressionTerminalTypeFireHydrant.xml   2022-02-14 21:40:07.622069500 +0100
+++ tmp/b/psd/Pset_FireSuppressionTerminalTypeFireHydrant.xml   2022-07-09 16:02:32.309179800 +0200
@@ -36,21 +36,21 @@
         <TypePropertySingleValue>
           <DataType type="IfcPositiveLengthMeasure"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>NumberOfHoseConnections</Name>
       <Definition>The number of hose connections on the hydrant (excluding the pumper connection).</Definition>
       <PropertyType>
         <TypePropertySingleValue>
-          <DataType type="IfcInteger"/>
+          <DataType type="IfcCountMeasure"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>HoseConnectionSize</Name>
       <Definition>The size of connections to which a hose may be connected (other than that to be linked to a pumping unit).</Definition>
       <PropertyType>
         <TypePropertySingleValue>
           <DataType type="IfcPositiveLengthMeasure"/>
         </TypePropertySingleValue>
diff -N -w -U10 tmp/a/psd/Pset_FurnitureTypeTable.xml tmp/b/psd/Pset_FurnitureTypeTable.xml
--- tmp/a/psd/Pset_FurnitureTypeTable.xml   2022-02-14 21:40:26.934401800 +0100
+++ tmp/b/psd/Pset_FurnitureTypeTable.xml   2022-07-09 16:02:32.338182400 +0200
@@ -16,16 +16,16 @@
         <TypePropertySingleValue>
           <DataType type="IfcAreaMeasure"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>NumberOfChairs</Name>
       <Definition>Maximum number of chairs that can fit with the table for normal use.</Definition>
       <PropertyType>
         <TypePropertySingleValue>
-          <DataType type="IfcInteger"/>
+          <DataType type="IfcCountMeasure"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
   </PropertyDefs>
 </PropertySetDef>
diff -N -w -U10 tmp/a/psd/Pset_HeatExchangerTypePlate.xml tmp/b/psd/Pset_HeatExchangerTypePlate.xml
--- tmp/a/psd/Pset_HeatExchangerTypePlate.xml   2022-02-14 21:40:04.638656300 +0100
+++ tmp/b/psd/Pset_HeatExchangerTypePlate.xml   2022-07-09 16:02:32.358182300 +0200
@@ -7,16 +7,16 @@
   <ApplicableClasses>
     <ClassName>IfcHeatExchanger/PLATE</ClassName>
   </ApplicableClasses>
   <ApplicableTypeValue>IfcHeatExchanger/PLATE</ApplicableTypeValue>
   <PropertyDefs>
     <PropertyDef>
       <Name>NumberOfPlates</Name>
       <Definition>Number of plates used by the plate heat exchanger.</Definition>
       <PropertyType>
         <TypePropertySingleValue>
-          <DataType type="IfcInteger"/>
+          <DataType type="IfcCountMeasure"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
   </PropertyDefs>
 </PropertySetDef>
aothms commented 2 years ago 
diff -N -w -U10 tmp/a/psd/Pset_LightFixtureTypeCommon.xml tmp/b/psd/Pset_LightFixtureTypeCommon.xml
--- tmp/a/psd/Pset_LightFixtureTypeCommon.xml   2022-02-14 21:39:58.790323000 +0100
+++ tmp/b/psd/Pset_LightFixtureTypeCommon.xml   2022-07-09 16:02:32.378182800 +0200
@@ -34,21 +34,21 @@
             <EnumItem>UNSET</EnumItem>
           </EnumList>
         </TypePropertyEnumeratedValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>NumberOfSources</Name>
       <Definition>Number of sources .</Definition>
       <PropertyType>
         <TypePropertySingleValue>
-          <DataType type="IfcInteger"/>
+          <DataType type="IfcCountMeasure"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>TotalWattage</Name>
       <Definition>Wattage on whole lightfitting device with all sources intact.</Definition>
       <PropertyType>
         <TypePropertySingleValue>
           <DataType type="IfcPowerMeasure"/>
         </TypePropertySingleValue>
diff -N -w -U10 tmp/a/psd/Pset_MechanicalFastenerTypeRailJoint.xml tmp/b/psd/Pset_MechanicalFastenerTypeRailJoint.xml
--- tmp/a/psd/Pset_MechanicalFastenerTypeRailJoint.xml  2022-02-14 21:40:17.689167100 +0100
+++ tmp/b/psd/Pset_MechanicalFastenerTypeRailJoint.xml  2022-07-09 16:02:32.410184700 +0200
@@ -49,21 +49,21 @@
         <TypePropertySingleValue>
           <DataType type="IfcBoolean"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>NumberOfScrews</Name>
       <Definition/>
       <PropertyType>
         <TypePropertySingleValue>
-          <DataType type="IfcInteger"/>
+          <DataType type="IfcCountMeasure"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>RailGap</Name>
       <Definition/>
       <PropertyType>
         <TypePropertySingleValue>
           <DataType type="IfcPositiveLengthMeasure"/>
         </TypePropertySingleValue>
diff -N -w -U10 tmp/a/psd/Pset_MobileTeleCommunicationsApplianceTypeRemoteRadioUnit.xml tmp/b/psd/Pset_MobileTeleCommunicationsApplianceTypeRemoteRadioUnit.xml
--- tmp/a/psd/Pset_MobileTeleCommunicationsApplianceTypeRemoteRadioUnit.xml 2022-02-14 21:40:18.642465000 +0100
+++ tmp/b/psd/Pset_MobileTeleCommunicationsApplianceTypeRemoteRadioUnit.xml 2022-07-09 16:02:32.434182500 +0200
@@ -16,21 +16,21 @@
         <TypePropertyBoundedValue>
           <DataType type="IfcFrequencyMeasure"/>
         </TypePropertyBoundedValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>NumberOfCarriers</Name>
       <Definition/>
       <PropertyType>
         <TypePropertySingleValue>
-          <DataType type="IfcInteger"/>
+          <DataType type="IfcCountMeasure"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>NumberOfInterfaces</Name>
       <Definition/>
       <PropertyType>
         <TypePropertyTableValue>
           <Expression/>
           <DefiningValue>
diff -N -w -U10 tmp/a/psd/Pset_MobileTelecommunicationsApplianceTypeAccessPoint.xml tmp/b/psd/Pset_MobileTelecommunicationsApplianceTypeAccessPoint.xml
--- tmp/a/psd/Pset_MobileTelecommunicationsApplianceTypeAccessPoint.xml 2022-02-14 21:40:18.049058500 +0100
+++ tmp/b/psd/Pset_MobileTelecommunicationsApplianceTypeAccessPoint.xml 2022-07-09 16:02:32.455182800 +0200
@@ -34,21 +34,21 @@
         <TypePropertySingleValue>
           <DataType type="IfcIntegerCountRateMeasure"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>NumberOfAntennas</Name>
       <Definition/>
       <PropertyType>
         <TypePropertySingleValue>
-          <DataType type="IfcInteger"/>
+          <DataType type="IfcCountMeasure"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>NumberOfInterfaces</Name>
       <Definition/>
       <PropertyType>
         <TypePropertyTableValue>
           <Expression/>
           <DefiningValue>
diff -N -w -U10 tmp/a/psd/Pset_MobileTelecommunicationsApplianceTypeBaseTransceiverStation.xml tmp/b/psd/Pset_MobileTelecommunicationsApplianceTypeBaseTransceiverStation.xml
--- tmp/a/psd/Pset_MobileTelecommunicationsApplianceTypeBaseTransceiverStation.xml  2022-02-14 21:40:18.175715300 +0100
+++ tmp/b/psd/Pset_MobileTelecommunicationsApplianceTypeBaseTransceiverStation.xml  2022-07-09 16:02:32.475185600 +0200
@@ -16,30 +16,30 @@
         <TypePropertyBoundedValue>
           <DataType type="IfcFrequencyMeasure"/>
         </TypePropertyBoundedValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>NumberOfCarriers</Name>
       <Definition/>
       <PropertyType>
         <TypePropertySingleValue>
-          <DataType type="IfcInteger"/>
+          <DataType type="IfcCountMeasure"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>NumberOfAntennas</Name>
       <Definition/>
       <PropertyType>
         <TypePropertySingleValue>
-          <DataType type="IfcInteger"/>
+          <DataType type="IfcCountMeasure"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>UplinkRadioBand</Name>
       <Definition/>
       <PropertyType>
         <TypePropertyBoundedValue>
           <DataType type="IfcFrequencyMeasure"/>
         </TypePropertyBoundedValue>
@@ -52,21 +52,21 @@
         <TypePropertySingleValue>
           <DataType type="IfcInteger"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>NumberOfEmergencyTransceivers</Name>
       <Definition/>
       <PropertyType>
         <TypePropertySingleValue>
-          <DataType type="IfcInteger"/>
+          <DataType type="IfcCountMeasure"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>NumberOfTransceiversPerAntenna</Name>
       <Definition/>
       <PropertyType>
         <TypePropertyTableValue>
           <Expression/>
           <DefiningValue>
diff -N -w -U10 tmp/a/psd/Pset_MobileTelecommunicationsApplianceTypeBasebandUnit.xml tmp/b/psd/Pset_MobileTelecommunicationsApplianceTypeBasebandUnit.xml
--- tmp/a/psd/Pset_MobileTelecommunicationsApplianceTypeBasebandUnit.xml    2022-02-14 21:40:18.111883900 +0100
+++ tmp/b/psd/Pset_MobileTelecommunicationsApplianceTypeBasebandUnit.xml    2022-07-09 16:02:32.501185200 +0200
@@ -7,21 +7,21 @@
   <ApplicableClasses>
     <ClassName>IfcMobileTelecommunicationsAppliance/BASEBANDUNIT</ClassName>
   </ApplicableClasses>
   <ApplicableTypeValue>IfcMobileTelecommunicationsAppliance/BASEBANDUNIT</ApplicableTypeValue>
   <PropertyDefs>
     <PropertyDef>
       <Name>NumberOfCarriers</Name>
       <Definition/>
       <PropertyType>
         <TypePropertySingleValue>
-          <DataType type="IfcInteger"/>
+          <DataType type="IfcCountMeasure"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>NumberOfInterfaces</Name>
       <Definition/>
       <PropertyType>
         <TypePropertyTableValue>
           <Expression/>
           <DefiningValue>
@@ -31,21 +31,21 @@
             <DataType type="IfcInteger"/>
           </DefinedValue>
         </TypePropertyTableValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>NumberOfEmergencyTransceivers</Name>
       <Definition/>
       <PropertyType>
         <TypePropertySingleValue>
-          <DataType type="IfcInteger"/>
+          <DataType type="IfcCountMeasure"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>MaximumNumberOfRRUs</Name>
       <Definition/>
       <PropertyType>
         <TypePropertySingleValue>
           <DataType type="IfcInteger"/>
         </TypePropertySingleValue>
diff -N -w -U10 tmp/a/psd/Pset_MobileTelecommunicationsApplianceTypeEUtranNodeB.xml tmp/b/psd/Pset_MobileTelecommunicationsApplianceTypeEUtranNodeB.xml
--- tmp/a/psd/Pset_MobileTelecommunicationsApplianceTypeEUtranNodeB.xml 2022-02-14 21:40:18.288412000 +0100
+++ tmp/b/psd/Pset_MobileTelecommunicationsApplianceTypeEUtranNodeB.xml 2022-07-09 16:02:32.536184800 +0200
@@ -16,21 +16,21 @@
         <TypePropertyBoundedValue>
           <DataType type="IfcFrequencyMeasure"/>
         </TypePropertyBoundedValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>NumberOfCarriers</Name>
       <Definition/>
       <PropertyType>
         <TypePropertySingleValue>
-          <DataType type="IfcInteger"/>
+          <DataType type="IfcCountMeasure"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>RadiatedOutputPowerPerAntenna</Name>
       <Definition/>
       <PropertyType>
         <TypePropertyTableValue>
           <Expression/>
           <DefiningValue>
@@ -40,21 +40,21 @@
             <DataType type="IfcPowerMeasure"/>
           </DefinedValue>
         </TypePropertyTableValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>NumberOfAntennas</Name>
       <Definition/>
       <PropertyType>
         <TypePropertySingleValue>
-          <DataType type="IfcInteger"/>
+          <DataType type="IfcCountMeasure"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>NumberOfInterfaces</Name>
       <Definition/>
       <PropertyType>
         <TypePropertyTableValue>
           <Expression/>
           <DefiningValue>
diff -N -w -U10 tmp/a/psd/Pset_MobileTelecommunicationsApplianceTypeRemoteUnit.xml tmp/b/psd/Pset_MobileTelecommunicationsApplianceTypeRemoteUnit.xml
--- tmp/a/psd/Pset_MobileTelecommunicationsApplianceTypeRemoteUnit.xml  2022-02-14 21:40:18.707290400 +0100
+++ tmp/b/psd/Pset_MobileTelecommunicationsApplianceTypeRemoteUnit.xml  2022-07-09 16:02:32.557181100 +0200
@@ -22,21 +22,21 @@
             <DataType type="IfcInteger"/>
           </DefinedValue>
         </TypePropertyTableValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>NumberOfAntennas</Name>
       <Definition/>
       <PropertyType>
         <TypePropertySingleValue>
-          <DataType type="IfcInteger"/>
+          <DataType type="IfcCountMeasure"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>RUConnectionType</Name>
       <Definition/>
       <PropertyType>
         <TypePropertyEnumeratedValue>
           <EnumList name="PEnum_UnitConnectionType">
             <EnumItem>CHAIN</EnumItem>
aothms commented 2 years ago 
diff -N -w -U10 tmp/a/psd/Pset_OpticalSplitter.xml tmp/b/psd/Pset_OpticalSplitter.xml
--- tmp/a/psd/Pset_OpticalSplitter.xml  2022-02-14 21:40:18.977610900 +0100
+++ tmp/b/psd/Pset_OpticalSplitter.xml  2022-07-09 16:02:32.587189800 +0200
@@ -7,21 +7,21 @@
   <ApplicableClasses>
     <ClassName>IfcJunctionBox/DATA</ClassName>
   </ApplicableClasses>
   <ApplicableTypeValue>IfcJunctionBox/DATA</ApplicableTypeValue>
   <PropertyDefs>
     <PropertyDef>
       <Name>NumberOfBranches</Name>
       <Definition/>
       <PropertyType>
         <TypePropertySingleValue>
-          <DataType type="IfcInteger"/>
+          <DataType type="IfcCountMeasure"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>OpticalSplitterType</Name>
       <Definition/>
       <PropertyType>
         <TypePropertyEnumeratedValue>
           <EnumList name="PEnum_OpticalSplitterType">
             <EnumItem>MULTIMODE</EnumItem>
diff -N -w -U10 tmp/a/psd/Pset_OutletTypeCommon.xml tmp/b/psd/Pset_OutletTypeCommon.xml
--- tmp/a/psd/Pset_OutletTypeCommon.xml 2022-02-14 21:39:58.956878800 +0100
+++ tmp/b/psd/Pset_OutletTypeCommon.xml 2022-07-09 16:02:32.606181300 +0200
@@ -42,16 +42,16 @@
         <TypePropertySingleValue>
           <DataType type="IfcLogical"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>NumberOfSockets</Name>
       <Definition>The number of sockets that may be connected. In case of inconsistency, sockets defined on ports take precedence.</Definition>
       <PropertyType>
         <TypePropertySingleValue>
-          <DataType type="IfcInteger"/>
+          <DataType type="IfcCountMeasure"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
   </PropertyDefs>
 </PropertySetDef>
diff -N -w -U10 tmp/a/psd/Pset_PipeConnectionFlanged.xml tmp/b/psd/Pset_PipeConnectionFlanged.xml
--- tmp/a/psd/Pset_PipeConnectionFlanged.xml    2022-02-14 21:40:04.778793200 +0100
+++ tmp/b/psd/Pset_PipeConnectionFlanged.xml    2022-07-09 16:02:32.625181100 +0200
@@ -52,21 +52,21 @@
         <TypePropertySingleValue>
           <DataType type="IfcPositiveLengthMeasure"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>NumberOfBoltholes</Name>
       <Definition>Number of boltholes in the flange.</Definition>
       <PropertyType>
         <TypePropertySingleValue>
-          <DataType type="IfcInteger"/>
+          <DataType type="IfcCountMeasure"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>BoltSize</Name>
       <Definition>Size of the bolts securing the flange.</Definition>
       <PropertyType>
         <TypePropertySingleValue>
           <DataType type="IfcPositiveLengthMeasure"/>
         </TypePropertySingleValue>
diff -N -w -U10 tmp/a/psd/Pset_ProtectiveDeviceTypeFuseDisconnector.xml tmp/b/psd/Pset_ProtectiveDeviceTypeFuseDisconnector.xml
--- tmp/a/psd/Pset_ProtectiveDeviceTypeFuseDisconnector.xml 2022-02-14 21:39:59.853541400 +0100
+++ tmp/b/psd/Pset_ProtectiveDeviceTypeFuseDisconnector.xml 2022-07-09 16:02:32.654188800 +0200
@@ -69,21 +69,21 @@
         <TypePropertySingleValue>
           <DataType type="IfcPowerMeasure"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>NumberOfPhases</Name>
       <Definition/>
       <PropertyType>
         <TypePropertySingleValue>
-          <DataType type="IfcInteger"/>
+          <DataType type="IfcCountMeasure"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>ReferenceEnvironmentTemperature</Name>
       <Definition/>
       <PropertyType>
         <TypePropertyBoundedValue>
           <DataType type="IfcThermodynamicTemperatureMeasure"/>
         </TypePropertyBoundedValue>
@@ -105,21 +105,21 @@
         <TypePropertySingleValue>
           <DataType type="IfcLabel"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>NumberOfPoles</Name>
       <Definition>The number of live lines that is intended to be handled by the device.</Definition>
       <PropertyType>
         <TypePropertySingleValue>
-          <DataType type="IfcInteger"/>
+          <DataType type="IfcCountMeasure"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>TransformationRatio</Name>
       <Definition/>
       <PropertyType>
         <TypePropertySingleValue>
           <DataType type="IfcRatioMeasure"/>
         </TypePropertySingleValue>
diff -N -w -U10 tmp/a/psd/Pset_RailwayCableCarrier.xml tmp/b/psd/Pset_RailwayCableCarrier.xml
--- tmp/a/psd/Pset_RailwayCableCarrier.xml  2022-02-14 21:40:20.044740000 +0100
+++ tmp/b/psd/Pset_RailwayCableCarrier.xml  2022-07-09 16:02:32.681185300 +0200
@@ -7,16 +7,16 @@
   <ApplicableClasses>
     <ClassName>IfcCableCarrierSegment</ClassName>
   </ApplicableClasses>
   <ApplicableTypeValue>IfcCableCarrierSegment</ApplicableTypeValue>
   <PropertyDefs>
     <PropertyDef>
       <Name>NumberOfCrossedTracks</Name>
       <Definition/>
       <PropertyType>
         <TypePropertySingleValue>
-          <DataType type="IfcInteger"/>
+          <DataType type="IfcCountMeasure"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
   </PropertyDefs>
 </PropertySetDef>
diff -N -w -U10 tmp/a/psd/Pset_RailwaySignalOccurrence.xml tmp/b/psd/Pset_RailwaySignalOccurrence.xml
--- tmp/a/psd/Pset_RailwaySignalOccurrence.xml  2022-02-14 21:40:20.139452600 +0100
+++ tmp/b/psd/Pset_RailwaySignalOccurrence.xml  2022-07-09 16:02:32.708184800 +0200
@@ -34,21 +34,21 @@
         <TypePropertySingleValue>
           <DataType type="IfcText"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>NumberOfLampsNotUsed</Name>
       <Definition/>
       <PropertyType>
         <TypePropertySingleValue>
-          <DataType type="IfcInteger"/>
+          <DataType type="IfcCountMeasure"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>RequiresOLEMesh</Name>
       <Definition/>
       <PropertyType>
         <TypePropertySingleValue>
           <DataType type="IfcBoolean"/>
         </TypePropertySingleValue>
diff -N -w -U10 tmp/a/psd/Pset_RailwaySignalType.xml tmp/b/psd/Pset_RailwaySignalType.xml
--- tmp/a/psd/Pset_RailwaySignalType.xml    2022-02-14 21:40:20.196299700 +0100
+++ tmp/b/psd/Pset_RailwaySignalType.xml    2022-07-09 16:02:32.741182000 +0200
@@ -99,21 +99,21 @@
         <TypePropertySingleValue>
           <DataType type="IfcLabel"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>NumberOfLamps</Name>
       <Definition/>
       <PropertyType>
         <TypePropertySingleValue>
-          <DataType type="IfcInteger"/>
+          <DataType type="IfcCountMeasure"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>SignalMessage</Name>
       <Definition/>
       <PropertyType>
         <TypePropertySingleValue>
           <DataType type="IfcText"/>
         </TypePropertySingleValue>
diff -N -w -U10 tmp/a/psd/Pset_ReinforcementBarCountOfIndependentFooting.xml tmp/b/psd/Pset_ReinforcementBarCountOfIndependentFooting.xml
--- tmp/a/psd/Pset_ReinforcementBarCountOfIndependentFooting.xml    2022-02-14 21:40:28.094360500 +0100
+++ tmp/b/psd/Pset_ReinforcementBarCountOfIndependentFooting.xml    2022-07-09 16:02:32.780185700 +0200
@@ -25,43 +25,43 @@
         <TypePropertySingleValue>
           <DataType type="IfcLabel"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>XDirectionLowerBarCount</Name>
       <Definition>The number of bars with X direction lower bar.</Definition>
       <PropertyType>
         <TypePropertySingleValue>
-          <DataType type="IfcInteger"/>
+          <DataType type="IfcCountMeasure"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>YDirectionLowerBarCount</Name>
       <Definition>The number of bars with Y direction lower bar.</Definition>
       <PropertyType>
         <TypePropertySingleValue>
-          <DataType type="IfcInteger"/>
+          <DataType type="IfcCountMeasure"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>XDirectionUpperBarCount</Name>
       <Definition>The number of bars with X direction upper bar.</Definition>
       <PropertyType>
         <TypePropertySingleValue>
-          <DataType type="IfcInteger"/>
+          <DataType type="IfcCountMeasure"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>YDirectionUpperBarCount</Name>
       <Definition>The number of bars with Y direction upper bar.</Definition>
       <PropertyType>
         <TypePropertySingleValue>
-          <DataType type="IfcInteger"/>
+          <DataType type="IfcCountMeasure"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
   </PropertyDefs>
 </PropertySetDef>
diff -N -w -U10 tmp/a/psd/Pset_ReinforcementBarPitchOfColumn.xml tmp/b/psd/Pset_ReinforcementBarPitchOfColumn.xml
--- tmp/a/psd/Pset_ReinforcementBarPitchOfColumn.xml    2022-02-14 21:40:28.123283400 +0100
+++ tmp/b/psd/Pset_ReinforcementBarPitchOfColumn.xml    2022-07-09 16:02:32.800187900 +0200
@@ -58,34 +58,34 @@
         <TypePropertySingleValue>
           <DataType type="IfcPositiveLengthMeasure"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>XDirectionTieHoopCount</Name>
       <Definition>The number of bars with X direction tie hoop bars.</Definition>
       <PropertyType>
         <TypePropertySingleValue>
-          <DataType type="IfcInteger"/>
+          <DataType type="IfcCountMeasure"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>YDirectionTieHoopBarPitch</Name>
       <Definition>The Y direction pitch length of the tie hoop.</Definition>
       <PropertyType>
         <TypePropertySingleValue>
           <DataType type="IfcPositiveLengthMeasure"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>YDirectionTieHoopCount</Name>
       <Definition>The number of bars with Y direction tie hoop bars.</Definition>
       <PropertyType>
         <TypePropertySingleValue>
-          <DataType type="IfcInteger"/>
+          <DataType type="IfcCountMeasure"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
   </PropertyDefs>
 </PropertySetDef>
aothms commented 2 years ago 
diff -N -w -U10 tmp/a/psd/Pset_SectionInsulator.xml tmp/b/psd/Pset_SectionInsulator.xml
--- tmp/a/psd/Pset_SectionInsulator.xml 2022-02-14 21:40:20.570866200 +0100
+++ tmp/b/psd/Pset_SectionInsulator.xml 2022-07-09 16:02:32.835181800 +0200
@@ -16,21 +16,21 @@
         <TypePropertySingleValue>
           <DataType type="IfcElectricResistanceMeasure"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>NumberOfWires</Name>
       <Definition/>
       <PropertyType>
         <TypePropertySingleValue>
-          <DataType type="IfcInteger"/>
+          <DataType type="IfcCountMeasure"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>IsArcSuppressing</Name>
       <Definition/>
       <PropertyType>
         <TypePropertySingleValue>
           <DataType type="IfcBoolean"/>
         </TypePropertySingleValue>
diff -N -w -U10 tmp/a/psd/Pset_SpaceHeaterTypeCommon.xml tmp/b/psd/Pset_SpaceHeaterTypeCommon.xml
--- tmp/a/psd/Pset_SpaceHeaterTypeCommon.xml    2022-02-14 21:40:05.300435000 +0100
+++ tmp/b/psd/Pset_SpaceHeaterTypeCommon.xml    2022-07-09 16:02:32.866183500 +0200
@@ -158,27 +158,27 @@
         <TypePropertySingleValue>
           <DataType type="IfcNormalisedRatioMeasure"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>NumberOfPanels</Name>
       <Definition>Number of panels.</Definition>
       <PropertyType>
         <TypePropertySingleValue>
-          <DataType type="IfcInteger"/>
+          <DataType type="IfcCountMeasure"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>NumberOfSections</Name>
       <Definition>Number of sections used in the construction of the tank. Default is 1.

 Note: All sections assumed to be the same size.</Definition>
       <PropertyType>
         <TypePropertySingleValue>
-          <DataType type="IfcInteger"/>
+          <DataType type="IfcCountMeasure"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
   </PropertyDefs>
 </PropertySetDef>
diff -N -w -U10 tmp/a/psd/Pset_SwitchingDeviceTypeCommon.xml tmp/b/psd/Pset_SwitchingDeviceTypeCommon.xml
--- tmp/a/psd/Pset_SwitchingDeviceTypeCommon.xml    2022-02-14 21:40:00.072481700 +0100
+++ tmp/b/psd/Pset_SwitchingDeviceTypeCommon.xml    2022-07-09 16:02:32.901182500 +0200
@@ -33,21 +33,21 @@
             <EnumItem>UNSET</EnumItem>
           </EnumList>
         </TypePropertyEnumeratedValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>NumberOfGangs</Name>
       <Definition>Number of slots available for switches/outlets (most commonly 1, 2, 3, or 4).</Definition>
       <PropertyType>
         <TypePropertySingleValue>
-          <DataType type="IfcInteger"/>
+          <DataType type="IfcCountMeasure"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>SwitchFunction</Name>
       <Definition>Indicates types of switches which differs in functionality.</Definition>
       <PropertyType>
         <TypePropertyEnumeratedValue>
           <EnumList name="PEnum_SwitchFunctionType">
             <EnumItem>DOUBLETHROWSWITCH</EnumItem>
diff -N -w -U10 tmp/a/psd/Pset_SwitchingDeviceTypeEmergencyStop.xml tmp/b/psd/Pset_SwitchingDeviceTypeEmergencyStop.xml
--- tmp/a/psd/Pset_SwitchingDeviceTypeEmergencyStop.xml 2022-02-14 21:40:00.271983100 +0100
+++ tmp/b/psd/Pset_SwitchingDeviceTypeEmergencyStop.xml 2022-07-09 16:02:32.935179400 +0200
@@ -21,21 +21,21 @@
             <EnumItem>UNSET</EnumItem>
           </EnumList>
         </TypePropertyEnumeratedValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>NumberOfPhases</Name>
       <Definition/>
       <PropertyType>
         <TypePropertySingleValue>
-          <DataType type="IfcInteger"/>
+          <DataType type="IfcCountMeasure"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>ReferenceEnvironmentTemperature</Name>
       <Definition/>
       <PropertyType>
         <TypePropertyBoundedValue>
           <DataType type="IfcThermodynamicTemperatureMeasure"/>
         </TypePropertyBoundedValue>
@@ -48,57 +48,57 @@
         <TypePropertySingleValue>
           <DataType type="IfcElectricCurrentMeasure"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>NumberOfEarthFaultRelays</Name>
       <Definition/>
       <PropertyType>
         <TypePropertySingleValue>
-          <DataType type="IfcInteger"/>
+          <DataType type="IfcCountMeasure"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>NumberOfEmergencyButtons</Name>
       <Definition/>
       <PropertyType>
         <TypePropertySingleValue>
-          <DataType type="IfcInteger"/>
+          <DataType type="IfcCountMeasure"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>NumberOfRelays</Name>
       <Definition/>
       <PropertyType>
         <TypePropertySingleValue>
-          <DataType type="IfcInteger"/>
+          <DataType type="IfcCountMeasure"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>NumberOfOverCurrentRelays</Name>
       <Definition/>
       <PropertyType>
         <TypePropertySingleValue>
-          <DataType type="IfcInteger"/>
+          <DataType type="IfcCountMeasure"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>NumberOfAffectedPoles</Name>
       <Definition/>
       <PropertyType>
         <TypePropertySingleValue>
-          <DataType type="IfcInteger"/>
+          <DataType type="IfcCountMeasure"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>NominalCurrent</Name>
       <Definition>A set of nominal currents in [A] for which the data of this instance is valid. At least one value shall be provided. Any value in the set shall not exceed the value of the 
 UltimateRatedCurrent associated with the same breaker unit.</Definition>
       <PropertyType>
         <TypePropertySingleValue>
           <DataType type="IfcElectricCurrentMeasure"/>
diff -N -w -U10 tmp/a/psd/Pset_SwitchingDeviceTypeSelectorSwitch.xml tmp/b/psd/Pset_SwitchingDeviceTypeSelectorSwitch.xml
--- tmp/a/psd/Pset_SwitchingDeviceTypeSelectorSwitch.xml    2022-02-14 21:40:00.509313600 +0100
+++ tmp/b/psd/Pset_SwitchingDeviceTypeSelectorSwitch.xml    2022-07-09 16:02:32.964183500 +0200
@@ -89,21 +89,21 @@
         <TypePropertySingleValue>
           <DataType type="IfcFrequencyMeasure"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>NumberOfPhases</Name>
       <Definition/>
       <PropertyType>
         <TypePropertySingleValue>
-          <DataType type="IfcInteger"/>
+          <DataType type="IfcCountMeasure"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>NominalPower</Name>
       <Definition/>
       <PropertyType>
         <TypePropertySingleValue>
           <DataType type="IfcPowerMeasure"/>
         </TypePropertySingleValue>
diff -N -w -U10 tmp/a/psd/Pset_SymmetricPairCable.xml tmp/b/psd/Pset_SymmetricPairCable.xml
--- tmp/a/psd/Pset_SymmetricPairCable.xml   2022-02-14 21:40:21.286918900 +0100
+++ tmp/b/psd/Pset_SymmetricPairCable.xml   2022-07-09 16:02:32.998181900 +0200
@@ -7,25 +7,25 @@
   <ApplicableClasses>
     <ClassName>IfcCableSegment/CABLESEGMENT</ClassName>
   </ApplicableClasses>
   <ApplicableTypeValue>IfcCableSegment/CABLESEGMENT</ApplicableTypeValue>
   <PropertyDefs>
     <PropertyDef>
       <Name>NumberOfTwistedPairs</Name>
       <Definition/>
       <PropertyType>
         <TypePropertySingleValue>
-          <DataType type="IfcInteger"/>
+          <DataType type="IfcCountMeasure"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>NumberOfUntwistedPairs</Name>
       <Definition/>
       <PropertyType>
         <TypePropertySingleValue>
-          <DataType type="IfcInteger"/>
+          <DataType type="IfcCountMeasure"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
   </PropertyDefs>
 </PropertySetDef>
diff -N -w -U10 tmp/a/psd/Pset_SystemFurnitureElementTypeSubrack.xml tmp/b/psd/Pset_SystemFurnitureElementTypeSubrack.xml
--- tmp/a/psd/Pset_SystemFurnitureElementTypeSubrack.xml    2022-02-14 21:40:21.338779600 +0100
+++ tmp/b/psd/Pset_SystemFurnitureElementTypeSubrack.xml    2022-07-09 16:02:33.039183500 +0200
@@ -7,34 +7,34 @@
   <ApplicableClasses>
     <ClassName>IfcSystemFurnitureElement/SUBRACK</ClassName>
   </ApplicableClasses>
   <ApplicableTypeValue>IfcSystemFurnitureElement/SUBRACK</ApplicableTypeValue>
   <PropertyDefs>
     <PropertyDef>
       <Name>NumberOfSlots</Name>
       <Definition>Number of slots.</Definition>
       <PropertyType>
         <TypePropertySingleValue>
-          <DataType type="IfcInteger"/>
+          <DataType type="IfcCountMeasure"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>NumberOfUnits</Name>
       <Definition/>
       <PropertyType>
         <TypePropertySingleValue>
-          <DataType type="IfcInteger"/>
+          <DataType type="IfcCountMeasure"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>NumberOfOccupiedUnits</Name>
       <Definition/>
       <PropertyType>
         <TypePropertySingleValue>
-          <DataType type="IfcInteger"/>
+          <DataType type="IfcCountMeasure"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
   </PropertyDefs>
 </PropertySetDef>
aothms commented 2 years ago 
diff -N -w -U10 tmp/a/psd/Pset_TankTypeCommon.xml tmp/b/psd/Pset_TankTypeCommon.xml
--- tmp/a/psd/Pset_TankTypeCommon.xml   2022-02-14 21:40:05.611099400 +0100
+++ tmp/b/psd/Pset_TankTypeCommon.xml   2022-07-09 16:02:33.075184700 +0200
@@ -183,16 +183,16 @@
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>NumberOfSections</Name>
       <Definition>Number of sections used in the construction of the tank. Default is 1.

 Note: All sections assumed to be the same size.</Definition>
       <PropertyType>
         <TypePropertySingleValue>
-          <DataType type="IfcInteger"/>
+          <DataType type="IfcCountMeasure"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
   </PropertyDefs>
 </PropertySetDef>
diff -N -w -U10 tmp/a/psd/Pset_TankTypeSectional.xml tmp/b/psd/Pset_TankTypeSectional.xml
--- tmp/a/psd/Pset_TankTypeSectional.xml    2022-02-14 21:40:05.778649100 +0100
+++ tmp/b/psd/Pset_TankTypeSectional.xml    2022-07-09 16:02:33.107181900 +0200
@@ -14,21 +14,21 @@
   </ApplicableClasses>
   <ApplicableTypeValue>IfcTank</ApplicableTypeValue>
   <PropertyDefs>
     <PropertyDef>
       <Name>NumberOfSections</Name>
       <Definition>Number of sections used in the construction of the tank. Default is 1.

 Note: All sections assumed to be the same size.</Definition>
       <PropertyType>
         <TypePropertySingleValue>
-          <DataType type="IfcInteger"/>
+          <DataType type="IfcCountMeasure"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>SectionLength</Name>
       <Definition>The length of a section used in the construction of the tank.</Definition>
       <PropertyType>
         <TypePropertySingleValue>
           <DataType type="IfcPositiveLengthMeasure"/>
         </TypePropertySingleValue>
diff -N -w -U10 tmp/a/psd/Pset_TrackElementTypeSleeper.xml tmp/b/psd/Pset_TrackElementTypeSleeper.xml
--- tmp/a/psd/Pset_TrackElementTypeSleeper.xml  2022-02-14 21:40:22.010636100 +0100
+++ tmp/b/psd/Pset_TrackElementTypeSleeper.xml  2022-07-09 16:02:33.138183100 +0200
@@ -77,21 +77,21 @@
         <TypePropertySingleValue>
           <DataType type="IfcLabel"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>NumberOfTrackCenters</Name>
       <Definition/>
       <PropertyType>
         <TypePropertySingleValue>
-          <DataType type="IfcInteger"/>
+          <DataType type="IfcCountMeasure"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>IsHollowSleeper</Name>
       <Definition/>
       <PropertyType>
         <TypePropertySingleValue>
           <DataType type="IfcBoolean"/>
         </TypePropertySingleValue>
diff -N -w -U10 tmp/a/psd/Pset_UnitaryControlElementBaseStationController.xml tmp/b/psd/Pset_UnitaryControlElementBaseStationController.xml
--- tmp/a/psd/Pset_UnitaryControlElementBaseStationController.xml   2022-02-14 21:40:22.290408300 +0100
+++ tmp/b/psd/Pset_UnitaryControlElementBaseStationController.xml   2022-07-09 16:02:33.160184300 +0200
@@ -22,25 +22,25 @@
             <DataType type="IfcInteger"/>
           </DefinedValue>
         </TypePropertyTableValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>NumberOfManagedBTSs</Name>
       <Definition/>
       <PropertyType>
         <TypePropertySingleValue>
-          <DataType type="IfcInteger"/>
+          <DataType type="IfcCountMeasure"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>NumberOfManagedCarriers</Name>
       <Definition/>
       <PropertyType>
         <TypePropertySingleValue>
-          <DataType type="IfcInteger"/>
+          <DataType type="IfcCountMeasure"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
   </PropertyDefs>
 </PropertySetDef>
diff -N -w -U10 tmp/a/psd/Pset_VoltageInstrumentTransformer.xml tmp/b/psd/Pset_VoltageInstrumentTransformer.xml
--- tmp/a/psd/Pset_VoltageInstrumentTransformer.xml 2022-02-14 21:40:22.510809200 +0100
+++ tmp/b/psd/Pset_VoltageInstrumentTransformer.xml 2022-07-09 16:02:33.195186700 +0200
@@ -54,21 +54,21 @@
         <TypePropertySingleValue>
           <DataType type="IfcPowerMeasure"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>NumberOfPhases</Name>
       <Definition/>
       <PropertyType>
         <TypePropertySingleValue>
-          <DataType type="IfcInteger"/>
+          <DataType type="IfcCountMeasure"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>
     <PropertyDef>
       <Name>PrimaryFrequency</Name>
       <Definition>The frequency that is going to be transformed and that runs into the transformer on the primary side.</Definition>
       <PropertyType>
         <TypePropertySingleValue>
           <DataType type="IfcFrequencyMeasure"/>
         </TypePropertySingleValue>