Update libraries to use Plan/Body/PLAN_VIEW instead of annotations.

src/blenderbim/blenderbim/bim/data/libraries/IFC4 Demo Library.ifc

@@ -1,13 +1,13 @@
 ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION(('ViewDefinition[DesignTransferView]'),'2;1');
-FILE_NAME('/dev/null','2022-10-14T18:00:26+11:00',(),(),'IfcOpenShell v0.7.0-dc67287d','IfcOpenShell v0.7.0-dc67287d','Nobody');
+FILE_NAME('/dev/null','2023-02-04T13:08:05+11:00',(),(),'IfcOpenShell v0.7.0-07ee62eb9','IfcOpenShell v0.7.0-07ee62eb9','Nobody');
 FILE_SCHEMA(('IFC4'));
 ENDSEC;
 DATA;
-#1=IFCPROJECT('0yOx2IKFL4HAbf$IjzE0Kp',$,'BlenderBIM Demo',$,$,$,$,(#12,#16),#7);
+#1=IFCPROJECT('3ubSuEuavEPfXTf4v0gmbA',$,'BlenderBIM Demo',$,$,$,$,(#12,#16),#7);
-#2=IFCPROJECTLIBRARY('2jUXWJsnH2pxWl9Bl3Ljhd',$,'BlenderBIM Demo Library',$,$,$,$,$,$);
+#2=IFCPROJECTLIBRARY('1Qq43hq0v3B9Ko7EGW0hJ5',$,'BlenderBIM Demo Library',$,$,$,$,$,$);
-#3=IFCRELDECLARES('0Rn4fWoen7xB9hskGGEfEy',$,$,$,#1,(#2));
+#3=IFCRELDECLARES('0hU2lTJfX70AKkhyURrbam',$,$,$,#1,(#2));
 #4=IFCSIUNIT(*,.LENGTHUNIT.,$,.METRE.);
 #5=IFCSIUNIT(*,.AREAUNIT.,$,.SQUARE_METRE.);
 #6=IFCSIUNIT(*,.VOLUMEUNIT.,$,.CUBIC_METRE.);
@@ -17,89 +17,89 @@ DATA;
 #10=IFCDIRECTION((1.,0.,0.));
 #11=IFCAXIS2PLACEMENT3D(#8,#9,#10);
 #12=IFCGEOMETRICREPRESENTATIONCONTEXT($,'Model',3,1.E-05,#11,$);
-#13=IFCCARTESIANPOINT((0.,0.,0.));
+#13=IFCCARTESIANPOINT((0.,0.));
-#14=IFCDIRECTION((1.,0.,0.));
+#14=IFCDIRECTION((1.,0.));
 #15=IFCAXIS2PLACEMENT2D(#13,#14);
 #16=IFCGEOMETRICREPRESENTATIONCONTEXT($,'Plan',2,1.E-05,#15,$);
 #17=IFCGEOMETRICREPRESENTATIONSUBCONTEXT('Body','Model',*,*,*,*,#12,$,.MODEL_VIEW.,$);
-#18=IFCGEOMETRICREPRESENTATIONSUBCONTEXT('Annotation','Plan',*,*,*,*,#16,$,.PLAN_VIEW.,$);
+#18=IFCGEOMETRICREPRESENTATIONSUBCONTEXT('Body','Plan',*,*,*,*,#16,$,.PLAN_VIEW.,$);
 #19=IFCMATERIAL('Unknown',$,$);
-#20=IFCWALLTYPE('0D2QFqmA18fvA6TUteIRXc',$,'WAL50',$,$,$,$,$,$,.NOTDEFINED.);
+#20=IFCWALLTYPE('3yGmcLQT96CPWJXcV3vNPJ',$,'WAL50',$,$,$,$,$,$,.NOTDEFINED.);
 #21=IFCMATERIALLAYERSET((#23),$,$);
-#22=IFCRELASSOCIATESMATERIAL('0WbN7alqv8ix3w4MOdyl8F',$,$,$,(#20),#21);
+#22=IFCRELASSOCIATESMATERIAL('0JMzROKjj7i8EKtMLZ2nXy',$,$,$,(#20),#21);
 #23=IFCMATERIALLAYER(#19,0.05,$,$,$,$,$);
-#24=IFCRELDECLARES('13kodoVGr08Bn7WfGWndV_',$,$,$,#2,(#37,#41,#76,#47,#58,#91,#25,#225,#71,#159,#29,#62,#95,#20,#53,#86,#33,#66,#81));
+#24=IFCRELDECLARES('1TTgyh7ynBQ8XpgpGSU6ao',$,$,$,#2,(#41,#76,#47,#58,#91,#25,#159,#225,#71,#29,#62,#95,#20,#53,#86,#33,#66,#81,#37));
-#25=IFCWALLTYPE('0qRxb2OqjDEfFI9i7b6qAw',$,'WAL100',$,$,$,$,$,$,.NOTDEFINED.);
+#25=IFCWALLTYPE('20jY5HfLH4LBwMrDEoTdML',$,'WAL100',$,$,$,$,$,$,.NOTDEFINED.);
 #26=IFCMATERIALLAYERSET((#28),$,$);
