fix: ifcclash bcfxml export

src/bcf/tests/v2/test_bcf_xml.py

@@ -47,12 +47,16 @@ def test_bcf_edit_saveas(xml_handler, build_sample) -> None:
             modified_path = Path(tmp_dir) / "edited.bcf"
             parsed.save(modified_path)
             with BcfXml.load(modified_path, xml_handler=xml_handler) as modified_parsed:
-                assert modified_parsed == bcf
-                parsed_th = modified_parsed.topics[orig_th.guid]
-                assert parsed_th.markup != orig_th.markup
-                assert parsed_th.markup == parsed.topics[orig_th.guid].markup
-                assert parsed_th.viewpoints == orig_th.viewpoints
-                assert parsed_th.bim_snippet == orig_th.bim_snippet
+                _assert_modified_parsed(modified_parsed, bcf, orig_th, parsed)
+
+
+def _assert_modified_parsed(modified_parsed, bcf, orig_th, parsed):
+    assert modified_parsed == bcf
+    parsed_th = modified_parsed.topics[orig_th.guid]
+    assert parsed_th.markup != orig_th.markup
+    assert parsed_th.markup == parsed.topics[orig_th.guid].markup
+    assert parsed_th.viewpoints == orig_th.viewpoints
+    assert parsed_th.bim_snippet == orig_th.bim_snippet
 
 
 def test_bcf_edit(xml_handler, build_sample) -> None:
@@ -66,13 +70,8 @@ def test_bcf_edit(xml_handler, build_sample) -> None:
                 th.topic.title = "New Topic Title"
             parsed.save()
             with BcfXml.load(file_path, xml_handler=xml_handler) as modified_parsed:
-                assert modified_parsed == bcf
+                _assert_modified_parsed(modified_parsed, bcf, orig_th, parsed)
                 assert len(modified_parsed.topics) == 1
-                parsed_th = modified_parsed.topics[orig_th.guid]
-                assert parsed_th.markup != orig_th.markup
-                assert parsed_th.markup == parsed.topics[orig_th.guid].markup
-                assert parsed_th.viewpoints == orig_th.viewpoints
-                assert parsed_th.bim_snippet == orig_th.bim_snippet
 
 
 def test_save_no_filename(build_sample) -> None:
@@ -112,11 +111,16 @@ def test_massive_bcf(xml_handler) -> None:
         bcf.save(file_path)
 
 
-def test_equality_with_wrong_object() -> None:
-    with pytest.raises(TypeError):
-        build_sample[0] == "Wrong object"
+def test_equality_with_wrong_object(build_sample) -> None:
+    assert build_sample[0] != "Wrong object"
 
 
-def test_topic_equality_with_wrong_object() -> None:
-    with pytest.raises(TypeError):
-        build_sample[1] == "Wrong object"
+def test_topic_equality_with_wrong_object(build_sample) -> None:
+    assert build_sample[1] != "Wrong object"
+
+
+def test_bcf_get_set_version(build_sample) -> None:
+    bcf = build_sample[0]
+    assert bcf.version.version_id == "2.1"
+    bcf.version.version_id = "2.0"
+    assert bcf.version.version_id == "2.0"

src/bcf/tests/v2/test_ifcclash_api.py

@@ -0,0 +1,36 @@
+import numpy as np
+import pytest
+
+from bcf.v2.bcfxml import BcfXml
+
+
+def test_create_clash_set_bcf() -> None:
+    bcfxml = BcfXml.create_new("Clash Test")
+    topic = bcfxml.add_topic("Test", "Test topic", "IfcClash")
+    topic.add_viewpoint_from_point_and_guids(
+        np.array([10, 10, 10]),
+        "firstId",
+        "secondId",
+    )
+    assert len(topic.viewpoints) == 1
+    guid, vi_handler = next((k, v) for k, v in topic.viewpoints.items())
+    v_info = vi_handler.visualization_info
+    assert v_info.guid == guid
+    components = v_info.components.selection.component
+    assert {c.ifc_guid for c in components} == {"firstId", "secondId"}
+    camera = v_info.perspective_camera
+    viewpoint = camera.camera_view_point
+    assert viewpoint.x == 15
+    assert viewpoint.y == 15
+    assert viewpoint.z == 15
+    # default direction is the unit vector of -1, -1, -1
+    direction = camera.camera_direction
+    assert direction.x == pytest.approx(-1 / 3**0.5)
+    assert direction.y == pytest.approx(-1 / 3**0.5)
+    assert direction.z == pytest.approx(-1 / 3**0.5)
+    # default
+    up_vector = camera.camera_up_vector
+    assert up_vector.x == pytest.approx(-1 / 6**0.5)
+    assert up_vector.y == pytest.approx(-1 / 6**0.5)
+    assert up_vector.z == pytest.approx(1 / 1.5**0.5)
+    assert camera.field_of_view == 60

src/bcf/tests/v3/test_bcf_xml.py

@@ -48,12 +48,16 @@ def test_bcf_edit_saveas(xml_handler, build_sample) -> None:
             modified_path = Path(tmp_dir) / "edited.bcf"
             parsed.save(modified_path)
             with BcfXml.load(modified_path, xml_handler=xml_handler) as modified_parsed:
-                assert modified_parsed == bcf
-                parsed_th = modified_parsed.topics[orig_th.guid]
-                assert parsed_th.markup != orig_th.markup
-                assert parsed_th.markup == parsed.topics[orig_th.guid].markup
-                assert parsed_th.viewpoints == orig_th.viewpoints
-                assert parsed_th.bim_snippet == orig_th.bim_snippet
+                _assert_modified_parsed(modified_parsed, bcf, orig_th, parsed)
+
+
+def _assert_modified_parsed(modified_parsed, bcf, orig_th, parsed):
+    assert modified_parsed == bcf
+    parsed_th = modified_parsed.topics[orig_th.guid]
+    assert parsed_th.markup != orig_th.markup
+    assert parsed_th.markup == parsed.topics[orig_th.guid].markup
+    assert parsed_th.viewpoints == orig_th.viewpoints
+    assert parsed_th.bim_snippet == orig_th.bim_snippet
 
 
 def test_bcf_edit(xml_handler, build_sample) -> None:
@@ -67,13 +71,8 @@ def test_bcf_edit(xml_handler, build_sample) -> None:
                 th.topic.title = "New Topic Title"
             parsed.save()
             with BcfXml.load(file_path, xml_handler=xml_handler) as modified_parsed:
-                assert modified_parsed == bcf
+                _assert_modified_parsed(modified_parsed, bcf, orig_th, parsed)
                 assert len(modified_parsed.topics) == 1
-                parsed_th = modified_parsed.topics[orig_th.guid]
-                assert parsed_th.markup != orig_th.markup
-                assert parsed_th.markup == parsed.topics[orig_th.guid].markup
-                assert parsed_th.viewpoints == orig_th.viewpoints
-                assert parsed_th.bim_snippet == orig_th.bim_snippet
 
 
 def test_save_no_filename(build_sample) -> None:
@@ -88,7 +87,7 @@ def test_load_no_filename() -> None:
 
 
 def test_save_keep_open(build_sample) -> None:
-    bcf, orig_th = build_sample
+    bcf, _ = build_sample
     with TemporaryDirectory() as tmp_dir:
         file_path = Path(tmp_dir) / "test.bcf"
         bcf.save(file_path, keep_open=True)
@@ -96,11 +95,6 @@ def test_save_keep_open(build_sample) -> None:
         bcf._zip_file.close()
 
 
-# image = PIL.Image.new('RGB', size=(100, 100))
-# file = BinaryIO()
-# image.save(file)
-
-
 def test_massive_bcf(xml_handler) -> None:
     ext = mdl.Extensions(topic_types=mdl.ExtensionsTopicTypes(topic_type=["Test type"]))
     bcf = BcfXml.create_new("Test project", extensions=ext, xml_handler=xml_handler)
@@ -119,11 +113,9 @@ def test_massive_bcf(xml_handler) -> None:
         bcf.save(file_path)
 
 
-def test_equality_with_wrong_object() -> None:
-    with pytest.raises(TypeError):
-        build_sample[0] == "Wrong object"
+def test_equality_with_wrong_object(build_sample) -> None:
+    assert build_sample[0] != "Wrong object"
 
 
-def test_topic_equality_with_wrong_object() -> None:
-    with pytest.raises(TypeError):
-        build_sample[1] == "Wrong object"
+def test_topic_equality_with_wrong_object(build_sample) -> None:
+    assert build_sample[1] != "Wrong object"

src/bcf/tests/v3/test_ifcclash_api.py

@@ -0,0 +1,36 @@
+import numpy as np
+import pytest
+
+from bcf.v3.bcfxml import BcfXml
+
+
+def test_create_clash_set_bcf() -> None:
+    bcfxml = BcfXml.create_new("Clash Test")
+    topic = bcfxml.add_topic("Test", "Test topic", "IfcClash")
+    topic.add_viewpoint_from_point_and_guids(
+        np.array([10, 10, 10]),
+        "firstId",
+        "secondId",
+    )
+    assert len(topic.viewpoints) == 1
+    guid, vi_handler = next((k, v) for k, v in topic.viewpoints.items())
+    v_info = vi_handler.visualization_info
+    assert v_info.guid == guid
+    components = v_info.components.selection.component
+    assert {c.ifc_guid for c in components} == {"firstId", "secondId"}
+    camera = v_info.perspective_camera
+    viewpoint = camera.camera_view_point
+    assert viewpoint.x == 15
+    assert viewpoint.y == 15
+    assert viewpoint.z == 15
+    # default direction is the unit vector of -1, -1, -1
+    direction = camera.camera_direction
+    assert direction.x == pytest.approx(-1 / 3**0.5)
+    assert direction.y == pytest.approx(-1 / 3**0.5)
+    assert direction.z == pytest.approx(-1 / 3**0.5)
+    # default
+    up_vector = camera.camera_up_vector
+    assert up_vector.x == pytest.approx(-1 / 6**0.5)
+    assert up_vector.y == pytest.approx(-1 / 6**0.5)
+    assert up_vector.z == pytest.approx(1 / 1.5**0.5)
+    assert camera.field_of_view == 60