buildingSMART · civilx64 · Nov 4, 2024 · Oct 31, 2024 · Oct 31, 2024 · Nov 1, 2024
diff --git a/features/GEM004_Constraints-on-representation-identifiers.feature b/features/GEM004_Constraints-on-representation-identifiers.feature
@@ -1,57 +1,37 @@
 @informal-proposition
 @GEM
-@version2
+@version3
 @E00010
 Feature: GEM004 - Constraints on representation identifiers
 The rule verifies that shape representations adhere to the permissible values outlined in the CSV files found in the 'features/resources/{attribute}.csv' folder, as specified in the documentation.
 
-  Scenario: Shape Representation Identifier must be valid - IFC4X3
+  Scenario: Shape Representation Identifier must be valid
 
-    Given A model with Schema "IFC4.3"
     Given An IfcProduct
     Given Its attribute Representation
     Given Its attribute Representations
     Given Its attribute RepresentationIdentifier
 
-    Then The values must be in 'valid_RepresentationIdentifier_IFC4.3.csv'
+    Then The values must be in 'valid_ShapeRepresentationIdentifier.csv'
 
-  Scenario: Shape Representation Type must be valid - IFC4X3
 
-    Given A model with Schema "IFC4.3"
+  Scenario: Shape Representation Type must be valid
+
     Given An IfcProduct
     Given Its attribute Representation
     Given Its attribute Representations
+    Given Its entity type is 'IfcShapeRepresentation'
     Given Its attribute RepresentationType
 
-    Then The values must be in 'valid_RepresentationType_IFC4.3.csv'
-
-
-  Scenario: Shape Representation Identifier must be valid - IFC4
-
-    Given A model with Schema "IFC4"
-    Given An IfcProduct
-    Given Its attribute Representation
-    Given Its attribute Representations
-    Given Its attribute RepresentationIdentifier
+    Then The values must be in 'valid_ShapeRepresentationType.csv'
 
-    Then The values must be in 'valid_RepresentationIdentifier_IFC4.csv'
-
-  Scenario: Shape Representation Type must be valid - IFC4
 
-    Given A model with Schema "IFC4"
-    Given An IfcProduct
-    Given Its attribute Representation
-    Given Its attribute Representations
-    Given Its attribute RepresentationType
-
-    Then The values must be in 'valid_RepresentationType_IFC4.csv'
-
-Scenario: Shape Representation Type must be valid - IFC2X3
-  Given A model with Schema "IFC2X3"
-    Given An IfcProduct
-    Given Its attribute Representation
-    Given Its attribute Representations
-    Given Its attribute RepresentationType
-
-    Then The values must be in 'valid_RepresentationType_IFC2X3.csv'
+  Scenario: Topology Representation Type must be valid
 
+      Given An IfcProduct
+      Given Its attribute Representation
+      Given Its attribute Representations
+      Given Its entity type is 'IfcTopologyRepresentation'
+      Given Its attribute RepresentationType
+
+      Then The values must be in 'valid_TopologyRepresentationType.csv'
diff --git a/features/GEM051_Presence-of-geometric-context.feature b/features/GEM051_Presence-of-geometric-context.feature
@@ -8,30 +8,28 @@ The rule verifies that a geometric context is present in the model, that its att
 
     Scenario Outline: Agreement on having at least one geometric representation context
 
-      Given A model with Schema "<Schema>"
+      Given A model with Schema <Schema>
       Given An <Entity>
       Given Its attribute RepresentationContexts
 
       Then Assert existence
       Then Its entity type is 'IfcGeometricRepresentationContext' including subtypes
 
       Examples:
-        | Schema  | Entity     |
-        | IFC2X3  | IfcProject |
-        | IFC4    | IfcContext |
-        | IFC4.3  | IfcContext |
+        | Schema               | Entity     |
+        | "IFC2X3"             | IfcProject |
+        | "IFC4.3" or "IFC4"   | IfcContext |
 
 
     Scenario Outline: Agreement on correct context types
 
