From 42eb0a6f6614024a851ac2dacd38d95ebe9ae8fa Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sat, 11 Sep 2021 18:50:59 +0300
Subject: [PATCH] Revert dumb composite for GDML

---
 .../kotlin/space/kscience/visionforge/gdml/gdmlLoader.kt      | 2 +-
 .../kotlin/space/kscience/visionforge/solid/Composite.kt      | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/gdmlLoader.kt b/visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/gdmlLoader.kt
index 8d5ebd49..2d3da074 100644
--- a/visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/gdmlLoader.kt
+++ b/visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/gdmlLoader.kt
@@ -215,7 +215,7 @@ private class GdmlLoader(val settings: GdmlLoaderOptions) {
                 val first: GdmlSolid = solid.first.resolve(root) ?: error("")
                 val second: GdmlSolid = solid.second.resolve(root) ?: error("")
                 val type: CompositeType = when (solid) {
-                    is GdmlUnion -> CompositeType.GROUP // dumb sum for better performance
+                    is GdmlUnion -> CompositeType.UNION // dumb sum for better performance
                     is GdmlSubtraction -> CompositeType.SUBTRACT
                     is GdmlIntersection -> CompositeType.INTERSECT
                 }
diff --git a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Composite.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Composite.kt
index a68ff645..ecbb4177 100644
--- a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Composite.kt
+++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Composite.kt
@@ -32,7 +32,9 @@ public inline fun VisionContainerBuilder<Solid>.composite(
 ): Composite {
     val group = SolidGroup().apply(builder)
     val children = group.children.values.filterIsInstance<Solid>()
-    if (children.size != 2) error("Composite requires exactly two children, but found ${children.size}")
+    if (children.size != 2){
+        error("Composite requires exactly two children, but found ${children.size}")
+    }
     val res = Composite(type, children[0], children[1])
 
     res.meta.update(group.meta)