-#27=IFCRELASSOCIATESMATERIAL('3BDm6HH553QhwCW7FPmjrR',$,$,$,(#25),#26);
+#27=IFCRELASSOCIATESMATERIAL('2sICOUhur5WgrNUOi1pvhV',$,$,$,(#25),#26);
 #28=IFCMATERIALLAYER(#19,0.1,$,$,$,$,$);
-#29=IFCWALLTYPE('1KMENjmzj7cf_am9SYEaXW',$,'WAL200',$,$,$,$,$,$,.NOTDEFINED.);
+#29=IFCWALLTYPE('0xhGqQenH5Ov9L_CiLywqN',$,'WAL200',$,$,$,$,$,$,.NOTDEFINED.);
 #30=IFCMATERIALLAYERSET((#32),$,$);
-#31=IFCRELASSOCIATESMATERIAL('1$36L06DrDYx1sZ9tBQ_WE',$,$,$,(#29),#30);
+#31=IFCRELASSOCIATESMATERIAL('2pOhWSsWT4bQwtduxS8HNJ',$,$,$,(#29),#30);
 #32=IFCMATERIALLAYER(#19,0.2,$,$,$,$,$);
-#33=IFCWALLTYPE('2y5Y19etz3rhrt8P45fuGA',$,'WAL300',$,$,$,$,$,$,.NOTDEFINED.);
+#33=IFCWALLTYPE('1HrJFcNVH4XQJIRrEmUD6Z',$,'WAL300',$,$,$,$,$,$,.NOTDEFINED.);
 #34=IFCMATERIALLAYERSET((#36),$,$);
-#35=IFCRELASSOCIATESMATERIAL('1WSONmheTD9xhiluqtfktr',$,$,$,(#33),#34);
+#35=IFCRELASSOCIATESMATERIAL('0cAK6yBnXAnO$5LYcU3QQl',$,$,$,(#33),#34);
 #36=IFCMATERIALLAYER(#19,0.3,$,$,$,$,$);
-#37=IFCCOVERINGTYPE('1pAuiYopL5hxCATiIPV8QG',$,'COV10',$,$,$,$,$,$,.NOTDEFINED.);
+#37=IFCCOVERINGTYPE('11MVutxgn20fTEibOhUiS8',$,'COV10',$,$,$,$,$,$,.NOTDEFINED.);
 #38=IFCMATERIALLAYERSET((#40),$,$);
-#39=IFCRELASSOCIATESMATERIAL('0ysRf97LT8fw28mDwt2vop',$,$,$,(#37),#38);
+#39=IFCRELASSOCIATESMATERIAL('1$dvrpTAn6oPSVqcMtsvmV',$,$,$,(#37),#38);
 #40=IFCMATERIALLAYER(#19,0.01,$,$,$,$,$);
-#41=IFCCOVERINGTYPE('00LbT8PQf3XwImYkj_i_$4',$,'COV20',$,$,(#45),$,$,$,.NOTDEFINED.);
+#41=IFCCOVERINGTYPE('1DWvr7poP3ggxFE7vxOot2',$,'COV20',$,$,(#45),$,$,$,.NOTDEFINED.);
 #42=IFCMATERIALLAYERSET((#44),$,$);
-#43=IFCRELASSOCIATESMATERIAL('0Kvr3quG19xw6$528t4NQi',$,$,$,(#41),#42);
+#43=IFCRELASSOCIATESMATERIAL('2uf2C_54501xFgLlk_jqMG',$,$,$,(#41),#42);
 #44=IFCMATERIALLAYER(#19,0.02,$,$,$,$,$);
-#45=IFCPROPERTYSET('1IZqsXecj8NQZcNAIAY48P',$,'EPset_Parametric',$,(#46));
+#45=IFCPROPERTYSET('0fSGHPSBH9U8H_ph5xpH65',$,'EPset_Parametric',$,(#46));
 #46=IFCPROPERTYSINGLEVALUE('LayerSetDirection',$,IFCLABEL('AXIS2'),$);
-#47=IFCCOVERINGTYPE('10YNsLMi9409CbEVFmDkJt',$,'COV30',$,$,(#51),$,$,$,.NOTDEFINED.);
+#47=IFCCOVERINGTYPE('1ayqDfj8XDxB$G7ZFyRagM',$,'COV30',$,$,(#51),$,$,$,.NOTDEFINED.);
 #48=IFCMATERIALLAYERSET((#50),$,$);
-#49=IFCRELASSOCIATESMATERIAL('2jZVWXllT9ugYrdBaIBAnt',$,$,$,(#47),#48);
+#49=IFCRELASSOCIATESMATERIAL('01vVE$oHTA3BLmh2imRGuu',$,$,$,(#47),#48);
 #50=IFCMATERIALLAYER(#19,0.03,$,$,$,$,$);
-#51=IFCPROPERTYSET('2M2_M1eSXFYR8vFE96Ecy1',$,'EPset_Parametric',$,(#52));
+#51=IFCPROPERTYSET('3v7cOUGgT0qxrxlQkzwSIR',$,'EPset_Parametric',$,(#52));
 #52=IFCPROPERTYSINGLEVALUE('LayerSetDirection',$,IFCLABEL('AXIS3'),$);