-      Given A model with Schema "<Schema>"
+      Given A model with Schema <Schema>
       Given An <Entity>
       Given Its attribute RepresentationContexts
 
       Then ContextType = "Model" or "Plan" or "NotDefined"
 
       Examples:
-        | Schema  | Entity     |
-        | IFC2X3  | IfcProject |
-        | IFC4    | IfcContext |
-        | IFC4.3  | IfcContext |
+        | Schema               | Entity     |
+        | "IFC2X3"             | IfcProject |
+        | "IFC4.3" or "IFC4"   | IfcContext |
diff --git a/features/GEM052_Correct-geometric-subcontexts.feature b/features/GEM052_Correct-geometric-subcontexts.feature
@@ -14,18 +14,13 @@ Reference: https://github.com/buildingSMART/Sample-Test-Files/issues/137.
         Then HasSubContexts = not empty
 
 
-    Scenario Outline: Constraints on context identifier 
+    Scenario: Constraints on context identifier 
 
-        Given a model with Schema "<schema>"
+        Given a model with Schema "IFC4.3" or "IFC4"
         Given An IfcGeometricRepresentationSubContext
         Given Its attribute ContextIdentifier
 
-        Then The values must be in '<source>'
-
-        Examples: 
-            | schema | source |
-            | IFC4.3 | valid_RepresentationIdentifier_IFC4.3.csv |
-            | IFC4   | valid_RepresentationIdentifier_IFC4.csv |
+        Then The values must be in 'valid_ShapeRepresentationIdentifier.csv'
 
 
     Scenario: Context identifier must not be empty

