Door-representation-improvements-ak

Elements.Serialization.IFC/src/IFCElementExtensions.cs

@@ -5,6 +5,7 @@
 using Elements.Geometry.Interfaces;
 using Elements.Geometry.Solids;
 using Elements.Interfaces;
+using Elements;
 using IFC;
 
 namespace Elements.Serialization.IFC
@@ -192,17 +193,17 @@ private static List<IfcRepresentationItem> AddSolidOperationToDocument(Document
             var ifcRepresentations = new List<IfcRepresentationItem>();
             if (op is Sweep sweep)
             {
-                // Neither of these entities, which are part of the 
-                // IFC4 specification, and which would allow a sweep 
-                // along a curve, are supported by many applications 
+                // Neither of these entities, which are part of the
+                // IFC4 specification, and which would allow a sweep
+                // along a curve, are supported by many applications
                 // which are supposedly IFC4 compliant (Revit). For
                 // Those applications where these entities appear,
-                // the rotation of the profile is often wrong or 
+                // the rotation of the profile is often wrong or
                 // inconsistent.
                 // geom = sweep.ToIfcSurfaceCurveSweptAreaSolid(doc);
                 // geom = sweep.ToIfcFixedReferenceSweptAreaSolid(geoElement.Transform, doc);
 
-                // Instead, we'll divide the curve and create a set of 
+                // Instead, we'll divide the curve and create a set of
                 // linear extrusions instead.
                 Polyline pline;
                 if (sweep.Curve is Line)

Elements.Serialization.IFC/src/IFCToHypar/Converters/FromIfcDoorConverter.cs

@@ -1,5 +1,6 @@
 using Elements.Geometry;
 using Elements.Serialization.IFC.IFCToHypar.RepresentationsExtraction;
+using Elements;
 using IFC;
 using System;
 using System.Collections.Generic;
@@ -34,16 +35,18 @@ public GeometricElement ConvertToElement(IfcProduct ifcProduct, RepresentationDa
 
             // TODO: Implement during the connections establishment.
             //var wall = GetWallFromDoor(ifcDoor, allWalls);
-            var doorWidth = (IfcLengthMeasure) ifcDoor.OverallWidth;
-            var doorHeight = (IfcLengthMeasure) ifcDoor.OverallHeight;
+            var doorWidth = (IfcLengthMeasure)ifcDoor.OverallWidth;
+            var doorHeight = (IfcLengthMeasure)ifcDoor.OverallHeight;
 
             var result = new Door(doorWidth,
                                   doorHeight,
+                                  Door.DOOR_THICKNESS,
                                   openingSide,
                                   openingType,
                                   repData.Transform,
                                   repData.Material,
                                   new Representation(repData.SolidOperations),
+                                  false,
                                   IfcGuid.FromIfcGUID(ifcDoor.GlobalId),
                                   ifcDoor.Name
                                   );

Elements.Serialization.IFC/src/IFCToHypar/IFCExtensions.cs

@@ -4,6 +4,7 @@
 using Elements.Geometry;
 using Elements.Geometry.Interfaces;
 using Elements.Geometry.Solids;
+using Elements;
 using IFC;
 
 namespace Elements.Serialization.IFC.IFCToHypar
@@ -131,7 +132,7 @@ internal static ICurve ToCurve(this IfcParameterizedProfileDef profile)
             }
             else if (profile is IfcCircleProfileDef ifcCircle)
             {
-                var circle = new Circle((IfcLengthMeasure) ifcCircle.Radius);
+                var circle = new Circle((IfcLengthMeasure)ifcCircle.Radius);
                 return circle.Transformed(transform);
             }
             else

Elements.Serialization.IFC/test/IFCTests.cs

@@ -8,6 +8,7 @@
 using System.Collections.Generic;
 using Elements.Geometry.Profiles;
 using System.Linq;
+using System.Xml.Linq;
 
 namespace Elements.IFC.Tests
 {
@@ -28,7 +29,7 @@
         // [InlineData("rac_sample", "../../../models/IFC4/rac_advanced_sample_project.ifc")]
         // [InlineData("rme_sample", "../../../models/IFC4/rme_advanced_sample_project.ifc")]
         // [InlineData("rst_sample", "../../../models/IFC4/rst_advanced_sample_project.ifc")]
-        [InlineData("AC-20-Smiley-West-10-Bldg", "../../../models/IFC4/AC-20-Smiley-West-10-Bldg.ifc", 1972, 120, 539, 270, 9, 140, 10, 2)]
+        [InlineData("AC-20-Smiley-West-10-Bldg", "../../../models/IFC4/AC-20-Smiley-West-10-Bldg.ifc", 1963, 120, 530, 270, 9, 140, 10, 2)]
         // TODO: Some walls are extracted incorrectly and intersecting the roof. It happens because
         // IfcBooleanClippingResultParser doesn't handle the boolean clipping operation.
         // In order to fix it surface support is required.
@@ -38,7 +39,7 @@
         // TODO: The entrance door has an incorrect representation. It happens because during
         // the UpdateRepresentation the default representation of a door is created instead of
         // the extracted one.
-        [InlineData("AC20-Institute-Var-2", "../../../models/IFC4/AC20-Institute-Var-2.ifc", 1517, 5, 577, 121, 7, 82, 0, 21)]
+        [InlineData("AC20-Institute-Var-2", "../../../models/IFC4/AC20-Institute-Var-2.ifc", 1506, 5, 570, 121, 7, 82, 0, 21)]
         // [InlineData("20160125WestRiverSide Hospital - IFC4-Autodesk_Hospital_Sprinkle", "../../../models/IFC4/20160125WestRiverSide Hospital - IFC4-Autodesk_Hospital_Sprinkle.ifc")]
         public void FromIFC4(string name,
                          string ifcPath,
@@ -137,15 +138,18 @@
             var wall1 = new StandardWall(wallLine1, 0.2, 3, name: "Wall1");
             var wall2 = new StandardWall(wallLine2, 0.2, 2, name: "Wall2");
 
-            model.AddElement(wall1);
-            model.AddElement(wall2);
+            var door1 = new Door(wallLine1, 0.5, 1.5, 2.0, Door.DOOR_DEFAULT_THICKNESS, DoorOpeningSide.LeftHand, DoorOpeningType.DoubleSwing);
+            var door2 = new Door(wallLine2, 0.5, 1.5, 1.8, Door.DOOR_DEFAULT_THICKNESS, DoorOpeningSide.LeftHand, DoorOpeningType.DoubleSwing);
 
-            var door1 = new Door(wall1, wallLine1, 0.5, 1.5, 2.0, DoorOpeningSide.LeftHand, DoorOpeningType.DoubleSwing);
-            var door2 = new Door(wall2, wallLine2, 0.5, 1.5, 1.8, DoorOpeningSide.LeftHand, DoorOpeningType.DoubleSwing);
+            wall1.AddDoorOpening(door1);
+            wall2.AddDoorOpening(door2);
 
+            model.AddElement(wall1);
+            model.AddElement(wall2);
             model.AddElement(door1);
             model.AddElement(door2);
 
+            model.ToJson(ConstructJsonPath("IfcDoor"));
             model.ToIFC(ConstructIfcPath("IfcDoor"));
         }