-#53=IFCRAMPTYPE('09P6PVRiT44vIjup23Olfq',$,'RAM200',$,$,$,$,$,$,.NOTDEFINED.);
+#53=IFCRAMPTYPE('0VEv7VZVnDzxHXC$QE2Crm',$,'RAM200',$,$,$,$,$,$,.NOTDEFINED.);
 #54=IFCMATERIALLAYERSET((#56),$,$);
-#55=IFCRELASSOCIATESMATERIAL('2Ghy1OMS1FLAOmdzrFp4rp',$,$,$,(#53),#54);
+#55=IFCRELASSOCIATESMATERIAL('0ToQjR2aLAdgGPuqu6UH1o',$,$,$,(#53),#54);
 #56=IFCMATERIALLAYER(#19,0.2,$,$,$,$,$);
 #57=IFCCIRCLEPROFILEDEF(.AREA.,$,$,0.3);
-#58=IFCPILETYPE('0X0OrCsUnDUPVeAu90N_K$',$,'P1',$,$,$,$,$,$,.NOTDEFINED.);
+#58=IFCPILETYPE('26kmCVC0H4lOhCGn6cCLSQ',$,'P1',$,$,$,$,$,$,.NOTDEFINED.);
 #59=IFCMATERIALPROFILESET($,$,(#61),$);
-#60=IFCRELASSOCIATESMATERIAL('1FiRvXL$nBkuT8B3FfiGT9',$,$,$,(#58),#59);
+#60=IFCRELASSOCIATESMATERIAL('2Ev3ucMBPDtwntRLG_4cBU',$,$,$,(#58),#59);
 #61=IFCMATERIALPROFILE($,$,#19,#57,$,$);
-#62=IFCSLABTYPE('1helZ086v1o8JD3Ow1eWAy',$,'FLR150',$,$,$,$,$,$,.NOTDEFINED.);
+#62=IFCSLABTYPE('3cLRr85lHDAPjHswaO7574',$,'FLR150',$,$,$,$,$,$,.NOTDEFINED.);
 #63=IFCMATERIALLAYERSET((#65),$,$);
-#64=IFCRELASSOCIATESMATERIAL('3BbM02xKH6h97dBaMJp$Rr',$,$,$,(#62),#63);
+#64=IFCRELASSOCIATESMATERIAL('07afdGZLHCFej$qXPfCLn9',$,$,$,(#62),#63);
 #65=IFCMATERIALLAYER(#19,0.2,$,$,$,$,$);
-#66=IFCSLABTYPE('1YAagoi$9D_hPiWtssbkcG',$,'FLR250',$,$,$,$,$,$,.NOTDEFINED.);
+#66=IFCSLABTYPE('2WiuelwGf3Ah3gnVgDGEAn',$,'FLR250',$,$,$,$,$,$,.NOTDEFINED.);
 #67=IFCMATERIALLAYERSET((#69),$,$);
-#68=IFCRELASSOCIATESMATERIAL('0m1oulHjT1u889pxJG$XG_',$,$,$,(#66),#67);
+#68=IFCRELASSOCIATESMATERIAL('03XoY4bYD4ZwZgvg3JqIIK',$,$,$,(#66),#67);
 #69=IFCMATERIALLAYER(#19,0.3,$,$,$,$,$);
 #70=IFCRECTANGLEPROFILEDEF(.AREA.,$,$,0.5,0.6);
-#71=IFCCOLUMNTYPE('1lzPzyyFfFYRgjqMHnKZLx',$,'C1',$,$,$,$,$,$,.NOTDEFINED.);
+#71=IFCCOLUMNTYPE('187MdL9O13_OzlwsOaT0zY',$,'C1',$,$,$,$,$,$,.NOTDEFINED.);
 #72=IFCMATERIALPROFILESET($,$,(#74),$);
-#73=IFCRELASSOCIATESMATERIAL('26fuP2VpfEnhlUsk0K1i4y',$,$,$,(#71),#72);
+#73=IFCRELASSOCIATESMATERIAL('1CMVTn08P2Tu8afsZHQiUk',$,$,$,(#71),#72);
 #74=IFCMATERIALPROFILE($,$,#19,#70,$,$);
 #75=IFCCIRCLEHOLLOWPROFILEDEF(.AREA.,$,$,0.25,0.005);
-#76=IFCCOLUMNTYPE('1qqu_K2Az3yvZSOapZmUrZ',$,'C2',$,$,$,$,$,$,.NOTDEFINED.);
+#76=IFCCOLUMNTYPE('3e6tIcskjDOuj1_UAWcT87',$,'C2',$,$,$,$,$,$,.NOTDEFINED.);
 #77=IFCMATERIALPROFILESET($,$,(#79),$);
-#78=IFCRELASSOCIATESMATERIAL('2YQz9JCGXAogjkmN3RZeKI',$,$,$,(#76),#77);
+#78=IFCRELASSOCIATESMATERIAL('0ahT30pYb7zQ968gWY9q1A',$,$,$,(#76),#77);
 #79=IFCMATERIALPROFILE($,$,#19,#75,$,$);
 #80=IFCRECTANGLEHOLLOWPROFILEDEF(.AREA.,$,$,0.075,0.15,0.005,0.005,0.005);
