AECgeeks / infra-repo-issue-test-old1

0 stars 0 forks source link

IfcVegetation #97

Closed aothms closed 2 years ago

aothms commented 2 years ago

Original name of IfcPlant was deemed too confusing considering the use of plant as a facility

aothms commented 2 years ago
--- tmp/a/IFC.exp   2022-02-13 13:51:45.318989700 +0100
+++ tmp/b/IFC.exp   2022-07-09 16:00:42.027893400 +0200
@@ -7170,21 +7170,21 @@
  SUBTYPE OF (IfcFurnishingElementType);
    AssemblyPlace : IfcAssemblyPlaceEnum;
    PredefinedType : OPTIONAL IfcFurnitureTypeEnum;
  WHERE
    CorrectPredefinedType : (PredefinedType <> IfcFurnitureTypeEnum.USERDEFINED) OR
 ((PredefinedType = IfcFurnitureTypeEnum.USERDEFINED) AND EXISTS(SELF\IfcElementType.ElementType));
 END_ENTITY;

 ENTITY IfcGeographicElement
  SUPERTYPE OF (ONEOF
-   (IfcPlant))
+   (IfcVegetation))
  SUBTYPE OF (IfcElement);
    PredefinedType : OPTIONAL IfcGeographicElementTypeEnum;
  WHERE
    CorrectPredefinedType : NOT(EXISTS(PredefinedType)) OR
  (PredefinedType <> IfcGeographicElementTypeEnum.USERDEFINED) OR
  ((PredefinedType = IfcGeographicElementTypeEnum.USERDEFINED) AND EXISTS (SELF\IfcObject.ObjectType));
    CorrectTypeAssigned : (SIZEOF(IsTypedBy) = 0) OR
   ('IFC4X3_DEV.IFCGEOGRAPHICELEMENTTYPE' IN TYPEOF(SELF\IfcObject.IsTypedBy[1].RelatingType));
 END_ENTITY;

@@ -8633,24 +8633,20 @@
    (IfcPlanarBox))
  SUBTYPE OF (IfcGeometricRepresentationItem);
    SizeInX : IfcLengthMeasure;
    SizeInY : IfcLengthMeasure;
 END_ENTITY;

 ENTITY IfcPlane
  SUBTYPE OF (IfcElementarySurface);
 END_ENTITY;

-ENTITY IfcPlant
- SUBTYPE OF (IfcGeographicElement);
-END_ENTITY;
-
 ENTITY IfcPlate
  SUPERTYPE OF (ONEOF
    (IfcPlateStandardCase))
  SUBTYPE OF (IfcBuiltElement);
    PredefinedType : OPTIONAL IfcPlateTypeEnum;
  WHERE
    CorrectPredefinedType : NOT(EXISTS(PredefinedType)) OR
  (PredefinedType <> IfcPlateTypeEnum.USERDEFINED) OR
  ((PredefinedType = IfcPlateTypeEnum.USERDEFINED) AND EXISTS (SELF\IfcObject.ObjectType));
    CorrectTypeAssigned : (SIZEOF(IsTypedBy) = 0) OR
@@ -12101,20 +12097,24 @@
 ENTITY IfcVector
  SUBTYPE OF (IfcGeometricRepresentationItem);
    Orientation : IfcDirection;
    Magnitude : IfcLengthMeasure;
  DERIVE
     Dim : IfcDimensionCount := Orientation.Dim;
  WHERE
    MagGreaterOrEqualZero : Magnitude >= 0.0;
 END_ENTITY;

+ENTITY IfcVegetation
+ SUBTYPE OF (IfcGeographicElement);
+END_ENTITY;
+
 ENTITY IfcVertex
  SUPERTYPE OF (ONEOF
    (IfcVertexPoint))
  SUBTYPE OF (IfcTopologicalRepresentationItem);
 END_ENTITY;

 ENTITY IfcVertexLoop
  SUBTYPE OF (IfcLoop);
    LoopVertex : IfcVertex;
 END_ENTITY;
aothms commented 2 years ago
diff -N -w -U10 tmp/a/psd/Pset_PlantCommon.xml tmp/b/psd/Pset_PlantCommon.xml
--- tmp/a/psd/Pset_PlantCommon.xml  2022-02-13 13:52:31.328846500 +0100
+++ tmp/b/psd/Pset_PlantCommon.xml  2022-07-09 16:00:41.885892300 +0200
@@ -1,20 +1,20 @@
 <?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_PlantCommon</Name>
   <Definition>Properties for a plant.</Definition>
   <Applicability/>
   <ApplicableClasses>
-    <ClassName>IfcPlant</ClassName>
+    <ClassName>IfcVegetation</ClassName>
   </ApplicableClasses>
-  <ApplicableTypeValue>IfcPlant</ApplicableTypeValue>
+  <ApplicableTypeValue>IfcVegetation</ApplicableTypeValue>
   <PropertyDefs>
     <PropertyDef>
       <Name>BotanicalName</Name>
       <Definition>Formal scientific name conforming to the International Code of Nomenclature for algae, fungi, and plants (ICN)</Definition>
       <PropertyType>
         <TypePropertySingleValue>
           <DataType type="IfcLabel"/>
         </TypePropertySingleValue>
       </PropertyType>
     </PropertyDef>