diff --git a/...es/resources/valid_ProjectDeclaration.csv → ...urces/IFC2X3/valid_ProjectDeclaration.csv b/...es/resources/valid_ProjectDeclaration.csv → ...urces/IFC2X3/valid_ProjectDeclaration.csv
diff --git a/...urces/valid_RepresentationType_IFC2X3.csv → .../IFC2X3/valid_ShapeRepresentationType.csv b/...urces/valid_RepresentationType_IFC2X3.csv → .../IFC2X3/valid_ShapeRepresentationType.csv
diff --git a/features/resources/IFC2X3/valid_TopologyRepresentationType.csv b/features/resources/IFC2X3/valid_TopologyRepresentationType.csv
@@ -0,0 +1,6 @@
+Vertex,topological vertex representation
+Edge,topological edge representation
+Path,topological path representation
+Face,topological face representation
+Shell,topological shell representation
+Undefined,no constraints imposed
diff --git a/...s/valid_RepresentationIdentifier_IFC4.csv → ...esources/IFC4/valid_ContextIdentifier.csv b/...s/valid_RepresentationIdentifier_IFC4.csv → ...esources/IFC4/valid_ContextIdentifier.csv
diff --git a/features/resources/IFC4/valid_ProjectDeclaration.csv b/features/resources/IFC4/valid_ProjectDeclaration.csv
@@ -0,0 +1,8 @@
+IfcActor
+IfcControl
+IfcGroup
+IfcProcess
+IfcProjectLibrary
+IfcPropertySetTemplate
+IfcResource
+IfcTypeObject
diff --git a/features/resources/IFC4/valid_ShapeRepresentationIdentifier.csv b/features/resources/IFC4/valid_ShapeRepresentationIdentifier.csv
@@ -0,0 +1,11 @@
+CoG,	Point to identify the center of gravity of an element. This value can be used for validation purposes.
+Box,	Bounding box as simplified 3D box geometry of an element
+Annotation,	2D annotations not representing elements
+Axis,	2D or 3D Axis, or single line, representation of an element
+FootPrint,	2D Foot print, or double line, representation of an element, projected to ground view
+Profile,	3D line representation of a profile being planar, e.g. used for door and window outlines
+Surface,	3D Surface representation, e.g. of an analytical surface, of an elementplane)
+Reference,	3D representation that is not part of the Body representation. This is used, e.g., for opening geometries, if there are to be excluded from an implicit Boolean operation.
+Body,	3D Body representation, e.g. as wireframe, surface, or solid model, of an element
+Clearance,	3D clearance volume of the element. Such clearance region indicates space that should not intersect with the 'Body' representation of other elements, though may intersect with the 'Clearance' representation of other elements.
+Lighting,	Representation of emitting light as a light source within a shape representation
diff --git a/...sources/valid_RepresentationType_IFC4.csv → ...es/IFC4/valid_ShapeRepresentationType.csv b/...sources/valid_RepresentationType_IFC4.csv → ...es/IFC4/valid_ShapeRepresentationType.csv
diff --git a/features/resources/IFC4/valid_TopologyRepresentationType.csv b/features/resources/IFC4/valid_TopologyRepresentationType.csv
@@ -0,0 +1,6 @@
+Vertex,topological vertex representation
+Edge,topological edge representation
+Path,topological path representation
+Face,topological face representation
+Shell,topological shell representation
+Undefined,no constraints imposed
diff --git a/...valid_RepresentationIdentifier_IFC4.3.csv → ...ources/IFC4X3/valid_ContextIdentifier.csv b/...valid_RepresentationIdentifier_IFC4.3.csv → ...ources/IFC4X3/valid_ContextIdentifier.csv
diff --git a/features/resources/IFC4X3/valid_ProjectDeclaration.csv b/features/resources/IFC4X3/valid_ProjectDeclaration.csv
@@ -0,0 +1,8 @@
+IfcActor
+IfcControl
+IfcGroup
+IfcProcess
+IfcProjectLibrary
+IfcPropertySetTemplate
+IfcResource
+IfcTypeObject
diff --git a/features/resources/IFC4X3/valid_ShapeRepresentationIdentifier.csv b/features/resources/IFC4X3/valid_ShapeRepresentationIdentifier.csv
@@ -0,0 +1,12 @@
+CoG,Point to identify the center of gravity of an element. This value can be used for validation purposes.
+Box,Bounding box as simplified 3D box geometry of an element
+Annotation,3D annotations not representing elements
+Axis,2D or 3D Axis, or single line, representation of an element
+FootPrint,2D Foot print, or double line, representation of an element, projected to ground view
+Profile,3D line representation of a profile being planar, e.g. used for door and window outlines
+Surface,3D Surface representation, e.g. of an analytical surface, of an elementplane)
+Reference,3D representation that is not part of the Body representation. This is used, e.g., for opening geometries, if there are to be excluded from an implicit Boolean operation.
+Body,3D Body representation, e.g. as wireframe, surface, or solid model, of an element
+Body-Fallback,3D Body representation, e.g. as tessellation, or other surface, or boundary representation, added in addition to the solid model (potentially involving Boolean operations) of an element
+Clearance,3D clearance volume of the element. Such clearance region indicates space that should not intersect with the 'Body' representation of other elements, though may intersect with the 'Clearance' representation of other elements.
+Lighting,Representation of emitting light as a light source within a shape representation
diff --git a/...urces/valid_RepresentationType_IFC4.3.csv → .../IFC4X3/valid_ShapeRepresentationType.csv b/...urces/valid_RepresentationType_IFC4.3.csv → .../IFC4X3/valid_ShapeRepresentationType.csv
diff --git a/features/resources/IFC4X3/valid_TopologyRepresentationType.csv b/features/resources/IFC4X3/valid_TopologyRepresentationType.csv
@@ -0,0 +1,6 @@
+Vertex,topological vertex representation
+Edge,topological edge representation
+Path,topological path representation
+Face,topological face representation
+Shell,topological shell representation
+Undefined,no constraints imposed
diff --git a/features/steps/thens/values.py b/features/steps/thens/values.py
@@ -29,7 +29,7 @@ def step_impl(context, inst, i, csv_file):
         return []
 
     dirname = os.path.dirname(__file__)
-    filename = Path(dirname).parent.parent / "resources" / f"{csv_file}.csv"
+    filename =  Path(dirname).parent.parent / "resources" / f"{context.model.schema}" /f"{csv_file}.csv"
     valid_values = [row[0] for row in csv.reader(open(filename))]
 
     def is_valid_instance(instance):