-#81=IFCCOLUMNTYPE('1rnXRgQ3X6pfk5O9j4HCLm',$,'C3',$,$,$,$,$,$,.NOTDEFINED.);
+#81=IFCCOLUMNTYPE('0ZxXYg0BTFg8sbqXr50qPW',$,'C3',$,$,$,$,$,$,.NOTDEFINED.);
 #82=IFCMATERIALPROFILESET($,$,(#84),$);
-#83=IFCRELASSOCIATESMATERIAL('2CQLZ1qlzA9uN2eRrpg99c',$,$,$,(#81),#82);
+#83=IFCRELASSOCIATESMATERIAL('0ul_xSpIH2MxsZcv$ZFXG7',$,$,$,(#81),#82);
 #84=IFCMATERIALPROFILE($,$,#19,#80,$,$);
 #85=IFCISHAPEPROFILEDEF(.AREA.,'DEMO-I',$,0.1,0.2,0.005,0.01,0.005,$,$);
-#86=IFCBEAMTYPE('1xjrF860f2H9zb04Ui98Rt',$,'B1',$,$,$,$,$,$,.NOTDEFINED.);
+#86=IFCBEAMTYPE('06Td_2IhD5OgyKW34Ikv$Z',$,'B1',$,$,$,$,$,$,.NOTDEFINED.);
 #87=IFCMATERIALPROFILESET($,$,(#89),$);
-#88=IFCRELASSOCIATESMATERIAL('03i9c81690fx2ZTBBXcqkL',$,$,$,(#86),#87);
+#88=IFCRELASSOCIATESMATERIAL('2cT5kDtU11jv2sFtIKVfJa',$,$,$,(#86),#87);
 #89=IFCMATERIALPROFILE($,$,#19,#85,$,$);
 #90=IFCCSHAPEPROFILEDEF(.AREA.,'DEMO-C',$,0.2,0.1,0.0015,0.03,0.005);
-#91=IFCBEAMTYPE('3mAc_7AGP06w4CzYOlYVL2',$,'B2',$,$,$,$,$,$,.NOTDEFINED.);
+#91=IFCBEAMTYPE('1JyktsoBP8DgMbJiECPZ6d',$,'B2',$,$,$,$,$,$,.NOTDEFINED.);
 #92=IFCMATERIALPROFILESET($,$,(#94),$);
-#93=IFCRELASSOCIATESMATERIAL('2xvXgaSvL7KPR25fXz0fSE',$,$,$,(#91),#92);
+#93=IFCRELASSOCIATESMATERIAL('2$_YKuP914sBZmflM_8l1s',$,$,$,(#91),#92);
 #94=IFCMATERIALPROFILE($,$,#19,#90,$,$);
-#95=IFCWINDOWTYPE('1kxjrhA4P2dwwueZ0_nSuu',$,'WT01',$,$,$,(#136,#158),$,$,.NOTDEFINED.,.NOTDEFINED.,$,$);
+#95=IFCWINDOWTYPE('0g10V5zVP8c96j3mPV0Xvn',$,'WT01',$,$,$,(#136,#158),$,$,.NOTDEFINED.,.NOTDEFINED.,$,$);
 #96=IFCINDEXEDPOLYGONALFACE((13,17,18,14));
 #97=IFCINDEXEDPOLYGONALFACE((5,6,3,4));
 #98=IFCINDEXEDPOLYGONALFACE((7,8,2,1));
@@ -157,13 +157,13 @@ DATA;
 #150=IFCINDEXEDPOLYCURVE(#137,(IFCLINEINDEX((5,11))),$);
 #151=IFCINDEXEDPOLYCURVE(#137,(IFCLINEINDEX((6,12))),$);
 #152=IFCGEOMETRICCURVESET((#138,#139,#140,#141,#142,#143,#144,#145,#146,#147,#148,#149,#150,#151));
-#153=IFCSHAPEREPRESENTATION(#18,'Annotation','Annotation2D',(#152));
+#153=IFCSHAPEREPRESENTATION(#18,'Body','Annotation2D',(#152));
 #154=IFCCARTESIANPOINT((0.,0.,0.));
 #155=IFCDIRECTION((1.,0.,0.));
 #156=IFCDIRECTION((0.,0.,1.));
 #157=IFCAXIS2PLACEMENT3D(#154,#156,#155);
 #158=IFCREPRESENTATIONMAP(#157,#153);
-#159=IFCDOORTYPE('0s370BWH51r8Xg03pJ5OBE',$,'DT01',$,$,$,(#204,#224),$,$,.NOTDEFINED.,.NOTDEFINED.,$,$);
+#159=IFCDOORTYPE('0nu4v3oPPFmQIz2RA1Vp_t',$,'DT01',$,$,$,(#204,#224),$,$,.NOTDEFINED.,.NOTDEFINED.,$,$);
 #160=IFCINDEXEDPOLYGONALFACE((17,16,15,14));
 #161=IFCINDEXEDPOLYGONALFACE((2,3,29,28));
 #162=IFCINDEXEDPOLYGONALFACE((27,28,29,30,32,31));
