Skip to content

Next Gen STEP AP242 Native-ish BREP Geometric Modeling Kernel

Fix P2 pattern semantics for repeated subtract features

Yuechen Li7fcc3522a022
diff --git a/Aetheris.Kernel.Firmament.Tests/FirmamentBuildAndExportTests.cs b/Aetheris.Kernel.Firmament.Tests/FirmamentBuildAndExportTests.cs
index 68736f08..f29a1693 100644
--- a/Aetheris.Kernel.Firmament.Tests/FirmamentBuildAndExportTests.cs
+++ b/Aetheris.Kernel.Firmament.Tests/FirmamentBuildAndExportTests.cs
@@ -240,10 +240,10 @@ public sealed class FirmamentBuildAndExportTests
AssertExampleBuildAndExport(
"testdata/firmament/examples/p2_linear_hole_row.firmament",
"p2_linear_hole_row.step",
- "hole_marker_1__lin3",
+ "hole_cut_1__lin3",
4,
- "primitive",
- "cylinder");
+ "boolean",
+ "subtract");
}
[Fact]
@@ -252,10 +252,10 @@ public sealed class FirmamentBuildAndExportTests
AssertExampleBuildAndExport(
"testdata/firmament/examples/p2_flange_bolt_circle_pattern.firmament",
"p2_flange_bolt_circle_pattern.step",
- "bolt_marker_1__cir5",
- 6,
- "primitive",
- "cylinder");
+ "bolt_hole_1__cir5",
+ 7,
+ "boolean",
+ "subtract");
}
[Fact]
diff --git a/Aetheris.Kernel.Firmament.Tests/FirmamentDocumentCoherenceValidationTests.cs b/Aetheris.Kernel.Firmament.Tests/FirmamentDocumentCoherenceValidationTests.cs
index 5b9c9a78..bdb2b6e5 100644
--- a/Aetheris.Kernel.Firmament.Tests/FirmamentDocumentCoherenceValidationTests.cs
+++ b/Aetheris.Kernel.Firmament.Tests/FirmamentDocumentCoherenceValidationTests.cs
@@ -49,6 +49,19 @@ public sealed class FirmamentDocumentCoherenceValidationTests
diagnostic.Message);
}
+
+ [Fact]
+ public void Compiler_Rejects_PatternLinear_With_Primitive_Source_Feature()
+ {
+ var result = CompileFixture("testdata/firmament/fixtures/p2_invalid_pattern_source_primitive.firmament");
+
+ Assert.False(result.Compilation.IsSuccess);
+ var diagnostic = Assert.Single(result.Compilation.Diagnostics);
+ Assert.Equal(
+ $"[{FirmamentDiagnosticCodes.PatternInvalidFieldValue.Value}] Pattern op 'pattern_linear' at index 1 uses unsupported source feature id 'hole_marker_1'; only 'subtract' boolean features are currently patternable.",
+ diagnostic.Message);
+ }
+
[Theory]
[InlineData("testdata/firmament/fixtures/m2a-invalid-add-to-missing-id.firmament", "add", "to", "missing")]
[InlineData("testdata/firmament/fixtures/m2a-invalid-subtract-from-missing-id.firmament", "subtract", "from", "missing")]
diff --git a/Aetheris.Kernel.Firmament.Tests/FirmamentPrimitiveLoweringTests.cs b/Aetheris.Kernel.Firmament.Tests/FirmamentPrimitiveLoweringTests.cs
index 95ef07b8..2deebf74 100644
--- a/Aetheris.Kernel.Firmament.Tests/FirmamentPrimitiveLoweringTests.cs
+++ b/Aetheris.Kernel.Firmament.Tests/FirmamentPrimitiveLoweringTests.cs
@@ -266,20 +266,28 @@ public sealed class FirmamentPrimitiveLoweringTests
}
[Fact]
- public void Compile_Expands_LinearPattern_Into_Repeated_Primitives_With_Deterministic_Ids()
+ public void Compile_Expands_LinearPattern_Into_Chained_SubtractBooleans_With_Deterministic_Ids()
{
var result = Compile(FirmamentCorpusHarness.ReadFixtureText("testdata/firmament/examples/p2_linear_hole_row.firmament"));
Assert.True(result.Compilation.IsSuccess);
- var primitives = result.Compilation.Value.PrimitiveLoweringPlan!.Primitives
- .Where(p => p.Kind == FirmamentLoweredPrimitiveKind.Cylinder)
- .OrderBy(p => p.OpIndex)
+ var booleans = result.Compilation.Value.PrimitiveLoweringPlan!.Booleans
+ .Where(b => b.Kind == FirmamentLoweredBooleanKind.Subtract)
+ .OrderBy(b => b.OpIndex)
.ToArray();
- Assert.Equal(4, primitives.Length);
- Assert.Equal("hole_marker_1", primitives[0].FeatureId);
- Assert.Equal("hole_marker_1__lin1", primitives[1].FeatureId);
- Assert.Equal("hole_marker_1__lin2", primitives[2].FeatureId);
- Assert.Equal("hole_marker_1__lin3", primitives[3].FeatureId);
+
+ Assert.Equal(4, booleans.Length);
+ Assert.Equal("hole_cut_1", booleans[0].FeatureId);
+ Assert.Equal("plate", booleans[0].PrimaryReferenceFeatureId);
+
+ Assert.Equal("hole_cut_1__lin1", booleans[1].FeatureId);
+ Assert.Equal("hole_cut_1", booleans[1].PrimaryReferenceFeatureId);
+
+ Assert.Equal("hole_cut_1__lin2", booleans[2].FeatureId);
+ Assert.Equal("hole_cut_1__lin1", booleans[2].PrimaryReferenceFeatureId);
+
+ Assert.Equal("hole_cut_1__lin3", booleans[3].FeatureId);
+ Assert.Equal("hole_cut_1__lin2", booleans[3].PrimaryReferenceFeatureId);
}
diff --git a/Aetheris.Kernel.Firmament/Execution/FirmamentPrimitiveExecutor.cs b/Aetheris.Kernel.Firmament/Execution/FirmamentPrimitiveExecutor.cs
index 86e9034e..039e4f35 100644
--- a/Aetheris.Kernel.Firmament/Execution/FirmamentPrimitiveExecutor.cs
+++ b/Aetheris.Kernel.Firmament/Execution/FirmamentPrimitiveExecutor.cs
@@ -51,6 +51,53 @@ internal static class FirmamentPrimitiveExecutor
continue;
}
+ if (IsPatternGeneratedFeature(boolean.FeatureId))
+ {
+ var patternToolResult = FirmamentBooleanToolBodyFactory.CreateBody(boolean.Tool);
+ if (!patternToolResult.IsSuccess)
+ {
+ return KernelResult<FirmamentPrimitiveExecutionResult>.Failure(patternToolResult.Diagnostics);
+ }
+
+ var patternPlacementResult = FirmamentPlacementResolver.ResolvePlacementTranslation(boolean, publishedBodiesByFeatureId);
+ if (!patternPlacementResult.IsSuccess)
+ {
+ return KernelResult<FirmamentPrimitiveExecutionResult>.Failure(patternPlacementResult.Diagnostics);
+ }
+
+ var placedToolBody = TranslateBody(patternToolResult.Value, patternPlacementResult.Value);
+ var patternGraphValidation = FirmamentSafeSubtractFeatureGraphValidator.ValidateNextBoolean(
+ boolean,
+ featureGraphStates,
+ booleanExecutionBodiesByFeatureId,
+ resolvedToolBody: placedToolBody);
+ if (!patternGraphValidation.IsSuccess)
+ {
+ return KernelResult<FirmamentPrimitiveExecutionResult>.Failure(
+ [
+ CreateBooleanExecutionFailureDiagnostic(boolean),
+ .. WithBooleanContext(boolean, patternGraphValidation.Diagnostics)
+ ]);
+ }
+
+ var patternBooleanResult = ExecuteBoolean(boolean.Kind, baseBody, placedToolBody);
+ if (!patternBooleanResult.IsSuccess)
+ {
+ return KernelResult<FirmamentPrimitiveExecutionResult>.Failure(
+ [
+ CreateBooleanExecutionFailureDiagnostic(boolean),
+ .. WithBooleanContext(boolean, patternBooleanResult.Diagnostics)
+ ]);
+ }
+
+ var patternBooleanBody = patternBooleanResult.Value;
+ executedBooleans.Add(new FirmamentExecutedBoolean(boolean.OpIndex, boolean.FeatureId, boolean.Kind, patternBooleanBody));
+ publishedBodiesByFeatureId[boolean.FeatureId] = patternBooleanBody;
+ booleanExecutionBodiesByFeatureId[boolean.FeatureId] = patternBooleanBody;
+ featureGraphStates[boolean.FeatureId] = patternGraphValidation.Value.ResultState;
+ continue;
+ }
+
var featureGraphValidation = FirmamentSafeSubtractFeatureGraphValidator.ValidateNextBoolean(
boolean,
featureGraphStates,
@@ -120,6 +167,10 @@ internal static class FirmamentPrimitiveExecutor
$"Requested boolean feature '{boolean.FeatureId}' ({boolean.Kind.ToString().ToLowerInvariant()}) could not be executed.",
Source: "firmament");
+ private static bool IsPatternGeneratedFeature(string featureId)
+ => featureId.Contains("__lin", StringComparison.Ordinal)
+ || featureId.Contains("__cir", StringComparison.Ordinal);
+
private static KernelResult<FirmamentExecutedPrimitiveBodies> ExecutePrimitive(FirmamentLoweredPrimitive primitive, IReadOnlyDictionary<string, BrepBody> publishedBodies)
{
var legacyResult = ExecuteLegacyPrimitive(primitive);
diff --git a/Aetheris.Kernel.Firmament/Validation/FirmamentDocumentCoherenceValidator.cs b/Aetheris.Kernel.Firmament/Validation/FirmamentDocumentCoherenceValidator.cs
index fac76953..a4829ac5 100644
--- a/Aetheris.Kernel.Firmament/Validation/FirmamentDocumentCoherenceValidator.cs
+++ b/Aetheris.Kernel.Firmament/Validation/FirmamentDocumentCoherenceValidator.cs
@@ -123,12 +123,12 @@ internal static class FirmamentDocumentCoherenceValidator
]);
}
- if (sourceEntry.Family is not (FirmamentOpFamily.Primitive or FirmamentOpFamily.Boolean))
+ if (sourceEntry.Family != FirmamentOpFamily.Boolean || sourceEntry.KnownKind != FirmamentKnownOpKind.Subtract)
{
return KernelResult<IReadOnlyList<FirmamentParsedOpEntry>>.Failure([
CreateDiagnostic(
FirmamentDiagnosticCodes.PatternInvalidFieldValue,
- $"Pattern op '{patternEntry.OpName}' at index {opIndex} uses unsupported source feature id '{sourceId}' from op family '{sourceEntry.Family}'.")
+ $"Pattern op '{patternEntry.OpName}' at index {opIndex} uses unsupported source feature id '{sourceId}'; only 'subtract' boolean features are currently patternable.")
]);
}
diff --git a/Aetheris.Kernel.Firmament/Validation/FirmamentSafeSubtractFeatureGraphValidator.cs b/Aetheris.Kernel.Firmament/Validation/FirmamentSafeSubtractFeatureGraphValidator.cs
index 22b3560b..319a3497 100644
--- a/Aetheris.Kernel.Firmament/Validation/FirmamentSafeSubtractFeatureGraphValidator.cs
+++ b/Aetheris.Kernel.Firmament/Validation/FirmamentSafeSubtractFeatureGraphValidator.cs
@@ -15,7 +15,8 @@ internal static class FirmamentSafeSubtractFeatureGraphValidator
FirmamentLoweredBoolean boolean,
IReadOnlyDictionary<string, FirmamentSafeSubtractFeatureGraphState> statesByFeatureId,
IReadOnlyDictionary<string, BrepBody> executionBodiesByFeatureId,
- ToleranceContext? tolerance = null)
+ ToleranceContext? tolerance = null,
+ BrepBody? resolvedToolBody = null)
{
ArgumentNullException.ThrowIfNull(boolean);
ArgumentNullException.ThrowIfNull(statesByFeatureId);
@@ -44,14 +45,14 @@ internal static class FirmamentSafeSubtractFeatureGraphValidator
"firmament.feature-graph.unsupported-follow-on-kind");
}
- return ValidateSupportedSafeSubtract(boolean, executionBodiesByFeatureId, tolerance);
+ return ValidateSupportedSafeSubtract(boolean, executionBodiesByFeatureId, tolerance, resolvedToolBody);
}
if (sourceState is FirmamentSafeSubtractFeatureGraphState.BoxRoot or FirmamentSafeSubtractFeatureGraphState.CylinderRoot)
{
if (boolean.Kind == FirmamentLoweredBooleanKind.Subtract && usesSupportedSafeHoleTool)
{
- return ValidateSupportedSafeSubtract(boolean, executionBodiesByFeatureId, tolerance);
+ return ValidateSupportedSafeSubtract(boolean, executionBodiesByFeatureId, tolerance, resolvedToolBody);
}
return KernelResult<FirmamentSafeSubtractFeatureGraphValidation>.Success(
@@ -77,7 +78,8 @@ internal static class FirmamentSafeSubtractFeatureGraphValidator
private static KernelResult<FirmamentSafeSubtractFeatureGraphValidation> ValidateSupportedSafeSubtract(
FirmamentLoweredBoolean boolean,
IReadOnlyDictionary<string, BrepBody> executionBodiesByFeatureId,
- ToleranceContext? tolerance)
+ ToleranceContext? tolerance,
+ BrepBody? resolvedToolBody)
{
if (!executionBodiesByFeatureId.TryGetValue(boolean.PrimaryReferenceFeatureId, out var leftBody))
{
@@ -93,13 +95,23 @@ internal static class FirmamentSafeSubtractFeatureGraphValidator
"firmament.feature-graph.invalid-composition-order");
}
- var toolBodyResult = FirmamentBooleanToolBodyFactory.CreateBody(boolean.Tool);
- if (!toolBodyResult.IsSuccess)
+ BrepBody toolBody;
+ if (resolvedToolBody is not null)
{
- return KernelResult<FirmamentSafeSubtractFeatureGraphValidation>.Failure(toolBodyResult.Diagnostics);
+ toolBody = resolvedToolBody;
+ }
+ else
+ {
+ var toolBodyResult = FirmamentBooleanToolBodyFactory.CreateBody(boolean.Tool);
+ if (!toolBodyResult.IsSuccess)
+ {
+ return KernelResult<FirmamentSafeSubtractFeatureGraphValidation>.Failure(toolBodyResult.Diagnostics);
+ }
+
+ toolBody = toolBodyResult.Value;
}
- if (!BrepBooleanAnalyticSurfaceRecognition.TryRecognizeAnalyticSurface(toolBodyResult.Value, resolvedTolerance, out var analyticSurface, out var reason))
+ if (!BrepBooleanAnalyticSurfaceRecognition.TryRecognizeAnalyticSurface(toolBody, resolvedTolerance, out var analyticSurface, out var reason))
{
return Failure(
KernelDiagnosticCode.ValidationFailed,
diff --git a/testdata/firmament/examples/p2_flange_bolt_circle_pattern.firmament b/testdata/firmament/examples/p2_flange_bolt_circle_pattern.firmament
index b205c335..308967e1 100644
--- a/testdata/firmament/examples/p2_flange_bolt_circle_pattern.firmament
+++ b/testdata/firmament/examples/p2_flange_bolt_circle_pattern.firmament
@@ -5,35 +5,42 @@ model:
name: p2_flange_bolt_circle_pattern
units: mm
-ops[4]:
+ops[5]:
-
- op: cylinder
+ op: box
id: flange
- radius: 36
- height: 12
+ size[3]:
+ 90
+ 90
+ 12
-
op: cylinder
- id: bolt_marker_1
- radius: 3
+ id: axis_ref
+ radius: 1
height: 12
+
+ -
+ op: subtract
+ id: bolt_hole_1
+ from: flange
+ with:
+ op: cylinder
+ radius: 3
+ height: 12
place:
- on_face: flange.top_face
- around_axis: flange.side_face
+ on: origin
+ around_axis: axis_ref.side_face
radial_offset: 20
angle_degrees: 0
- offset[3]:
- 0
- 0
- 0
-
op: pattern_circular
- source: bolt_marker_1
+ source: bolt_hole_1
count: 5
- axis: flange.side_face
- angle_degrees: 360
+ axis: axis_ref.side_face
+ angle_step_degrees: 60
-
op: expect_manifold
- target: bolt_marker_1__cir5
+ target: bolt_hole_1__cir5
diff --git a/testdata/firmament/examples/p2_linear_hole_row.firmament b/testdata/firmament/examples/p2_linear_hole_row.firmament
index 3e719b68..cdbaf264 100644
--- a/testdata/firmament/examples/p2_linear_hole_row.firmament
+++ b/testdata/firmament/examples/p2_linear_hole_row.firmament
@@ -10,15 +10,18 @@ ops[4]:
op: box
id: plate
size[3]:
- 60
- 20
+ 120
+ 80
8
-
- op: cylinder
- id: hole_marker_1
- radius: 2
- height: 8
+ op: subtract
+ id: hole_cut_1
+ from: plate
+ with:
+ op: cylinder
+ radius: 2
+ height: 8
place:
on: origin
offset[3]:
@@ -28,7 +31,7 @@ ops[4]:
-
op: pattern_linear
- source: hole_marker_1
+ source: hole_cut_1
count: 3
step[3]:
10
@@ -37,4 +40,4 @@ ops[4]:
-
op: expect_manifold
- target: hole_marker_1__lin3
+ target: hole_cut_1__lin3
diff --git a/testdata/firmament/exports/p2_flange_bolt_circle_pattern.step b/testdata/firmament/exports/p2_flange_bolt_circle_pattern.step
index 60cab2cb..656936eb 100644
--- a/testdata/firmament/exports/p2_flange_bolt_circle_pattern.step
+++ b/testdata/firmament/exports/p2_flange_bolt_circle_pattern.step
@@ -5,75 +5,456 @@ FILE_NAME('aetheris_export.step','1970-01-01T00:00:00',('Aetheris'),('Aetheris')
FILE_SCHEMA(('AP242_MANAGED_MODEL_BASED_3D_ENGINEERING_MIM_LF'));
ENDSEC;
DATA;
-#1=CARTESIAN_POINT($,(20,-0.000000000000005,12));
-#2=DIRECTION($,(0,0,1));
+#1=CARTESIAN_POINT($,(0,0,-6));
+#2=DIRECTION($,(0,0,-1));
#3=DIRECTION($,(1,0,0));
#4=AXIS2_PLACEMENT_3D($,#1,#2,#3);
-#5=CYLINDRICAL_SURFACE($,#4,3);
-#6=CARTESIAN_POINT($,(23,-0.000000000000005,12));
+#5=PLANE($,#4);
+#6=CARTESIAN_POINT($,(-25,-45,-6));
#7=VERTEX_POINT($,#6);
-#8=CARTESIAN_POINT($,(23,-0.000000000000005,24));
+#8=CARTESIAN_POINT($,(65,-45,-6));
#9=VERTEX_POINT($,#8);
-#10=CARTESIAN_POINT($,(23,-0.000000000000005,12));
-#11=DIRECTION($,(0,0,1));
+#10=CARTESIAN_POINT($,(-25,-45,-6));
+#11=DIRECTION($,(1,0,0));
#12=VECTOR($,#11,1);
#13=LINE($,#10,#12);
#14=EDGE_CURVE($,#7,#9,#13,.T.);
#15=ORIENTED_EDGE($,$,$,#14,.T.);
-#16=CARTESIAN_POINT($,(23,-0.000000000000005,24));
+#16=CARTESIAN_POINT($,(65,45,-6));
#17=VERTEX_POINT($,#16);
-#18=CARTESIAN_POINT($,(20,-0.000000000000005,24));
-#19=DIRECTION($,(0,0,1));
-#20=DIRECTION($,(1,0,0));
-#21=AXIS2_PLACEMENT_3D($,#18,#19,#20);
-#22=CIRCLE($,#21,3);
-#23=EDGE_CURVE($,#17,#17,#22,.T.);
-#24=ORIENTED_EDGE($,$,$,#23,.T.);
-#25=ORIENTED_EDGE($,$,$,#14,.F.);
-#26=CARTESIAN_POINT($,(23,-0.000000000000005,12));
-#27=VERTEX_POINT($,#26);
-#28=CARTESIAN_POINT($,(20,-0.000000000000005,12));
-#29=DIRECTION($,(0,0,1));
-#30=DIRECTION($,(1,0,0));
-#31=AXIS2_PLACEMENT_3D($,#28,#29,#30);
-#32=CIRCLE($,#31,3);
-#33=EDGE_CURVE($,#27,#27,#32,.T.);
-#34=ORIENTED_EDGE($,$,$,#33,.F.);
-#35=EDGE_LOOP($,(#15,#24,#25,#34));
-#36=FACE_OUTER_BOUND('',#35,.T.);
-#37=ADVANCED_FACE('',(#36),#5,.T.);
-#38=CARTESIAN_POINT($,(20,-0.000000000000005,24));
-#39=DIRECTION($,(0,0,1));
-#40=DIRECTION($,(1,0,0));
-#41=AXIS2_PLACEMENT_3D($,#38,#39,#40);
-#42=PLANE($,#41);
-#43=ORIENTED_EDGE($,$,$,#23,.F.);
-#44=EDGE_LOOP($,(#43));
-#45=FACE_OUTER_BOUND('',#44,.T.);
-#46=ADVANCED_FACE('',(#45),#42,.T.);
-#47=CARTESIAN_POINT($,(20,-0.000000000000005,12));
-#48=DIRECTION($,(0,0,-1));
-#49=DIRECTION($,(0,1,0));
-#50=AXIS2_PLACEMENT_3D($,#47,#48,#49);
-#51=PLANE($,#50);
-#52=ORIENTED_EDGE($,$,$,#33,.T.);
-#53=EDGE_LOOP($,(#52));
-#54=FACE_OUTER_BOUND('',#53,.T.);
-#55=ADVANCED_FACE('',(#54),#51,.T.);
-#56=CLOSED_SHELL($,(#37,#46,#55));
-#57=MANIFOLD_SOLID_BREP('AetherisBody',#56);
-#58=APPLICATION_CONTEXT('mechanical design');
-#59=PRODUCT_CONTEXT('',#58,'mechanical');
-#60=PRODUCT('AETHERIS','AetherisBody','',(#59));
-#61=PRODUCT_DEFINITION_FORMATION('','',#60);
-#62=PRODUCT_DEFINITION_CONTEXT('design',#58,'design');
-#63=PRODUCT_DEFINITION('','',#61,#62);
-#64=PRODUCT_DEFINITION_SHAPE('','',#63);
-#65=(LENGTH_UNIT()NAMED_UNIT(*)SI_UNIT(.MILLI.,.METRE.));
-#66=(NAMED_UNIT(*)PLANE_ANGLE_UNIT()SI_UNIT($,.RADIAN.));
-#67=(NAMED_UNIT(*)SI_UNIT($,.STERADIAN.)SOLID_ANGLE_UNIT());
-#68=(GEOMETRIC_REPRESENTATION_CONTEXT(3)GLOBAL_UNIT_ASSIGNED_CONTEXT((#65,#66,#67))REPRESENTATION_CONTEXT('3','3D'));
-#69=SHAPE_REPRESENTATION('AetherisBody',(#57),#68);
-#70=SHAPE_DEFINITION_REPRESENTATION(#64,#69);
+#18=CARTESIAN_POINT($,(65,-45,-6));
+#19=DIRECTION($,(0,1,0));
+#20=VECTOR($,#19,1);
+#21=LINE($,#18,#20);
+#22=EDGE_CURVE($,#9,#17,#21,.T.);
+#23=ORIENTED_EDGE($,$,$,#22,.T.);
+#24=CARTESIAN_POINT($,(-25,45,-6));
+#25=VERTEX_POINT($,#24);
+#26=CARTESIAN_POINT($,(65,45,-6));
+#27=DIRECTION($,(-1,0,0));
+#28=VECTOR($,#27,1);
+#29=LINE($,#26,#28);
+#30=EDGE_CURVE($,#17,#25,#29,.T.);
+#31=ORIENTED_EDGE($,$,$,#30,.T.);
+#32=CARTESIAN_POINT($,(-25,45,-6));
+#33=DIRECTION($,(0,-1,0));
+#34=VECTOR($,#33,1);
+#35=LINE($,#32,#34);
+#36=EDGE_CURVE($,#25,#7,#35,.T.);
+#37=ORIENTED_EDGE($,$,$,#36,.T.);
+#38=EDGE_LOOP($,(#15,#23,#31,#37));
+#39=FACE_OUTER_BOUND('',#38,.T.);
+#40=CARTESIAN_POINT($,(23,0,-6));
+#41=VERTEX_POINT($,#40);
+#42=CARTESIAN_POINT($,(20,0,-6));
+#43=DIRECTION($,(0,0,1));
+#44=DIRECTION($,(1,0,0));
+#45=AXIS2_PLACEMENT_3D($,#42,#43,#44);
+#46=CIRCLE($,#45,3);
+#47=EDGE_CURVE($,#41,#41,#46,.T.);
+#48=ORIENTED_EDGE($,$,$,#47,.F.);
+#49=EDGE_LOOP($,(#48));
+#50=FACE_BOUND('',#49,.T.);
+#51=CARTESIAN_POINT($,(13,17.3205080756888,-6));
+#52=VERTEX_POINT($,#51);
+#53=CARTESIAN_POINT($,(10,17.3205080756888,-6));
+#54=DIRECTION($,(0,0,1));
+#55=DIRECTION($,(1,0,0));
+#56=AXIS2_PLACEMENT_3D($,#53,#54,#55);
+#57=CIRCLE($,#56,3);
+#58=EDGE_CURVE($,#52,#52,#57,.T.);
+#59=ORIENTED_EDGE($,$,$,#58,.F.);
+#60=EDGE_LOOP($,(#59));
+#61=FACE_BOUND('',#60,.T.);
+#62=CARTESIAN_POINT($,(-7,17.3205080756888,-6));
+#63=VERTEX_POINT($,#62);
+#64=CARTESIAN_POINT($,(-10,17.3205080756888,-6));
+#65=DIRECTION($,(0,0,1));
+#66=DIRECTION($,(1,0,0));
+#67=AXIS2_PLACEMENT_3D($,#64,#65,#66);
+#68=CIRCLE($,#67,3);
+#69=EDGE_CURVE($,#63,#63,#68,.T.);
+#70=ORIENTED_EDGE($,$,$,#69,.F.);
+#71=EDGE_LOOP($,(#70));
+#72=FACE_BOUND('',#71,.T.);
+#73=CARTESIAN_POINT($,(-17,0.000000000000002,-6));
+#74=VERTEX_POINT($,#73);
+#75=CARTESIAN_POINT($,(-20,0.000000000000002,-6));
+#76=DIRECTION($,(0,0,1));
+#77=DIRECTION($,(1,0,0));
+#78=AXIS2_PLACEMENT_3D($,#75,#76,#77);
+#79=CIRCLE($,#78,3);
+#80=EDGE_CURVE($,#74,#74,#79,.T.);
+#81=ORIENTED_EDGE($,$,$,#80,.F.);
+#82=EDGE_LOOP($,(#81));
+#83=FACE_BOUND('',#82,.T.);
+#84=CARTESIAN_POINT($,(-7.00000000000001,-17.3205080756888,-6));
+#85=VERTEX_POINT($,#84);
+#86=CARTESIAN_POINT($,(-10,-17.3205080756888,-6));
+#87=DIRECTION($,(0,0,1));
+#88=DIRECTION($,(1,0,0));
+#89=AXIS2_PLACEMENT_3D($,#86,#87,#88);
+#90=CIRCLE($,#89,3);
+#91=EDGE_CURVE($,#85,#85,#90,.T.);
+#92=ORIENTED_EDGE($,$,$,#91,.F.);
+#93=EDGE_LOOP($,(#92));
+#94=FACE_BOUND('',#93,.T.);
+#95=CARTESIAN_POINT($,(13,-17.3205080756888,-6));
+#96=VERTEX_POINT($,#95);
+#97=CARTESIAN_POINT($,(10,-17.3205080756888,-6));
+#98=DIRECTION($,(0,0,1));
+#99=DIRECTION($,(1,0,0));
+#100=AXIS2_PLACEMENT_3D($,#97,#98,#99);
+#101=CIRCLE($,#100,3);
+#102=EDGE_CURVE($,#96,#96,#101,.T.);
+#103=ORIENTED_EDGE($,$,$,#102,.F.);
+#104=EDGE_LOOP($,(#103));
+#105=FACE_BOUND('',#104,.T.);
+#106=ADVANCED_FACE('',(#39,#50,#61,#72,#83,#94,#105),#5,.T.);
+#107=CARTESIAN_POINT($,(0,0,6));
+#108=DIRECTION($,(0,0,1));
+#109=DIRECTION($,(1,0,0));
+#110=AXIS2_PLACEMENT_3D($,#107,#108,#109);
+#111=PLANE($,#110);
+#112=CARTESIAN_POINT($,(-25,-45,6));
+#113=VERTEX_POINT($,#112);
+#114=CARTESIAN_POINT($,(65,-45,6));
+#115=VERTEX_POINT($,#114);
+#116=CARTESIAN_POINT($,(-25,-45,6));
+#117=DIRECTION($,(1,0,0));
+#118=VECTOR($,#117,1);
+#119=LINE($,#116,#118);
+#120=EDGE_CURVE($,#113,#115,#119,.T.);
+#121=ORIENTED_EDGE($,$,$,#120,.T.);
+#122=CARTESIAN_POINT($,(65,45,6));
+#123=VERTEX_POINT($,#122);
+#124=CARTESIAN_POINT($,(65,-45,6));
+#125=DIRECTION($,(0,1,0));
+#126=VECTOR($,#125,1);
+#127=LINE($,#124,#126);
+#128=EDGE_CURVE($,#115,#123,#127,.T.);
+#129=ORIENTED_EDGE($,$,$,#128,.T.);
+#130=CARTESIAN_POINT($,(-25,45,6));
+#131=VERTEX_POINT($,#130);
+#132=CARTESIAN_POINT($,(65,45,6));
+#133=DIRECTION($,(-1,0,0));
+#134=VECTOR($,#133,1);
+#135=LINE($,#132,#134);
+#136=EDGE_CURVE($,#123,#131,#135,.T.);
+#137=ORIENTED_EDGE($,$,$,#136,.T.);
+#138=CARTESIAN_POINT($,(-25,45,6));
+#139=DIRECTION($,(0,-1,0));
+#140=VECTOR($,#139,1);
+#141=LINE($,#138,#140);
+#142=EDGE_CURVE($,#131,#113,#141,.T.);
+#143=ORIENTED_EDGE($,$,$,#142,.T.);
+#144=EDGE_LOOP($,(#121,#129,#137,#143));
+#145=FACE_OUTER_BOUND('',#144,.T.);
+#146=CARTESIAN_POINT($,(23,0,6));
+#147=VERTEX_POINT($,#146);
+#148=CARTESIAN_POINT($,(20,0,6));
+#149=DIRECTION($,(0,0,1));
+#150=DIRECTION($,(1,0,0));
+#151=AXIS2_PLACEMENT_3D($,#148,#149,#150);
+#152=CIRCLE($,#151,3);
+#153=EDGE_CURVE($,#147,#147,#152,.T.);
+#154=ORIENTED_EDGE($,$,$,#153,.T.);
+#155=EDGE_LOOP($,(#154));
+#156=FACE_BOUND('',#155,.T.);
+#157=CARTESIAN_POINT($,(13,17.3205080756888,6));
+#158=VERTEX_POINT($,#157);
+#159=CARTESIAN_POINT($,(10,17.3205080756888,6));
+#160=DIRECTION($,(0,0,1));
+#161=DIRECTION($,(1,0,0));
+#162=AXIS2_PLACEMENT_3D($,#159,#160,#161);
+#163=CIRCLE($,#162,3);
+#164=EDGE_CURVE($,#158,#158,#163,.T.);
+#165=ORIENTED_EDGE($,$,$,#164,.T.);
+#166=EDGE_LOOP($,(#165));
+#167=FACE_BOUND('',#166,.T.);
+#168=CARTESIAN_POINT($,(-7,17.3205080756888,6));
+#169=VERTEX_POINT($,#168);
+#170=CARTESIAN_POINT($,(-10,17.3205080756888,6));
+#171=DIRECTION($,(0,0,1));
+#172=DIRECTION($,(1,0,0));
+#173=AXIS2_PLACEMENT_3D($,#170,#171,#172);
+#174=CIRCLE($,#173,3);
+#175=EDGE_CURVE($,#169,#169,#174,.T.);
+#176=ORIENTED_EDGE($,$,$,#175,.T.);
+#177=EDGE_LOOP($,(#176));
+#178=FACE_BOUND('',#177,.T.);
+#179=CARTESIAN_POINT($,(-17,0.000000000000002,6));
+#180=VERTEX_POINT($,#179);
+#181=CARTESIAN_POINT($,(-20,0.000000000000002,6));
+#182=DIRECTION($,(0,0,1));
+#183=DIRECTION($,(1,0,0));
+#184=AXIS2_PLACEMENT_3D($,#181,#182,#183);
+#185=CIRCLE($,#184,3);
+#186=EDGE_CURVE($,#180,#180,#185,.T.);
+#187=ORIENTED_EDGE($,$,$,#186,.T.);
+#188=EDGE_LOOP($,(#187));
+#189=FACE_BOUND('',#188,.T.);
+#190=CARTESIAN_POINT($,(-7.00000000000001,-17.3205080756888,6));
+#191=VERTEX_POINT($,#190);
+#192=CARTESIAN_POINT($,(-10,-17.3205080756888,6));
+#193=DIRECTION($,(0,0,1));
+#194=DIRECTION($,(1,0,0));
+#195=AXIS2_PLACEMENT_3D($,#192,#193,#194);
+#196=CIRCLE($,#195,3);
+#197=EDGE_CURVE($,#191,#191,#196,.T.);
+#198=ORIENTED_EDGE($,$,$,#197,.T.);
+#199=EDGE_LOOP($,(#198));
+#200=FACE_BOUND('',#199,.T.);
+#201=CARTESIAN_POINT($,(13,-17.3205080756888,6));
+#202=VERTEX_POINT($,#201);
+#203=CARTESIAN_POINT($,(10,-17.3205080756888,6));
+#204=DIRECTION($,(0,0,1));
+#205=DIRECTION($,(1,0,0));
+#206=AXIS2_PLACEMENT_3D($,#203,#204,#205);
+#207=CIRCLE($,#206,3);
+#208=EDGE_CURVE($,#202,#202,#207,.T.);
+#209=ORIENTED_EDGE($,$,$,#208,.T.);
+#210=EDGE_LOOP($,(#209));
+#211=FACE_BOUND('',#210,.T.);
+#212=ADVANCED_FACE('',(#145,#156,#167,#178,#189,#200,#211),#111,.T.);
+#213=CARTESIAN_POINT($,(0,-45,0));
+#214=DIRECTION($,(0,-1,0));
+#215=DIRECTION($,(1,0,0));
+#216=AXIS2_PLACEMENT_3D($,#213,#214,#215);
+#217=PLANE($,#216);
+#218=ORIENTED_EDGE($,$,$,#14,.T.);
+#219=CARTESIAN_POINT($,(65,-45,-6));
+#220=DIRECTION($,(0,0,1));
+#221=VECTOR($,#220,1);
+#222=LINE($,#219,#221);
+#223=EDGE_CURVE($,#9,#115,#222,.T.);
+#224=ORIENTED_EDGE($,$,$,#223,.T.);
+#225=ORIENTED_EDGE($,$,$,#120,.F.);
+#226=CARTESIAN_POINT($,(-25,-45,-6));
+#227=DIRECTION($,(0,0,1));
+#228=VECTOR($,#227,1);
+#229=LINE($,#226,#228);
+#230=EDGE_CURVE($,#7,#113,#229,.T.);
+#231=ORIENTED_EDGE($,$,$,#230,.F.);
+#232=EDGE_LOOP($,(#218,#224,#225,#231));
+#233=FACE_OUTER_BOUND('',#232,.T.);
+#234=ADVANCED_FACE('',(#233),#217,.T.);
+#235=CARTESIAN_POINT($,(65,0,0));
+#236=DIRECTION($,(1,0,0));
+#237=DIRECTION($,(0,1,0));
+#238=AXIS2_PLACEMENT_3D($,#235,#236,#237);
+#239=PLANE($,#238);
+#240=ORIENTED_EDGE($,$,$,#22,.T.);
+#241=CARTESIAN_POINT($,(65,45,-6));
+#242=DIRECTION($,(0,0,1));
+#243=VECTOR($,#242,1);
+#244=LINE($,#241,#243);
+#245=EDGE_CURVE($,#17,#123,#244,.T.);
+#246=ORIENTED_EDGE($,$,$,#245,.T.);
+#247=ORIENTED_EDGE($,$,$,#128,.F.);
+#248=ORIENTED_EDGE($,$,$,#223,.F.);
+#249=EDGE_LOOP($,(#240,#246,#247,#248));
+#250=FACE_OUTER_BOUND('',#249,.T.);
+#251=ADVANCED_FACE('',(#250),#239,.T.);
+#252=CARTESIAN_POINT($,(0,45,0));
+#253=DIRECTION($,(0,1,0));
+#254=DIRECTION($,(-1,0,0));
+#255=AXIS2_PLACEMENT_3D($,#252,#253,#254);
+#256=PLANE($,#255);
+#257=ORIENTED_EDGE($,$,$,#30,.T.);
+#258=CARTESIAN_POINT($,(-25,45,-6));
+#259=DIRECTION($,(0,0,1));
+#260=VECTOR($,#259,1);
+#261=LINE($,#258,#260);
+#262=EDGE_CURVE($,#25,#131,#261,.T.);
+#263=ORIENTED_EDGE($,$,$,#262,.T.);
+#264=ORIENTED_EDGE($,$,$,#136,.F.);
+#265=ORIENTED_EDGE($,$,$,#245,.F.);
+#266=EDGE_LOOP($,(#257,#263,#264,#265));
+#267=FACE_OUTER_BOUND('',#266,.T.);
+#268=ADVANCED_FACE('',(#267),#256,.T.);
+#269=CARTESIAN_POINT($,(-25,0,0));
+#270=DIRECTION($,(-1,0,0));
+#271=DIRECTION($,(0,1,0));
+#272=AXIS2_PLACEMENT_3D($,#269,#270,#271);
+#273=PLANE($,#272);
+#274=ORIENTED_EDGE($,$,$,#36,.T.);
+#275=ORIENTED_EDGE($,$,$,#230,.T.);
+#276=ORIENTED_EDGE($,$,$,#142,.F.);
+#277=ORIENTED_EDGE($,$,$,#262,.F.);
+#278=EDGE_LOOP($,(#274,#275,#276,#277));
+#279=FACE_OUTER_BOUND('',#278,.T.);
+#280=ADVANCED_FACE('',(#279),#273,.T.);
+#281=CARTESIAN_POINT($,(20,0,-6));
+#282=DIRECTION($,(0,0,1));
+#283=DIRECTION($,(1,0,0));
+#284=AXIS2_PLACEMENT_3D($,#281,#282,#283);
+#285=CYLINDRICAL_SURFACE($,#284,3);
+#286=CARTESIAN_POINT($,(23,0,6));
+#287=VERTEX_POINT($,#286);
+#288=CARTESIAN_POINT($,(23,0,-6));
+#289=VERTEX_POINT($,#288);
+#290=CARTESIAN_POINT($,(23,0,6));
+#291=DIRECTION($,(0,0,-1));
+#292=VECTOR($,#291,1);
+#293=LINE($,#290,#292);
+#294=EDGE_CURVE($,#287,#289,#293,.T.);
+#295=ORIENTED_EDGE($,$,$,#294,.T.);
+#296=ORIENTED_EDGE($,$,$,#153,.F.);
+#297=ORIENTED_EDGE($,$,$,#294,.F.);
+#298=ORIENTED_EDGE($,$,$,#47,.T.);
+#299=EDGE_LOOP($,(#295,#296,#297,#298));
+#300=FACE_OUTER_BOUND('',#299,.T.);
+#301=ADVANCED_FACE('',(#300),#285,.T.);
+#302=CARTESIAN_POINT($,(10,17.3205080756888,-6));
+#303=DIRECTION($,(0,0,1));
+#304=DIRECTION($,(1,0,0));
+#305=AXIS2_PLACEMENT_3D($,#302,#303,#304);
+#306=CYLINDRICAL_SURFACE($,#305,3);
+#307=CARTESIAN_POINT($,(13,17.3205080756888,6));
+#308=VERTEX_POINT($,#307);
+#309=CARTESIAN_POINT($,(13,17.3205080756888,-6));
+#310=VERTEX_POINT($,#309);
+#311=CARTESIAN_POINT($,(13,17.3205080756888,6));
+#312=DIRECTION($,(0,0,-1));
+#313=VECTOR($,#312,1);
+#314=LINE($,#311,#313);
+#315=EDGE_CURVE($,#308,#310,#314,.T.);
+#316=ORIENTED_EDGE($,$,$,#315,.T.);
+#317=ORIENTED_EDGE($,$,$,#164,.F.);
+#318=ORIENTED_EDGE($,$,$,#315,.F.);
+#319=ORIENTED_EDGE($,$,$,#58,.T.);
+#320=EDGE_LOOP($,(#316,#317,#318,#319));
+#321=FACE_OUTER_BOUND('',#320,.T.);
+#322=ADVANCED_FACE('',(#321),#306,.T.);
+#323=CARTESIAN_POINT($,(-10,17.3205080756888,-6));
+#324=DIRECTION($,(0,0,1));
+#325=DIRECTION($,(1,0,0));
+#326=AXIS2_PLACEMENT_3D($,#323,#324,#325);
+#327=CYLINDRICAL_SURFACE($,#326,3);
+#328=CARTESIAN_POINT($,(-7,17.3205080756888,6));
+#329=VERTEX_POINT($,#328);
+#330=CARTESIAN_POINT($,(-7,17.3205080756888,-6));
+#331=VERTEX_POINT($,#330);
+#332=CARTESIAN_POINT($,(-7,17.3205080756888,6));
+#333=DIRECTION($,(0,0,-1));
+#334=VECTOR($,#333,1);
+#335=LINE($,#332,#334);
+#336=EDGE_CURVE($,#329,#331,#335,.T.);
+#337=ORIENTED_EDGE($,$,$,#336,.T.);
+#338=ORIENTED_EDGE($,$,$,#175,.F.);
+#339=ORIENTED_EDGE($,$,$,#336,.F.);
+#340=ORIENTED_EDGE($,$,$,#69,.T.);
+#341=EDGE_LOOP($,(#337,#338,#339,#340));
+#342=FACE_OUTER_BOUND('',#341,.T.);
+#343=ADVANCED_FACE('',(#342),#327,.T.);
+#344=CARTESIAN_POINT($,(-20,0.000000000000002,-6));
+#345=DIRECTION($,(0,0,1));
+#346=DIRECTION($,(1,0,0));
+#347=AXIS2_PLACEMENT_3D($,#344,#345,#346);
+#348=CYLINDRICAL_SURFACE($,#347,3);
+#349=CARTESIAN_POINT($,(-17,0.000000000000002,6));
+#350=VERTEX_POINT($,#349);
+#351=CARTESIAN_POINT($,(-17,0.000000000000002,-6));
+#352=VERTEX_POINT($,#351);
+#353=CARTESIAN_POINT($,(-17,0.000000000000002,6));
+#354=DIRECTION($,(0,0,-1));
+#355=VECTOR($,#354,1);
+#356=LINE($,#353,#355);
+#357=EDGE_CURVE($,#350,#352,#356,.T.);
+#358=ORIENTED_EDGE($,$,$,#357,.T.);
+#359=ORIENTED_EDGE($,$,$,#186,.F.);
+#360=ORIENTED_EDGE($,$,$,#357,.F.);
+#361=ORIENTED_EDGE($,$,$,#80,.T.);
+#362=EDGE_LOOP($,(#358,#359,#360,#361));
+#363=FACE_OUTER_BOUND('',#362,.T.);
+#364=ADVANCED_FACE('',(#363),#348,.T.);
+#365=CARTESIAN_POINT($,(-10,-17.3205080756888,-6));
+#366=DIRECTION($,(0,0,1));
+#367=DIRECTION($,(1,0,0));
+#368=AXIS2_PLACEMENT_3D($,#365,#366,#367);
+#369=CYLINDRICAL_SURFACE($,#368,3);
+#370=CARTESIAN_POINT($,(-7.00000000000001,-17.3205080756888,6));
+#371=VERTEX_POINT($,#370);
+#372=CARTESIAN_POINT($,(-7.00000000000001,-17.3205080756888,-6));
+#373=VERTEX_POINT($,#372);
+#374=CARTESIAN_POINT($,(-7.00000000000001,-17.3205080756888,6));
+#375=DIRECTION($,(0,0,-1));
+#376=VECTOR($,#375,1);
+#377=LINE($,#374,#376);
+#378=EDGE_CURVE($,#371,#373,#377,.T.);
+#379=ORIENTED_EDGE($,$,$,#378,.T.);
+#380=ORIENTED_EDGE($,$,$,#197,.F.);
+#381=ORIENTED_EDGE($,$,$,#378,.F.);
+#382=ORIENTED_EDGE($,$,$,#91,.T.);
+#383=EDGE_LOOP($,(#379,#380,#381,#382));
+#384=FACE_OUTER_BOUND('',#383,.T.);
+#385=ADVANCED_FACE('',(#384),#369,.T.);
+#386=CARTESIAN_POINT($,(10,-17.3205080756888,-6));
+#387=DIRECTION($,(0,0,1));
+#388=DIRECTION($,(1,0,0));
+#389=AXIS2_PLACEMENT_3D($,#386,#387,#388);
+#390=CYLINDRICAL_SURFACE($,#389,3);
+#391=CARTESIAN_POINT($,(13,-17.3205080756888,6));
+#392=VERTEX_POINT($,#391);
+#393=CARTESIAN_POINT($,(13,-17.3205080756888,-6));
+#394=VERTEX_POINT($,#393);
+#395=CARTESIAN_POINT($,(13,-17.3205080756888,6));
+#396=DIRECTION($,(0,0,-1));
+#397=VECTOR($,#396,1);
+#398=LINE($,#395,#397);
+#399=EDGE_CURVE($,#392,#394,#398,.T.);
+#400=ORIENTED_EDGE($,$,$,#399,.T.);
+#401=ORIENTED_EDGE($,$,$,#208,.F.);
+#402=ORIENTED_EDGE($,$,$,#399,.F.);
+#403=ORIENTED_EDGE($,$,$,#102,.T.);
+#404=EDGE_LOOP($,(#400,#401,#402,#403));
+#405=FACE_OUTER_BOUND('',#404,.T.);
+#406=ADVANCED_FACE('',(#405),#390,.T.);
+#407=CLOSED_SHELL($,(#106,#212,#234,#251,#268,#280,#301,#322,#343,#364,#385,#406));
+#408=MANIFOLD_SOLID_BREP('AetherisBody',#407);
+#409=APPLICATION_CONTEXT('mechanical design');
+#410=PRODUCT_CONTEXT('',#409,'mechanical');
+#411=PRODUCT('AETHERIS','AetherisBody','',(#410));
+#412=PRODUCT_DEFINITION_FORMATION('','',#411);
+#413=PRODUCT_DEFINITION_CONTEXT('design',#409,'design');
+#414=PRODUCT_DEFINITION('','',#412,#413);
+#415=PRODUCT_DEFINITION_SHAPE('','',#414);
+#416=(LENGTH_UNIT()NAMED_UNIT(*)SI_UNIT(.MILLI.,.METRE.));
+#417=(NAMED_UNIT(*)PLANE_ANGLE_UNIT()SI_UNIT($,.RADIAN.));
+#418=(NAMED_UNIT(*)SI_UNIT($,.STERADIAN.)SOLID_ANGLE_UNIT());
+#419=(GEOMETRIC_REPRESENTATION_CONTEXT(3)GLOBAL_UNIT_ASSIGNED_CONTEXT((#416,#417,#418))REPRESENTATION_CONTEXT('3','3D'));
+#420=SHAPE_ASPECT('firmament-feature:bolt_hole_1','supported cylinder through-hole feature',#415,.FALSE.);
+#421=PROPERTY_DEFINITION('diameter:bolt_hole_1','auto-derived semantic PMI diameter',#420);
+#422=MEASURE_REPRESENTATION_ITEM('diameter',6,#416);
+#423=SHAPE_DIMENSION_REPRESENTATION('diameter:bolt_hole_1',(#422),#419);
+#424=PROPERTY_DEFINITION_REPRESENTATION(#421,#423);
+#425=SHAPE_ASPECT('firmament-feature:bolt_hole_1__cir1','supported cylinder through-hole feature',#415,.FALSE.);
+#426=PROPERTY_DEFINITION('diameter:bolt_hole_1__cir1','auto-derived semantic PMI diameter',#425);
+#427=MEASURE_REPRESENTATION_ITEM('diameter',6,#416);
+#428=SHAPE_DIMENSION_REPRESENTATION('diameter:bolt_hole_1__cir1',(#427),#419);
+#429=PROPERTY_DEFINITION_REPRESENTATION(#426,#428);
+#430=SHAPE_ASPECT('firmament-feature:bolt_hole_1__cir2','supported cylinder through-hole feature',#415,.FALSE.);
+#431=PROPERTY_DEFINITION('diameter:bolt_hole_1__cir2','auto-derived semantic PMI diameter',#430);
+#432=MEASURE_REPRESENTATION_ITEM('diameter',6,#416);
+#433=SHAPE_DIMENSION_REPRESENTATION('diameter:bolt_hole_1__cir2',(#432),#419);
+#434=PROPERTY_DEFINITION_REPRESENTATION(#431,#433);
+#435=SHAPE_ASPECT('firmament-feature:bolt_hole_1__cir3','supported cylinder through-hole feature',#415,.FALSE.);
+#436=PROPERTY_DEFINITION('diameter:bolt_hole_1__cir3','auto-derived semantic PMI diameter',#435);
+#437=MEASURE_REPRESENTATION_ITEM('diameter',6,#416);
+#438=SHAPE_DIMENSION_REPRESENTATION('diameter:bolt_hole_1__cir3',(#437),#419);
+#439=PROPERTY_DEFINITION_REPRESENTATION(#436,#438);
+#440=SHAPE_ASPECT('firmament-feature:bolt_hole_1__cir4','supported cylinder through-hole feature',#415,.FALSE.);
+#441=PROPERTY_DEFINITION('diameter:bolt_hole_1__cir4','auto-derived semantic PMI diameter',#440);
+#442=MEASURE_REPRESENTATION_ITEM('diameter',6,#416);
+#443=SHAPE_DIMENSION_REPRESENTATION('diameter:bolt_hole_1__cir4',(#442),#419);
+#444=PROPERTY_DEFINITION_REPRESENTATION(#441,#443);
+#445=SHAPE_ASPECT('firmament-feature:bolt_hole_1__cir5','supported cylinder through-hole feature',#415,.FALSE.);
+#446=PROPERTY_DEFINITION('diameter:bolt_hole_1__cir5','auto-derived semantic PMI diameter',#445);
+#447=MEASURE_REPRESENTATION_ITEM('diameter',6,#416);
+#448=SHAPE_DIMENSION_REPRESENTATION('diameter:bolt_hole_1__cir5',(#447),#419);
+#449=PROPERTY_DEFINITION_REPRESENTATION(#446,#448);
+#450=SHAPE_REPRESENTATION('AetherisBody',(#408),#419);
+#451=SHAPE_DEFINITION_REPRESENTATION(#415,#450);
ENDSEC;
END-ISO-10303-21;
diff --git a/testdata/firmament/exports/p2_linear_hole_row.step b/testdata/firmament/exports/p2_linear_hole_row.step
index 58ec85cf..eaa68f60 100644
--- a/testdata/firmament/exports/p2_linear_hole_row.step
+++ b/testdata/firmament/exports/p2_linear_hole_row.step
@@ -5,75 +5,360 @@ FILE_NAME('aetheris_export.step','1970-01-01T00:00:00',('Aetheris'),('Aetheris')
FILE_SCHEMA(('AP242_MANAGED_MODEL_BASED_3D_ENGINEERING_MIM_LF'));
ENDSEC;
DATA;
-#1=CARTESIAN_POINT($,(10,0,0));
-#2=DIRECTION($,(0,0,1));
+#1=CARTESIAN_POINT($,(0,0,-4));
+#2=DIRECTION($,(0,0,-1));
#3=DIRECTION($,(1,0,0));
#4=AXIS2_PLACEMENT_3D($,#1,#2,#3);
-#5=CYLINDRICAL_SURFACE($,#4,2);
-#6=CARTESIAN_POINT($,(12,0,0));
+#5=PLANE($,#4);
+#6=CARTESIAN_POINT($,(-80,-40,-4));
#7=VERTEX_POINT($,#6);
-#8=CARTESIAN_POINT($,(12,0,8));
+#8=CARTESIAN_POINT($,(40,-40,-4));
#9=VERTEX_POINT($,#8);
-#10=CARTESIAN_POINT($,(12,0,0));
-#11=DIRECTION($,(0,0,1));
+#10=CARTESIAN_POINT($,(-80,-40,-4));
+#11=DIRECTION($,(1,0,0));
#12=VECTOR($,#11,1);
#13=LINE($,#10,#12);
#14=EDGE_CURVE($,#7,#9,#13,.T.);
#15=ORIENTED_EDGE($,$,$,#14,.T.);
-#16=CARTESIAN_POINT($,(12,0,8));
+#16=CARTESIAN_POINT($,(40,40,-4));
#17=VERTEX_POINT($,#16);
-#18=CARTESIAN_POINT($,(10,0,8));
-#19=DIRECTION($,(0,0,1));
-#20=DIRECTION($,(1,0,0));
-#21=AXIS2_PLACEMENT_3D($,#18,#19,#20);
-#22=CIRCLE($,#21,2);
-#23=EDGE_CURVE($,#17,#17,#22,.T.);
-#24=ORIENTED_EDGE($,$,$,#23,.T.);
-#25=ORIENTED_EDGE($,$,$,#14,.F.);
-#26=CARTESIAN_POINT($,(12,0,0));
-#27=VERTEX_POINT($,#26);
-#28=CARTESIAN_POINT($,(10,0,0));
-#29=DIRECTION($,(0,0,1));
-#30=DIRECTION($,(1,0,0));
-#31=AXIS2_PLACEMENT_3D($,#28,#29,#30);
-#32=CIRCLE($,#31,2);
-#33=EDGE_CURVE($,#27,#27,#32,.T.);
-#34=ORIENTED_EDGE($,$,$,#33,.F.);
-#35=EDGE_LOOP($,(#15,#24,#25,#34));
-#36=FACE_OUTER_BOUND('',#35,.T.);
-#37=ADVANCED_FACE('',(#36),#5,.T.);
-#38=CARTESIAN_POINT($,(10,0,8));
-#39=DIRECTION($,(0,0,1));
-#40=DIRECTION($,(1,0,0));
-#41=AXIS2_PLACEMENT_3D($,#38,#39,#40);
-#42=PLANE($,#41);
-#43=ORIENTED_EDGE($,$,$,#23,.F.);
-#44=EDGE_LOOP($,(#43));
-#45=FACE_OUTER_BOUND('',#44,.T.);
-#46=ADVANCED_FACE('',(#45),#42,.T.);
-#47=CARTESIAN_POINT($,(10,0,0));
-#48=DIRECTION($,(0,0,-1));
-#49=DIRECTION($,(0,1,0));
-#50=AXIS2_PLACEMENT_3D($,#47,#48,#49);
-#51=PLANE($,#50);
-#52=ORIENTED_EDGE($,$,$,#33,.T.);
-#53=EDGE_LOOP($,(#52));
-#54=FACE_OUTER_BOUND('',#53,.T.);
-#55=ADVANCED_FACE('',(#54),#51,.T.);
-#56=CLOSED_SHELL($,(#37,#46,#55));
-#57=MANIFOLD_SOLID_BREP('AetherisBody',#56);
-#58=APPLICATION_CONTEXT('mechanical design');
-#59=PRODUCT_CONTEXT('',#58,'mechanical');
-#60=PRODUCT('AETHERIS','AetherisBody','',(#59));
-#61=PRODUCT_DEFINITION_FORMATION('','',#60);
-#62=PRODUCT_DEFINITION_CONTEXT('design',#58,'design');
-#63=PRODUCT_DEFINITION('','',#61,#62);
-#64=PRODUCT_DEFINITION_SHAPE('','',#63);
-#65=(LENGTH_UNIT()NAMED_UNIT(*)SI_UNIT(.MILLI.,.METRE.));
-#66=(NAMED_UNIT(*)PLANE_ANGLE_UNIT()SI_UNIT($,.RADIAN.));
-#67=(NAMED_UNIT(*)SI_UNIT($,.STERADIAN.)SOLID_ANGLE_UNIT());
-#68=(GEOMETRIC_REPRESENTATION_CONTEXT(3)GLOBAL_UNIT_ASSIGNED_CONTEXT((#65,#66,#67))REPRESENTATION_CONTEXT('3','3D'));
-#69=SHAPE_REPRESENTATION('AetherisBody',(#57),#68);
-#70=SHAPE_DEFINITION_REPRESENTATION(#64,#69);
+#18=CARTESIAN_POINT($,(40,-40,-4));
+#19=DIRECTION($,(0,1,0));
+#20=VECTOR($,#19,1);
+#21=LINE($,#18,#20);
+#22=EDGE_CURVE($,#9,#17,#21,.T.);
+#23=ORIENTED_EDGE($,$,$,#22,.T.);
+#24=CARTESIAN_POINT($,(-80,40,-4));
+#25=VERTEX_POINT($,#24);
+#26=CARTESIAN_POINT($,(40,40,-4));
+#27=DIRECTION($,(-1,0,0));
+#28=VECTOR($,#27,1);
+#29=LINE($,#26,#28);
+#30=EDGE_CURVE($,#17,#25,#29,.T.);
+#31=ORIENTED_EDGE($,$,$,#30,.T.);
+#32=CARTESIAN_POINT($,(-80,40,-4));
+#33=DIRECTION($,(0,-1,0));
+#34=VECTOR($,#33,1);
+#35=LINE($,#32,#34);
+#36=EDGE_CURVE($,#25,#7,#35,.T.);
+#37=ORIENTED_EDGE($,$,$,#36,.T.);
+#38=EDGE_LOOP($,(#15,#23,#31,#37));
+#39=FACE_OUTER_BOUND('',#38,.T.);
+#40=CARTESIAN_POINT($,(-18,0,-4));
+#41=VERTEX_POINT($,#40);
+#42=CARTESIAN_POINT($,(-20,0,-4));
+#43=DIRECTION($,(0,0,1));
+#44=DIRECTION($,(1,0,0));
+#45=AXIS2_PLACEMENT_3D($,#42,#43,#44);
+#46=CIRCLE($,#45,2);
+#47=EDGE_CURVE($,#41,#41,#46,.T.);
+#48=ORIENTED_EDGE($,$,$,#47,.F.);
+#49=EDGE_LOOP($,(#48));
+#50=FACE_BOUND('',#49,.T.);
+#51=CARTESIAN_POINT($,(-8,0,-4));
+#52=VERTEX_POINT($,#51);
+#53=CARTESIAN_POINT($,(-10,0,-4));
+#54=DIRECTION($,(0,0,1));
+#55=DIRECTION($,(1,0,0));
+#56=AXIS2_PLACEMENT_3D($,#53,#54,#55);
+#57=CIRCLE($,#56,2);
+#58=EDGE_CURVE($,#52,#52,#57,.T.);
+#59=ORIENTED_EDGE($,$,$,#58,.F.);
+#60=EDGE_LOOP($,(#59));
+#61=FACE_BOUND('',#60,.T.);
+#62=CARTESIAN_POINT($,(2,0,-4));
+#63=VERTEX_POINT($,#62);
+#64=CARTESIAN_POINT($,(0,0,-4));
+#65=DIRECTION($,(0,0,1));
+#66=DIRECTION($,(1,0,0));
+#67=AXIS2_PLACEMENT_3D($,#64,#65,#66);
+#68=CIRCLE($,#67,2);
+#69=EDGE_CURVE($,#63,#63,#68,.T.);
+#70=ORIENTED_EDGE($,$,$,#69,.F.);
+#71=EDGE_LOOP($,(#70));
+#72=FACE_BOUND('',#71,.T.);
+#73=CARTESIAN_POINT($,(12,0,-4));
+#74=VERTEX_POINT($,#73);
+#75=CARTESIAN_POINT($,(10,0,-4));
+#76=DIRECTION($,(0,0,1));
+#77=DIRECTION($,(1,0,0));
+#78=AXIS2_PLACEMENT_3D($,#75,#76,#77);
+#79=CIRCLE($,#78,2);
+#80=EDGE_CURVE($,#74,#74,#79,.T.);
+#81=ORIENTED_EDGE($,$,$,#80,.F.);
+#82=EDGE_LOOP($,(#81));
+#83=FACE_BOUND('',#82,.T.);
+#84=ADVANCED_FACE('',(#39,#50,#61,#72,#83),#5,.T.);
+#85=CARTESIAN_POINT($,(0,0,4));
+#86=DIRECTION($,(0,0,1));
+#87=DIRECTION($,(1,0,0));
+#88=AXIS2_PLACEMENT_3D($,#85,#86,#87);
+#89=PLANE($,#88);
+#90=CARTESIAN_POINT($,(-80,-40,4));
+#91=VERTEX_POINT($,#90);
+#92=CARTESIAN_POINT($,(40,-40,4));
+#93=VERTEX_POINT($,#92);
+#94=CARTESIAN_POINT($,(-80,-40,4));
+#95=DIRECTION($,(1,0,0));
+#96=VECTOR($,#95,1);
+#97=LINE($,#94,#96);
+#98=EDGE_CURVE($,#91,#93,#97,.T.);
+#99=ORIENTED_EDGE($,$,$,#98,.T.);
+#100=CARTESIAN_POINT($,(40,40,4));
+#101=VERTEX_POINT($,#100);
+#102=CARTESIAN_POINT($,(40,-40,4));
+#103=DIRECTION($,(0,1,0));
+#104=VECTOR($,#103,1);
+#105=LINE($,#102,#104);
+#106=EDGE_CURVE($,#93,#101,#105,.T.);
+#107=ORIENTED_EDGE($,$,$,#106,.T.);
+#108=CARTESIAN_POINT($,(-80,40,4));
+#109=VERTEX_POINT($,#108);
+#110=CARTESIAN_POINT($,(40,40,4));
+#111=DIRECTION($,(-1,0,0));
+#112=VECTOR($,#111,1);
+#113=LINE($,#110,#112);
+#114=EDGE_CURVE($,#101,#109,#113,.T.);
+#115=ORIENTED_EDGE($,$,$,#114,.T.);
+#116=CARTESIAN_POINT($,(-80,40,4));
+#117=DIRECTION($,(0,-1,0));
+#118=VECTOR($,#117,1);
+#119=LINE($,#116,#118);
+#120=EDGE_CURVE($,#109,#91,#119,.T.);
+#121=ORIENTED_EDGE($,$,$,#120,.T.);
+#122=EDGE_LOOP($,(#99,#107,#115,#121));
+#123=FACE_OUTER_BOUND('',#122,.T.);
+#124=CARTESIAN_POINT($,(-18,0,4));
+#125=VERTEX_POINT($,#124);
+#126=CARTESIAN_POINT($,(-20,0,4));
+#127=DIRECTION($,(0,0,1));
+#128=DIRECTION($,(1,0,0));
+#129=AXIS2_PLACEMENT_3D($,#126,#127,#128);
+#130=CIRCLE($,#129,2);
+#131=EDGE_CURVE($,#125,#125,#130,.T.);
+#132=ORIENTED_EDGE($,$,$,#131,.T.);
+#133=EDGE_LOOP($,(#132));
+#134=FACE_BOUND('',#133,.T.);
+#135=CARTESIAN_POINT($,(-8,0,4));
+#136=VERTEX_POINT($,#135);
+#137=CARTESIAN_POINT($,(-10,0,4));
+#138=DIRECTION($,(0,0,1));
+#139=DIRECTION($,(1,0,0));
+#140=AXIS2_PLACEMENT_3D($,#137,#138,#139);
+#141=CIRCLE($,#140,2);
+#142=EDGE_CURVE($,#136,#136,#141,.T.);
+#143=ORIENTED_EDGE($,$,$,#142,.T.);
+#144=EDGE_LOOP($,(#143));
+#145=FACE_BOUND('',#144,.T.);
+#146=CARTESIAN_POINT($,(2,0,4));
+#147=VERTEX_POINT($,#146);
+#148=CARTESIAN_POINT($,(0,0,4));
+#149=DIRECTION($,(0,0,1));
+#150=DIRECTION($,(1,0,0));
+#151=AXIS2_PLACEMENT_3D($,#148,#149,#150);
+#152=CIRCLE($,#151,2);
+#153=EDGE_CURVE($,#147,#147,#152,.T.);
+#154=ORIENTED_EDGE($,$,$,#153,.T.);
+#155=EDGE_LOOP($,(#154));
+#156=FACE_BOUND('',#155,.T.);
+#157=CARTESIAN_POINT($,(12,0,4));
+#158=VERTEX_POINT($,#157);
+#159=CARTESIAN_POINT($,(10,0,4));
+#160=DIRECTION($,(0,0,1));
+#161=DIRECTION($,(1,0,0));
+#162=AXIS2_PLACEMENT_3D($,#159,#160,#161);
+#163=CIRCLE($,#162,2);
+#164=EDGE_CURVE($,#158,#158,#163,.T.);
+#165=ORIENTED_EDGE($,$,$,#164,.T.);
+#166=EDGE_LOOP($,(#165));
+#167=FACE_BOUND('',#166,.T.);
+#168=ADVANCED_FACE('',(#123,#134,#145,#156,#167),#89,.T.);
+#169=CARTESIAN_POINT($,(0,-40,0));
+#170=DIRECTION($,(0,-1,0));
+#171=DIRECTION($,(1,0,0));
+#172=AXIS2_PLACEMENT_3D($,#169,#170,#171);
+#173=PLANE($,#172);
+#174=ORIENTED_EDGE($,$,$,#14,.T.);
+#175=CARTESIAN_POINT($,(40,-40,-4));
+#176=DIRECTION($,(0,0,1));
+#177=VECTOR($,#176,1);
+#178=LINE($,#175,#177);
+#179=EDGE_CURVE($,#9,#93,#178,.T.);
+#180=ORIENTED_EDGE($,$,$,#179,.T.);
+#181=ORIENTED_EDGE($,$,$,#98,.F.);
+#182=CARTESIAN_POINT($,(-80,-40,-4));
+#183=DIRECTION($,(0,0,1));
+#184=VECTOR($,#183,1);
+#185=LINE($,#182,#184);
+#186=EDGE_CURVE($,#7,#91,#185,.T.);
+#187=ORIENTED_EDGE($,$,$,#186,.F.);
+#188=EDGE_LOOP($,(#174,#180,#181,#187));
+#189=FACE_OUTER_BOUND('',#188,.T.);
+#190=ADVANCED_FACE('',(#189),#173,.T.);
+#191=CARTESIAN_POINT($,(40,0,0));
+#192=DIRECTION($,(1,0,0));
+#193=DIRECTION($,(0,1,0));
+#194=AXIS2_PLACEMENT_3D($,#191,#192,#193);
+#195=PLANE($,#194);
+#196=ORIENTED_EDGE($,$,$,#22,.T.);
+#197=CARTESIAN_POINT($,(40,40,-4));
+#198=DIRECTION($,(0,0,1));
+#199=VECTOR($,#198,1);
+#200=LINE($,#197,#199);
+#201=EDGE_CURVE($,#17,#101,#200,.T.);
+#202=ORIENTED_EDGE($,$,$,#201,.T.);
+#203=ORIENTED_EDGE($,$,$,#106,.F.);
+#204=ORIENTED_EDGE($,$,$,#179,.F.);
+#205=EDGE_LOOP($,(#196,#202,#203,#204));
+#206=FACE_OUTER_BOUND('',#205,.T.);
+#207=ADVANCED_FACE('',(#206),#195,.T.);
+#208=CARTESIAN_POINT($,(0,40,0));
+#209=DIRECTION($,(0,1,0));
+#210=DIRECTION($,(-1,0,0));
+#211=AXIS2_PLACEMENT_3D($,#208,#209,#210);
+#212=PLANE($,#211);
+#213=ORIENTED_EDGE($,$,$,#30,.T.);
+#214=CARTESIAN_POINT($,(-80,40,-4));
+#215=DIRECTION($,(0,0,1));
+#216=VECTOR($,#215,1);
+#217=LINE($,#214,#216);
+#218=EDGE_CURVE($,#25,#109,#217,.T.);
+#219=ORIENTED_EDGE($,$,$,#218,.T.);
+#220=ORIENTED_EDGE($,$,$,#114,.F.);
+#221=ORIENTED_EDGE($,$,$,#201,.F.);
+#222=EDGE_LOOP($,(#213,#219,#220,#221));
+#223=FACE_OUTER_BOUND('',#222,.T.);
+#224=ADVANCED_FACE('',(#223),#212,.T.);
+#225=CARTESIAN_POINT($,(-80,0,0));
+#226=DIRECTION($,(-1,0,0));
+#227=DIRECTION($,(0,1,0));
+#228=AXIS2_PLACEMENT_3D($,#225,#226,#227);
+#229=PLANE($,#228);
+#230=ORIENTED_EDGE($,$,$,#36,.T.);
+#231=ORIENTED_EDGE($,$,$,#186,.T.);
+#232=ORIENTED_EDGE($,$,$,#120,.F.);
+#233=ORIENTED_EDGE($,$,$,#218,.F.);
+#234=EDGE_LOOP($,(#230,#231,#232,#233));
+#235=FACE_OUTER_BOUND('',#234,.T.);
+#236=ADVANCED_FACE('',(#235),#229,.T.);
+#237=CARTESIAN_POINT($,(-20,0,-4));
+#238=DIRECTION($,(0,0,1));
+#239=DIRECTION($,(1,0,0));
+#240=AXIS2_PLACEMENT_3D($,#237,#238,#239);
+#241=CYLINDRICAL_SURFACE($,#240,2);
+#242=CARTESIAN_POINT($,(-18,0,4));
+#243=VERTEX_POINT($,#242);
+#244=CARTESIAN_POINT($,(-18,0,-4));
+#245=VERTEX_POINT($,#244);
+#246=CARTESIAN_POINT($,(-18,0,4));
+#247=DIRECTION($,(0,0,-1));
+#248=VECTOR($,#247,1);
+#249=LINE($,#246,#248);
+#250=EDGE_CURVE($,#243,#245,#249,.T.);
+#251=ORIENTED_EDGE($,$,$,#250,.T.);
+#252=ORIENTED_EDGE($,$,$,#131,.F.);
+#253=ORIENTED_EDGE($,$,$,#250,.F.);
+#254=ORIENTED_EDGE($,$,$,#47,.T.);
+#255=EDGE_LOOP($,(#251,#252,#253,#254));
+#256=FACE_OUTER_BOUND('',#255,.T.);
+#257=ADVANCED_FACE('',(#256),#241,.T.);
+#258=CARTESIAN_POINT($,(-10,0,-4));
+#259=DIRECTION($,(0,0,1));
+#260=DIRECTION($,(1,0,0));
+#261=AXIS2_PLACEMENT_3D($,#258,#259,#260);
+#262=CYLINDRICAL_SURFACE($,#261,2);
+#263=CARTESIAN_POINT($,(-8,0,4));
+#264=VERTEX_POINT($,#263);
+#265=CARTESIAN_POINT($,(-8,0,-4));
+#266=VERTEX_POINT($,#265);
+#267=CARTESIAN_POINT($,(-8,0,4));
+#268=DIRECTION($,(0,0,-1));
+#269=VECTOR($,#268,1);
+#270=LINE($,#267,#269);
+#271=EDGE_CURVE($,#264,#266,#270,.T.);
+#272=ORIENTED_EDGE($,$,$,#271,.T.);
+#273=ORIENTED_EDGE($,$,$,#142,.F.);
+#274=ORIENTED_EDGE($,$,$,#271,.F.);
+#275=ORIENTED_EDGE($,$,$,#58,.T.);
+#276=EDGE_LOOP($,(#272,#273,#274,#275));
+#277=FACE_OUTER_BOUND('',#276,.T.);
+#278=ADVANCED_FACE('',(#277),#262,.T.);
+#279=CARTESIAN_POINT($,(0,0,-4));
+#280=DIRECTION($,(0,0,1));
+#281=DIRECTION($,(1,0,0));
+#282=AXIS2_PLACEMENT_3D($,#279,#280,#281);
+#283=CYLINDRICAL_SURFACE($,#282,2);
+#284=CARTESIAN_POINT($,(2,0,4));
+#285=VERTEX_POINT($,#284);
+#286=CARTESIAN_POINT($,(2,0,-4));
+#287=VERTEX_POINT($,#286);
+#288=CARTESIAN_POINT($,(2,0,4));
+#289=DIRECTION($,(0,0,-1));
+#290=VECTOR($,#289,1);
+#291=LINE($,#288,#290);
+#292=EDGE_CURVE($,#285,#287,#291,.T.);
+#293=ORIENTED_EDGE($,$,$,#292,.T.);
+#294=ORIENTED_EDGE($,$,$,#153,.F.);
+#295=ORIENTED_EDGE($,$,$,#292,.F.);
+#296=ORIENTED_EDGE($,$,$,#69,.T.);
+#297=EDGE_LOOP($,(#293,#294,#295,#296));
+#298=FACE_OUTER_BOUND('',#297,.T.);
+#299=ADVANCED_FACE('',(#298),#283,.T.);
+#300=CARTESIAN_POINT($,(10,0,-4));
+#301=DIRECTION($,(0,0,1));
+#302=DIRECTION($,(1,0,0));
+#303=AXIS2_PLACEMENT_3D($,#300,#301,#302);
+#304=CYLINDRICAL_SURFACE($,#303,2);
+#305=CARTESIAN_POINT($,(12,0,4));
+#306=VERTEX_POINT($,#305);
+#307=CARTESIAN_POINT($,(12,0,-4));
+#308=VERTEX_POINT($,#307);
+#309=CARTESIAN_POINT($,(12,0,4));
+#310=DIRECTION($,(0,0,-1));
+#311=VECTOR($,#310,1);
+#312=LINE($,#309,#311);
+#313=EDGE_CURVE($,#306,#308,#312,.T.);
+#314=ORIENTED_EDGE($,$,$,#313,.T.);
+#315=ORIENTED_EDGE($,$,$,#164,.F.);
+#316=ORIENTED_EDGE($,$,$,#313,.F.);
+#317=ORIENTED_EDGE($,$,$,#80,.T.);
+#318=EDGE_LOOP($,(#314,#315,#316,#317));
+#319=FACE_OUTER_BOUND('',#318,.T.);
+#320=ADVANCED_FACE('',(#319),#304,.T.);
+#321=CLOSED_SHELL($,(#84,#168,#190,#207,#224,#236,#257,#278,#299,#320));
+#322=MANIFOLD_SOLID_BREP('AetherisBody',#321);
+#323=APPLICATION_CONTEXT('mechanical design');
+#324=PRODUCT_CONTEXT('',#323,'mechanical');
+#325=PRODUCT('AETHERIS','AetherisBody','',(#324));
+#326=PRODUCT_DEFINITION_FORMATION('','',#325);
+#327=PRODUCT_DEFINITION_CONTEXT('design',#323,'design');
+#328=PRODUCT_DEFINITION('','',#326,#327);
+#329=PRODUCT_DEFINITION_SHAPE('','',#328);
+#330=(LENGTH_UNIT()NAMED_UNIT(*)SI_UNIT(.MILLI.,.METRE.));
+#331=(NAMED_UNIT(*)PLANE_ANGLE_UNIT()SI_UNIT($,.RADIAN.));
+#332=(NAMED_UNIT(*)SI_UNIT($,.STERADIAN.)SOLID_ANGLE_UNIT());
+#333=(GEOMETRIC_REPRESENTATION_CONTEXT(3)GLOBAL_UNIT_ASSIGNED_CONTEXT((#330,#331,#332))REPRESENTATION_CONTEXT('3','3D'));
+#334=SHAPE_ASPECT('firmament-feature:hole_cut_1','supported cylinder through-hole feature',#329,.FALSE.);
+#335=PROPERTY_DEFINITION('diameter:hole_cut_1','auto-derived semantic PMI diameter',#334);
+#336=MEASURE_REPRESENTATION_ITEM('diameter',4,#330);
+#337=SHAPE_DIMENSION_REPRESENTATION('diameter:hole_cut_1',(#336),#333);
+#338=PROPERTY_DEFINITION_REPRESENTATION(#335,#337);
+#339=SHAPE_ASPECT('firmament-feature:hole_cut_1__lin1','supported cylinder through-hole feature',#329,.FALSE.);
+#340=PROPERTY_DEFINITION('diameter:hole_cut_1__lin1','auto-derived semantic PMI diameter',#339);
+#341=MEASURE_REPRESENTATION_ITEM('diameter',4,#330);
+#342=SHAPE_DIMENSION_REPRESENTATION('diameter:hole_cut_1__lin1',(#341),#333);
+#343=PROPERTY_DEFINITION_REPRESENTATION(#340,#342);
+#344=SHAPE_ASPECT('firmament-feature:hole_cut_1__lin2','supported cylinder through-hole feature',#329,.FALSE.);
+#345=PROPERTY_DEFINITION('diameter:hole_cut_1__lin2','auto-derived semantic PMI diameter',#344);
+#346=MEASURE_REPRESENTATION_ITEM('diameter',4,#330);
+#347=SHAPE_DIMENSION_REPRESENTATION('diameter:hole_cut_1__lin2',(#346),#333);
+#348=PROPERTY_DEFINITION_REPRESENTATION(#345,#347);
+#349=SHAPE_ASPECT('firmament-feature:hole_cut_1__lin3','supported cylinder through-hole feature',#329,.FALSE.);
+#350=PROPERTY_DEFINITION('diameter:hole_cut_1__lin3','auto-derived semantic PMI diameter',#349);
+#351=MEASURE_REPRESENTATION_ITEM('diameter',4,#330);
+#352=SHAPE_DIMENSION_REPRESENTATION('diameter:hole_cut_1__lin3',(#351),#333);
+#353=PROPERTY_DEFINITION_REPRESENTATION(#350,#352);
+#354=SHAPE_REPRESENTATION('AetherisBody',(#322),#333);
+#355=SHAPE_DEFINITION_REPRESENTATION(#329,#354);
ENDSEC;
END-ISO-10303-21;
diff --git a/testdata/firmament/fixtures/p2_invalid_pattern_source_primitive.firmament b/testdata/firmament/fixtures/p2_invalid_pattern_source_primitive.firmament
new file mode 100644
index 00000000..581e586d
--- /dev/null
+++ b/testdata/firmament/fixtures/p2_invalid_pattern_source_primitive.firmament
@@ -0,0 +1,26 @@
+firmament:
+ version: 1
+
+model:
+ name: p2_invalid_pattern_source_primitive
+ units: mm
+
+ops[3]:
+ -
+ op: cylinder
+ id: hole_marker_1
+ radius: 2
+ height: 8
+
+ -
+ op: pattern_linear
+ source: hole_marker_1
+ count: 2
+ step[3]:
+ 10
+ 0
+ 0
+
+ -
+ op: expect_exists
+ target: hole_marker_1__lin2
diff --git a/testdata/firmament/fixtures/p2_invalid_pattern_unknown_axis.firmament b/testdata/firmament/fixtures/p2_invalid_pattern_unknown_axis.firmament
index cf39da4b..11464d0d 100644
--- a/testdata/firmament/fixtures/p2_invalid_pattern_unknown_axis.firmament
+++ b/testdata/firmament/fixtures/p2_invalid_pattern_unknown_axis.firmament
@@ -7,29 +7,25 @@ model:
ops[3]:
-
- op: cylinder
- id: flange
- radius: 36
- height: 12
+ op: box
+ id: plate
+ size[3]:
+ 60
+ 20
+ 8
-
- op: cylinder
- id: bolt_marker_1
- radius: 3
- height: 12
- place:
- on_face: flange.top_face
- around_axis: flange.side_face
- radial_offset: 20
- angle_degrees: 0
- offset[3]:
- 0
- 0
- 0
+ op: subtract
+ id: hole_cut_1
+ from: plate
+ with:
+ op: cylinder
+ radius: 2
+ height: 8
-
op: pattern_circular
- source: bolt_marker_1
+ source: hole_cut_1
count: 5
axis: missing.side_face
angle_degrees: 360