@@ -223,13 +223,13 @@ DATA;
 #216=IFCINDEXEDPOLYCURVE(#205,(IFCLINEINDEX((11,15))),$);
 #217=IFCINDEXEDPOLYCURVE(#205,(IFCLINEINDEX((17,18)),IFCLINEINDEX((18,19)),IFCLINEINDEX((19,20)),IFCLINEINDEX((20,21)),IFCLINEINDEX((21,22)),IFCLINEINDEX((22,23)),IFCLINEINDEX((23,24)),IFCLINEINDEX((24,25)),IFCLINEINDEX((25,26)),IFCLINEINDEX((26,27)),IFCLINEINDEX((27,28)),IFCLINEINDEX((28,29))),$);
 #218=IFCGEOMETRICCURVESET((#206,#207,#208,#209,#210,#211,#212,#213,#214,#215,#216,#217));
-#219=IFCSHAPEREPRESENTATION(#18,'Annotation','Annotation2D',(#218));
+#219=IFCSHAPEREPRESENTATION(#18,'Body','Annotation2D',(#218));
 #220=IFCCARTESIANPOINT((0.,0.,0.));
 #221=IFCDIRECTION((1.,0.,0.));
 #222=IFCDIRECTION((0.,0.,1.));
 #223=IFCAXIS2PLACEMENT3D(#220,#222,#221);
 #224=IFCREPRESENTATIONMAP(#223,#219);
-#225=IFCFURNITURETYPE('227RrM$yD30RGzlTgbBH3c',$,'BUN01',$,$,$,(#946,#988),$,$,.NOTDEFINED.,.NOTDEFINED.);
+#225=IFCFURNITURETYPE('2YuVxsKJL9URJtwIhHY2GN',$,'BUN01',$,$,$,(#946,#988),$,$,.NOTDEFINED.,.NOTDEFINED.);
 #226=IFCINDEXEDPOLYGONALFACE((187,278,44));
 #227=IFCINDEXEDPOLYGONALFACE((21,52,60));
 #228=IFCINDEXEDPOLYGONALFACE((91,100,31));
@@ -987,7 +987,7 @@ DATA;
 #980=IFCINDEXEDPOLYCURVE(#947,(IFCLINEINDEX((60,61)),IFCLINEINDEX((61,62)),IFCLINEINDEX((62,63))),$);
 #981=IFCINDEXEDPOLYCURVE(#947,(IFCLINEINDEX((64,31))),$);
 #982=IFCGEOMETRICCURVESET((#948,#949,#950,#951,#952,#953,#954,#955,#956,#957,#958,#959,#960,#961,#962,#963,#964,#965,#966,#967,#968,#969,#970,#971,#972,#973,#974,#975,#976,#977,#978,#979,#980,#981));
-#983=IFCSHAPEREPRESENTATION(#18,'Annotation','Annotation2D',(#982));
+#983=IFCSHAPEREPRESENTATION(#18,'Body','Annotation2D',(#982));
 #984=IFCCARTESIANPOINT((0.,0.,0.));
 #985=IFCDIRECTION((1.,0.,0.));
 #986=IFCDIRECTION((0.,0.,1.));

src/blenderbim/blenderbim/bim/module/drawing/operator.py

@@ -381,7 +381,9 @@ class CreateDrawing(bpy.types.Operator):
             for body_context in body_contexts:
                 with profile("Processing body context"):
                     if body_context and elements:
-                        geom_settings = ifcopenshell.geom.settings(DISABLE_TRIANGULATION=True, STRICT_TOLERANCE=True)
+                        geom_settings = ifcopenshell.geom.settings(
+                            DISABLE_TRIANGULATION=True, STRICT_TOLERANCE=True, INCLUDE_CURVES=True
+                        )
                         geom_settings.set_context_ids(body_context)
                         it = ifcopenshell.geom.iterator(geom_settings, ifc, multiprocessing.cpu_count(), include=elements)
                         it.set_cache(cache)

src/blenderbim/blenderbim/core/project.py

@@ -47,19 +47,22 @@ def create_project(ifc, project, schema=None, template=None):
     project.run_context_add_context(
         context_type="Model", context_identifier="Box", target_view="MODEL_VIEW", parent=model
     )
+    project.run_context_add_context(
+        context_type="Model", context_identifier="Annotation", target_view="SECTION_VIEW", parent=model
+    )
+    project.run_context_add_context(
+        context_type="Model", context_identifier="Annotation", target_view="ELEVATION_VIEW", parent=model
+    )
     plan = project.run_context_add_context(context_type="Plan", context_identifier="", target_view="", parent=0)
     project.run_context_add_context(
         context_type="Plan", context_identifier="Axis", target_view="GRAPH_VIEW", parent=plan
     )
+    project.run_context_add_context(
+        context_type="Plan", context_identifier="Body", target_view="PLAN_VIEW", parent=plan
+    )
     project.run_context_add_context(
         context_type="Plan", context_identifier="Annotation", target_view="PLAN_VIEW", parent=plan
     )
-    project.run_context_add_context(
-        context_type="Plan", context_identifier="Annotation", target_view="SECTION_VIEW", parent=plan
-    )
-    project.run_context_add_context(
-        context_type="Plan", context_identifier="Annotation", target_view="ELEVATION_VIEW", parent=plan
-    )
 
     project.run_root_assign_class(obj=site, ifc_class="IfcSite", context=body)
     project.run_root_assign_class(obj=building, ifc_class="IfcBuilding", context=body)

src/blenderbim/scripts/generate_au_library.py

@@ -48,7 +48,7 @@ class LibraryGenerator:
         model = ifcopenshell.api.run("context.add_context", self.file, context_type="Model")
         plan = ifcopenshell.api.run("context.add_context", self.file, context_type="Plan")
         self.representations = {
-            "body": ifcopenshell.api.run(
+            "model_body": ifcopenshell.api.run(
                 "context.add_context",
                 self.file,
                 context_type="Model",
@@ -56,7 +56,7 @@ class LibraryGenerator:
                 target_view="MODEL_VIEW",
                 parent=model,
             ),
-            "annotation": ifcopenshell.api.run(
+            "plan_body": ifcopenshell.api.run(
                 "context.add_context",
                 self.file,
                 context_type="Plan",
@@ -179,9 +179,9 @@ class LibraryGenerator:
         )
         self.create_profile_type("IfcBeamType", "DEMO2", profile)
 
-        self.create_type("IfcWindowType", "DEMO1", {"body": "Window", "annotation": "Window-Annotation"})
+        self.create_type("IfcWindowType", "DEMO1", {"model_body": "Window", "plan_body": "Window-Annotation"})
-        self.create_type("IfcDoorType", "DEMO1", {"body": "Door", "annotation": "Door-Annotation"})
+        self.create_type("IfcDoorType", "DEMO1", {"model_body": "Door", "plan_body": "Door-Annotation"})
-        self.create_type("IfcFurnitureType", "BUNNY", {"body": "Bunny", "annotation": "Bunny-Annotation"})
+        self.create_type("IfcFurnitureType", "BUNNY", {"model_body": "Bunny", "plan_body": "Bunny-Annotation"})
 
         self.file.write("blenderbim-au-library.ifc")
 

src/blenderbim/scripts/generate_demo_library.py

@@ -41,7 +41,7 @@ class LibraryGenerator:
         model = ifcopenshell.api.run("context.add_context", self.file, context_type="Model")
         plan = ifcopenshell.api.run("context.add_context", self.file, context_type="Plan")
         self.representations = {
-            "body": ifcopenshell.api.run(
+            "model_body": ifcopenshell.api.run(
                 "context.add_context",
                 self.file,
                 context_type="Model",
@@ -49,11 +49,11 @@ class LibraryGenerator:
                 target_view="MODEL_VIEW",
                 parent=model,
             ),
-            "annotation": ifcopenshell.api.run(
+            "plan_body": ifcopenshell.api.run(
                 "context.add_context",
                 self.file,
                 context_type="Plan",
-                context_identifier="Annotation",
+                context_identifier="Body",
                 target_view="PLAN_VIEW",
                 parent=plan,
             ),
@@ -127,9 +127,9 @@ class LibraryGenerator:
         )
         self.create_profile_type("IfcBeamType", "B2", profile)
 
-        self.create_type("IfcWindowType", "WT01", {"body": "Window", "annotation": "Window-Annotation"})
+        self.create_type("IfcWindowType", "WT01", {"model_body": "Window", "plan_body": "Window-Plan"})
-        self.create_type("IfcDoorType", "DT01", {"body": "Door", "annotation": "Door-Annotation"})
+        self.create_type("IfcDoorType", "DT01", {"model_body": "Door", "plan_body": "Door-Plan"})
-        self.create_type("IfcFurnitureType", "BUN01", {"body": "Bunny", "annotation": "Bunny-Annotation"})
+        self.create_type("IfcFurnitureType", "BUN01", {"model_body": "Bunny", "plan_body": "Bunny-Plan"})
 
         self.file.write("IFC4 Demo Library.ifc")
 

src/blenderbim/test/bim/feature/geometry.feature

@@ -19,10 +19,10 @@ Scenario: Add representation
     And I press "bim.assign_class"
     And the object "IfcWall/Cube" is selected
     Then the object "IfcWall/Cube" data is a "Tessellation" representation of "Model/Body/MODEL_VIEW"
-    When the variable "context" is "[c for c in {ifc}.by_type('IfcGeometricRepresentationSubContext') if c.TargetView == 'PLAN_VIEW'][0].id()"
+    When the variable "context" is "[c for c in {ifc}.by_type('IfcGeometricRepresentationSubContext') if c.ContextType == 'Plan' and c.ContextIdentifier == 'Body' and c.TargetView == 'PLAN_VIEW'][0].id()"
     And I set "scene.BIMRootProperties.contexts" to "{context}"
     And I press "bim.add_representation"
-    Then the object "IfcWall/Cube" data is a "Annotation2D" representation of "Plan/Annotation/PLAN_VIEW"
+    Then the object "IfcWall/Cube" data is a "Annotation2D" representation of "Plan/Body/PLAN_VIEW"
 
 Scenario: Add representation - add a new representation to a typed instance
     Given an empty IFC project
@@ -36,11 +36,11 @@ Scenario: Add representation - add a new representation to a typed instance
     Then the object "IfcWall/Wall" data is a "Tessellation" representation of "Model/Body/MODEL_VIEW"
     And the object "IfcWall/Wall.001" data is a "Tessellation" representation of "Model/Body/MODEL_VIEW"
     When the object "IfcWall/Wall" is selected
-    And the variable "context" is "[c for c in {ifc}.by_type('IfcGeometricRepresentationSubContext') if c.TargetView == 'PLAN_VIEW'][0].id()"
+    And the variable "context" is "[c for c in {ifc}.by_type('IfcGeometricRepresentationSubContext') if c.ContextType == 'Plan' and c.ContextIdentifier == 'Body' and c.TargetView == 'PLAN_VIEW'][0].id()"
     And I set "scene.BIMRootProperties.contexts" to "{context}"
     And I press "bim.add_representation"
-    Then the object "IfcWall/Wall" data is a "Annotation2D" representation of "Plan/Annotation/PLAN_VIEW"
+    Then the object "IfcWall/Wall" data is a "Annotation2D" representation of "Plan/Body/PLAN_VIEW"
-    And the object "IfcWall/Wall.001" data is a "Annotation2D" representation of "Plan/Annotation/PLAN_VIEW"
+    And the object "IfcWall/Wall.001" data is a "Annotation2D" representation of "Plan/Body/PLAN_VIEW"
 
 Scenario: Add representation - add a representation with a scale factor applied
     Given an empty IFC project
@@ -79,7 +79,7 @@ Scenario: Switch representation - current edited representation is updated prior
     And the object "Cube" is selected
     And I set "scene.BIMRootProperties.ifc_class" to "IfcWall"
     And I press "bim.assign_class"
-    And the variable "context" is "[c for c in {ifc}.by_type('IfcGeometricRepresentationSubContext') if c.ContextIdentifier=='Annotation'][0].id()"
+    And the variable "context" is "[c for c in {ifc}.by_type('IfcGeometricRepresentationSubContext') if c.ContextType == 'Plan' and c.ContextIdentifier=='Annotation'][0].id()"
     And I set "scene.BIMRootProperties.contexts" to "{context}"
     And I press "bim.add_representation"
     When the object "IfcWall/Cube" is scaled to "2"

src/blenderbim/test/bim/feature/model.feature

@@ -40,13 +40,13 @@ Scenario: Add type instance - add a mesh where existing instances have changed c
     And I press "bim.add_constr_type_instance"
     And the object "IfcWall/Wall" data is a "Tessellation" representation of "Model/Body/MODEL_VIEW"
     And the object "IfcWall/Wall" is selected
-    And the variable "context" is "[c for c in {ifc}.by_type('IfcGeometricRepresentationSubContext') if c.TargetView == 'PLAN_VIEW'][0].id()"
+    And the variable "context" is "[c for c in {ifc}.by_type('IfcGeometricRepresentationSubContext') if c.ContextType == 'Plan' and c.ContextIdentifier == 'Body' and c.TargetView == 'PLAN_VIEW'][0].id()"
     And I set "scene.BIMRootProperties.contexts" to "{context}"
     And I press "bim.add_representation"
-    And the object "IfcWall/Wall" data is a "Annotation2D" representation of "Plan/Annotation/PLAN_VIEW"
+    And the object "IfcWall/Wall" data is a "Annotation2D" representation of "Plan/Body/PLAN_VIEW"
     When I press "bim.add_constr_type_instance"
-    Then the object "IfcWall/Wall" data is a "Annotation2D" representation of "Plan/Annotation/PLAN_VIEW"
+    Then the object "IfcWall/Wall" data is a "Annotation2D" representation of "Plan/Body/PLAN_VIEW"
-    And the object "IfcWall/Wall.001" data is a "Annotation2D" representation of "Plan/Annotation/PLAN_VIEW"
+    And the object "IfcWall/Wall.001" data is a "Annotation2D" representation of "Plan/Body/PLAN_VIEW"
 
 Scenario: Add one type from the Construction Type Browser
     Given an empty IFC project

src/blenderbim/test/core/test_project.py

@@ -50,21 +50,24 @@ class TestCreateProject:
         project.run_context_add_context(
             context_type="Model", context_identifier="Box", target_view="MODEL_VIEW", parent="model"
         ).should_be_called()
+        project.run_context_add_context(
+            context_type="Model", context_identifier="Annotation", target_view="SECTION_VIEW", parent="model"
+        ).should_be_called()
+        project.run_context_add_context(
+            context_type="Model", context_identifier="Annotation", target_view="ELEVATION_VIEW", parent="model"
+        ).should_be_called()
         project.run_context_add_context(
             context_type="Plan", context_identifier="", target_view="", parent=0
         ).should_be_called().will_return("plan")
         project.run_context_add_context(
             context_type="Plan", context_identifier="Axis", target_view="GRAPH_VIEW", parent="plan"
         ).should_be_called()
+        project.run_context_add_context(
+            context_type="Plan", context_identifier="Body", target_view="PLAN_VIEW", parent="plan"
+        ).should_be_called()
         project.run_context_add_context(
             context_type="Plan", context_identifier="Annotation", target_view="PLAN_VIEW", parent="plan"
         ).should_be_called()
-        project.run_context_add_context(
-            context_type="Plan", context_identifier="Annotation", target_view="SECTION_VIEW", parent="plan"
-        ).should_be_called()
-        project.run_context_add_context(
-            context_type="Plan", context_identifier="Annotation", target_view="ELEVATION_VIEW", parent="plan"
-        ).should_be_called()
 
         project.run_root_assign_class(obj="site", ifc_class="IfcSite", context="body").should_be_called()
         project.run_root_assign_class(obj="building", ifc_class="IfcBuilding", context="body").should_be_called()
@@ -107,21 +110,24 @@ class TestCreateProject:
         project.run_context_add_context(
             context_type="Model", context_identifier="Box", target_view="MODEL_VIEW", parent="model"
         ).should_be_called()
+        project.run_context_add_context(
+            context_type="Model", context_identifier="Annotation", target_view="SECTION_VIEW", parent="model"
+        ).should_be_called()
+        project.run_context_add_context(
+            context_type="Model", context_identifier="Annotation", target_view="ELEVATION_VIEW", parent="model"
+        ).should_be_called()
         project.run_context_add_context(
             context_type="Plan", context_identifier="", target_view="", parent=0
         ).should_be_called().will_return("plan")
         project.run_context_add_context(
             context_type="Plan", context_identifier="Axis", target_view="GRAPH_VIEW", parent="plan"
         ).should_be_called()
+        project.run_context_add_context(
+            context_type="Plan", context_identifier="Body", target_view="PLAN_VIEW", parent="plan"
+        ).should_be_called()
         project.run_context_add_context(
             context_type="Plan", context_identifier="Annotation", target_view="PLAN_VIEW", parent="plan"
         ).should_be_called()
-        project.run_context_add_context(
-            context_type="Plan", context_identifier="Annotation", target_view="SECTION_VIEW", parent="plan"
-        ).should_be_called()
-        project.run_context_add_context(
-            context_type="Plan", context_identifier="Annotation", target_view="ELEVATION_VIEW", parent="plan"
-        ).should_be_called()
 
         project.run_root_assign_class(obj="site", ifc_class="IfcSite", context="body").should_be_called()
         project.run_root_assign_class(obj="building", ifc_class="IfcBuilding", context="body").should_be_called()
@@ -173,21 +179,24 @@ class TestCreateProject:
         project.run_context_add_context(
             context_type="Model", context_identifier="Box", target_view="MODEL_VIEW", parent="model"
         ).should_be_called()
+        project.run_context_add_context(
+            context_type="Model", context_identifier="Annotation", target_view="SECTION_VIEW", parent="model"
+        ).should_be_called()
+        project.run_context_add_context(
+            context_type="Model", context_identifier="Annotation", target_view="ELEVATION_VIEW", parent="model"
+        ).should_be_called()
         project.run_context_add_context(
             context_type="Plan", context_identifier="", target_view="", parent=0
         ).should_be_called().will_return("plan")
         project.run_context_add_context(
             context_type="Plan", context_identifier="Axis", target_view="GRAPH_VIEW", parent="plan"
         ).should_be_called()
+        project.run_context_add_context(
+            context_type="Plan", context_identifier="Body", target_view="PLAN_VIEW", parent="plan"
+        ).should_be_called()
         project.run_context_add_context(
             context_type="Plan", context_identifier="Annotation", target_view="PLAN_VIEW", parent="plan"
         ).should_be_called()
-        project.run_context_add_context(
-            context_type="Plan", context_identifier="Annotation", target_view="SECTION_VIEW", parent="plan"
-        ).should_be_called()
-        project.run_context_add_context(
-            context_type="Plan", context_identifier="Annotation", target_view="ELEVATION_VIEW", parent="plan"
-        ).should_be_called()
 
         project.run_root_assign_class(obj="site", ifc_class="IfcSite", context="body").should_be_called()
         project.run_root_assign_class(obj="building", ifc_class="IfcBuilding", context="body").should_be_called()

src/ifcopenshell-python/ifcopenshell/api/unit/assign_unit.py

@@ -61,12 +61,11 @@ class Usecase:
             ifcopenshell.api.run("unit.assign_unit", model)
         """
         self.file = file
-        self.settings = {
+        self.settings = {"units": units}
-            "units": units,
+        # This is a convenience function, likely to be deprecated in the future.
-            "length": {"is_metric": True, "raw": "MILLIMETERS"},
+        self.settings["length"] = length or {"is_metric": True, "raw": "MILLIMETERS"}
-            "area": {"is_metric": True, "raw": "METERS"},
+        self.settings["area"] = area or {"is_metric": True, "raw": "METERS"}
-            "volume": {"is_metric": True, "raw": "METERS"},
+        self.settings["volume"] = volume or {"is_metric": True, "raw": "METERS"}
-        }
 
     def execute(self):
         # We're going to refactor this to split unit creation and assignment