Fix #2998

Add face creation when adding representation for surface structural items #2999
2026-08-07 00:11:36 +00:00 · 2023-04-27 13:26:47 +02:00 · 2023-04-27 09:54:51 +02:00
1198 changed files with 45711 additions and 1233714 deletions
@@ -1,57 +0,0 @@
-name: ci-bcf-pypi
-
-on:
-  schedule:
-    #         ┌───────────── minute (0 - 59)
-    #         │  ┌───────────── hour (0 - 23)
-    #         │  │ ┌───────────── day of the month (1 - 31)
-    #         │  │ │ ┌───────────── month (1 - 12 or JAN-DEC)
-    #         │  │ │ │ ┌───────────── day of the week (0 - 6 or SUN-SAT)
-    #         *  * * * *
-    - cron: "0 0 18 * *"
-  push:
-    paths:
-      - '.github/workflows/ci-bcf-pypi.yml'
-  workflow_dispatch:
-
-env:
-  major: 0
-  minor: 0
-  name: ifcopenshell
-
-jobs:
-  activate:
-    runs-on: ubuntu-latest
-    if: |
-      github.repository == 'IfcOpenShell/IfcOpenShell'
-    steps:
-    - name: Set env
-      run: echo ok go
-
-  build:
-    needs: activate
-    name: ${{ matrix.config.name }}-${{ matrix.pyver }}
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-    steps:
-      - uses: actions/checkout@v2 # https://github.com/actions/checkout
-      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
-        with:
-          python-version: '3.10' # Version range or exact version of a Python version to use, using SemVer's version range syntax
-          architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified
-      - run: echo ${{ env.DATE }}
-      - name: Get current date
-        id: date
-        run: echo "::set-output name=date::$(date +'%y%m%d')"
-      - name: Compile
-        run: |
-          pip install build
-          cd src/bcf &&
-          make dist
-      - name: Publish a Python distribution to PyPI
-        uses: ortega2247/pypi-upload-action@master
-        with:
-          user: __token__
-          password: ${{ secrets.PYPI_API_TOKEN }}
-          packages_dir: src/bcf/dist
@@ -0,0 +1,37 @@
+name: ci-bcf
+
+on:
+  push:
+
+jobs:
+  activate:
+    runs-on: ubuntu-latest
+    if: |
+      github.repository == 'IfcOpenShell/IfcOpenShell' &&
+      contains(github.event.head_commit.message, '[bcf release]')
+    steps:
+      - run: echo ok go
+  upload:
+    needs: activate
+    name: Upload BCF package to Pypi
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2
+        with:
+          python-version: '3.10'
+      - name: Build package
+        run: |
+          cd src/bcf
+          pip install build
+          python -m build
+      - name: Test
+        run: |
+          cd src/bcf
+          make test
+      - name: Publish package
+        uses: pypa/gh-action-pypi-publish@release/v1
+        with:
+          user: __token__
+          password: ${{ secrets.PYPI_TOKEN }}
+          packages_dir: src/bcf/dist
@@ -39,7 +39,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        pyver: [py39, py310, py311]
+        pyver: [py37, py39, py310]
        config:
          - {
            name: "Windows Build",
@@ -62,7 +62,7 @@ jobs:
      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
        with:
          architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified
-          python-version: '3.11'
+          python-version: '3.10'
      - run: echo ${{ env.DATE }}
      - name: Get current date
        id: date
@@ -1,7 +1,10 @@
 name: ci-ifcopenshell-conda-daily

 on:
-  workflow_dispatch:
+  push:
+      paths:
+        - .github/workflows/ci-ifcopenshell-conda-daily.yml
+        - conda/**
  schedule:
  #         ┌───────────── minute (0 - 59)
  #         │  ┌───────────── hour (0 - 23)
@@ -12,8 +15,17 @@ on:
  - cron: "49 23 * * *" # 11min before utc midnight every day

 jobs:
+  activate:
+    runs-on: ubuntu-latest
+    if: |
+      github.repository == 'IfcOpenShell/IfcOpenShell'
+    steps:
+      - name: Set env
+        run: echo ok go
+
  test:
-    name: ${{ matrix.platform.distver }}-${{ matrix.pyver.name }}-${{ matrix.variant }}
+    name: ${{ matrix.platform.distver }}-${{ matrix.pyver.name }}
+    needs: activate
    runs-on: ${{ matrix.platform.distver }}
    defaults:
      run:
@@ -22,23 +34,18 @@ jobs:
      fail-fast: false
      matrix:
        pyver: [
-          { name: py311, distver: '3.11'},
-          { name: py312, distver: '3.12'}
+          { name: py310, distver: '3.10'},
+          { name: py311, distver: '3.11'}
        ]
        platform: [
          { name: Windows, distver: windows-2022, upload: 'true' },
          { name: Linux, distver: ubuntu-22.04,  upload: 'true' },
          { name: macOS, distver: macos-12, upload: 'true' }
        ]
-        variant: [
-          'novtk',
-#          'all'
-        ]
    steps:
      - uses: actions/checkout@v3
        with:
          submodules: recursive
-
      - name: Download MacOSX SDK
        if: ${{ matrix.platform.name == 'macOS' }}
        run: |
@@ -46,22 +53,21 @@ jobs:
          tar xf MacOSX10.13.sdk.tar.xz && \
          sudo mv -v MacOSX10.13.sdk /opt/ && \
          ls /opt/
-
-      - uses: mamba-org/setup-micromamba@v1 # https://github.com/mamba-org/setup-micromamba
+      - uses: seanmiddleditch/gha-setup-ninja@master
+      - uses: mamba-org/provision-with-micromamba@main # https://github.com/mamba-org/provision-with-micromamba
        with:
-          environment-name: build-env
-          cache-environment: true
-          condarc: |
-            channels:
-              - conda-forge
-            channel_priority: strict
-          create-args: >-
-            python=3.11
-            anaconda-client
-            boa
-
+          channels: conda-forge
+          channel-priority: strict
+          environment-file: conda/environment.yml
+          extra-specs: |
+            python=${{ matrix.pyver.distver }}
      - name: build, test and upload ifcopenshell
        if: ${{ matrix.platform.upload == 'true' }}
        run: |
-          conda mambabuild . --python ${{ matrix.pyver.distver }} -c conda-forge --variants "{variant: ${{ matrix.variant }}}" --token ${{ secrets.ANACONDA_TOKEN }} --user ifcopenshell
+          conda-build . --python ${{ matrix.pyver.distver }} -c conda-forge --token ${{ secrets.ANACONDA_TOKEN }} --user ifcopenshell
+        working-directory: ./conda
+      - name: build & test ifcopenshell
+        if: ${{ matrix.platform.upload == 'false' }}
+        run: |
+          conda-build . --python ${{ matrix.pyver.distver }} -c conda-forge
        working-directory: ./conda
@@ -1,57 +0,0 @@
-name: ci-ifctester-pypi
-
-on:
-  schedule:
-    #         ┌───────────── minute (0 - 59)
-    #         │  ┌───────────── hour (0 - 23)
-    #         │  │ ┌───────────── day of the month (1 - 31)
-    #         │  │ │ ┌───────────── month (1 - 12 or JAN-DEC)
-    #         │  │ │ │ ┌───────────── day of the week (0 - 6 or SUN-SAT)
-    #         *  * * * *
-    - cron: "0 0 18 * *"
-  push:
-    paths:
-      - '.github/workflows/ci-ifctester-pypi.yml'
-  workflow_dispatch:
-
-env:
-  major: 0
-  minor: 0
-  name: ifcopenshell
-
-jobs:
-  activate:
-    runs-on: ubuntu-latest
-    if: |
-      github.repository == 'IfcOpenShell/IfcOpenShell'
-    steps:
-    - name: Set env
-      run: echo ok go
-
-  build:
-    needs: activate
-    name: ${{ matrix.config.name }}-${{ matrix.pyver }}
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
-        with:
-          python-version: '3.10' # Version range or exact version of a Python version to use, using SemVer's version range syntax
-          architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified
-      - run: echo ${{ env.DATE }}
-      - name: Get current date
-        id: date
-        run: echo "::set-output name=date::$(date +'%y%m%d')"
-      - name: Compile
-        run: |
-          pip install build
-          cd src/ifctester &&
-          make dist
-      - name: Publish a Python distribution to PyPI
-        uses: ortega2247/pypi-upload-action@master
-        with:
-          user: __token__
-          password: ${{ secrets.PYPI_API_TOKEN }}
-          packages_dir: src/ifctester/dist
@@ -0,0 +1,98 @@
+name: ci_py_only
+
+on:
+  push:
+    paths:
+      - 'src/**'
+      - 'test/**'
+      - 'conda/**'
+      - 'cmake/**'
+      - '.github/workflows/ci-py-only.yml'
+  pull_request:
+
+jobs:
+  activate:
+    runs-on: ubuntu-latest
+    if: |
+      github.repository == 'IfcOpenShell/IfcOpenShell' &&
+      !contains(github.event.head_commit.message, 'skip ci')
+    steps:
+      - run: echo ok go
+
+  build:
+    runs-on: ubuntu-20.04
+    needs: activate
+    steps:
+      - uses: actions/checkout@v2
+        with:
+            submodules: recursive
+      - name: Install C++ dependencies
+        run: |
+          sudo apt update
+          sudo apt-get install --no-install-recommends \
+          git cmake gcc g++ \
+          libboost-date-time-dev \
+          libboost-filesystem-dev \
+          libboost-iostreams-dev \
+          libboost-program-options-dev \
+          libboost-regex-dev \
+          libboost-system-dev \
+          libboost-thread-dev \
+          python3-all-dev python3-pip \
+          swig libpcre3-dev libxml2-dev \
+          libtbb-dev nlohmann-json3-dev \
+          libocct-foundation-dev libocct-modeling-algorithms-dev libocct-modeling-data-dev libocct-ocaf-dev libocct-visualization-dev libocct-data-exchange-dev \
+          libhdf5-dev libcgal-dev
+          
+      - name: ccache
+        uses: hendrikmuhs/ccache-action@v1
+        with:
+          key: ${GITHUB_WORKFLOW}
+
+      - name: Build ifcopenshell
+        run: |
+          sudo /usr/sbin/update-ccache-symlinks
+          mkdir build && cd build
+          PATH="/usr/lib/ccache:$PATH" cmake \
+               -DCMAKE_BUILD_TYPE=Release \
+               -DCMAKE_PREFIX_PATH=/usr \
+               -DCMAKE_SYSTEM_PREFIX_PATH=/usr \
+               -DOCC_INCLUDE_DIR=/usr/include/opencascade \
+               -DOCC_LIBRARY_DIR=/usr/lib/x86_64-linux-gnu \
+               -DPYTHON_EXECUTABLE:FILEPATH=/usr/bin/python3 \
+               -DPYTHON_INCLUDE_DIR:PATH=/usr/include/python3.8 \
+               -DPYTHON_LIBRARY:FILEPATH=/usr/lib/x86_64-linux-gnu/libpython3.8.so \
+               -DCOLLADA_SUPPORT=Off \
+               "-DSCHEMA_VERSIONS=2x3;4;4x3_add1" \
+               -DBUILD_CONVERT=Off \
+               -DGLTF_SUPPORT=On \
+               -DJSON_INCLUDE_DIR=/usr/include \
+               -DCGAL_INCLUDE_DIR=/usr/include \
+               -DGMP_INCLUDE_DIR=/usr/include \
+               -DMPFR_INCLUDE_DIR=/usr/include \
+               -DGMP_LIBRARY_DIR=/usr/lib/x86_64-linux-gnu \
+               -DMPFR_LIBRARY_DIR=/usr/lib/x86_64-linux-gnu \
+               -DHDF5_INCLUDE_DIR=/usr/include/hdf5/serial \
+             ../cmake
+          sudo make -j $(nproc)
+          sudo make install
+
+      - name: Install Python dependencies
+        run: |
+          sudo /usr/bin/python -m pip install -U pip
+          sudo /usr/bin/python -m pip install xmlschema xsdata numpy lxml
+          sudo /usr/bin/python -m pip install src/bcf --no-deps
+          sudo /usr/bin/python -m pip install pytest
+          sudo /usr/bin/python -m pip install isodate
+          sudo /usr/bin/python -m pip install lark
+          sudo /usr/bin/python -m pip install networkx
+          sudo /usr/bin/python -m pip install tabulate
+          sudo /usr/bin/python -m pip install python-dateutil
+
+      - name: Test
+        run: |
+          cd test
+          sudo /usr/bin/python tests.py
+          cd ../src/ifcopenshell-python
+          mv ifcopenshell ifcopenshell-local # Force testing on installed module
+          make test
@@ -31,25 +31,12 @@ jobs:
      - run: echo ok go

  build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
    needs: activate
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v2
        with:
            submodules: recursive
-
-      - name: Set up Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: 3.11
-
-      - name: Install dependencies
-        run: |
-          python -m pip install --upgrade pip
-          pip install xmlschema xsdata numpy lxml pytest isodate lark networkx tabulate python-dateutil
-          pip install src/bcf --no-deps
-          pip install https://github.com/Andrej730/aud/archive/refs/heads/master-reduced-size.zip
-
      - name: Install C++ dependencies
        run: |
          sudo apt update
@@ -62,6 +49,7 @@ jobs:
          libboost-regex-dev \
          libboost-system-dev \
          libboost-thread-dev \
+          python3-all-dev python3-pip \
          swig libpcre3-dev libxml2-dev \
          libtbb-dev nlohmann-json3-dev \
          libocct-foundation-dev libocct-modeling-algorithms-dev libocct-modeling-data-dev libocct-ocaf-dev libocct-visualization-dev libocct-data-exchange-dev \
@@ -74,9 +62,6 @@ jobs:

      - name: Build ifcopenshell
        run: |
-          echo $Python3_ROOT_DIR
-          echo ${{ env.pythonLocation }}
-          
          mkdir build && cd build
          cmake \
               -DCMAKE_C_COMPILER_LAUNCHER=ccache \
@@ -86,9 +71,9 @@ jobs:
               -DCMAKE_SYSTEM_PREFIX_PATH=/usr \
               -DOCC_INCLUDE_DIR=/usr/include/opencascade \
               -DOCC_LIBRARY_DIR=/usr/lib/x86_64-linux-gnu \
-               -DPYTHON_EXECUTABLE:FILEPATH=${{ env.pythonLocation }}/bin/python \
-               -DPYTHON_INCLUDE_DIR:PATH=${{ env.pythonLocation }}/include/python3.11 \
-               -DPYTHON_LIBRARY:FILEPATH=${{ env.pythonLocation }}/lib/libpython3.11.so \
+               -DPYTHON_EXECUTABLE:FILEPATH=/usr/bin/python3 \
+               -DPYTHON_INCLUDE_DIR:PATH=/usr/include/python3.8 \
+               -DPYTHON_LIBRARY:FILEPATH=/usr/lib/x86_64-linux-gnu/libpython3.8.so \
               -DCOLLADA_SUPPORT=Off \
               "-DSCHEMA_VERSIONS=2x3;4;4x3_add1" \
               -DGLTF_SUPPORT=On \
@@ -117,11 +102,23 @@ jobs:
          grep 0$ statuses
          grep 0$ statuses | wc -l

+      - name: Install Python dependencies
+        run: |
+          sudo /usr/bin/python -m pip install -U pip
+          sudo /usr/bin/python -m pip install xmlschema xsdata numpy lxml
+          sudo /usr/bin/python -m pip install src/bcf --no-deps
+          sudo /usr/bin/python -m pip install pytest
+          sudo /usr/bin/python -m pip install isodate
+          sudo /usr/bin/python -m pip install lark
+          sudo /usr/bin/python -m pip install networkx
+          sudo /usr/bin/python -m pip install https://github.com/Andrej730/aud/archive/refs/heads/master-reduced-size.zip
+          sudo /usr/bin/python -m pip install tabulate
+          sudo /usr/bin/python -m pip install python-dateutil

-      - name: Test ifcopenshell-python
+      - name: Test
        run: |
          cd test
-          python tests.py
+          sudo /usr/bin/python tests.py
          cd ../src/ifcopenshell-python
          mv ifcopenshell ifcopenshell-local # Force testing on installed module
-          make test-safe
+          make test
@@ -7,26 +7,34 @@

 # output directories
 /cmake/out/
+/docs/out/
 /src/examples/out/
 /src/ifcmax/out/
 /src/ifcwrap/out/
 /src/qtviewer/out/

-/win/BuildDepsCache*.txt

+/win/BuildDepsCache*.txt
+# IfcExpressParser residue
+/src/ifcexpressparser/express_parser.py
 # General Python residue
 __pycache__
 *.py.bak
-
 # Visual Studio Code files
 .vscode
 .vs
-
 # PyCharm files
 .idea

+#Virtual Env Files
+Pipfile
+Pipfile.lock
+
 # Docs
-/docs/cpp-api/output
+/docs/output
+/docs/rst_files
+/docs/doxygen
+/src/ifcblenderexport/docs/_build

 # gettext binary translation files
 *.mo
@@ -78,20 +86,7 @@ src/blenderbim/blenderbim/libs

 # blenderbim test temp files
 src/blenderbim/test/files/temp
-src/blenderbim/drawings
-src/blenderbim/layouts

 # ifcopenshell swig and compiled files
 src/ifcopenshell-python/ifcopenshell/_ifcopenshell_wrapper.so
 src/ifcopenshell-python/ifcopenshell/ifcopenshell_wrapper.py
-
-# apple
-.DS_Store
-
-# clangd config
-.clangd
-# clangd cache
-.cache
-
-# Brickschema
-src/blenderbim/blenderbim/bim/schema/Brick.ttl
@@ -10,7 +10,4 @@
 	url = https://github.com/IfcOpenShell/svgfill
 [submodule "src/ifcopenshell-python/test/Sample-BIM-Files"]
 	path = src/ifcopenshell-python/test/Sample-BIM-Files
-	url = https://github.com/IfcOpenShell/ids-test-files
-[submodule "docs/cpp-api/assets/doxygen-awesome-css"]
-	path = docs/cpp-api/assets/doxygen-awesome-css
-	url = https://github.com/jothepro/doxygen-awesome-css.git
+	url = https://github.com/IfcOpenShell/ids-test-files
@@ -2,18 +2,14 @@
 IfcOpenShell 
 ============

-<p align="center">
-<img src="https://github.com/IfcOpenShell/IfcOpenShell/assets/88302/34901387-e2dd-4a0c-8e38-9ffc32a66cde">
-</p>
-
 IfcOpenShell is an open source ([LGPL]) software library for working with Industry Foundation Classes ([IFC]). Complete
-parsing support is provided for [IFC2x3 TC1], [IFC4 Add2 TC1], IFC4x1, IFC4x2, and [IFC4x3 Add2]. Extensive geometric support
+parsing support is provided for [IFC2x3 TC1], [IFC4 Add2 TC1], IFC4x1, IFC4x3, and IFC4x3. Extensive geometric support
 is implemented for the IFC releases [IFC2x3 TC1] and [IFC4 Add2 TC1]. Extending with support for arbitrary IFC schemas
 is possible at compile-time when using C++ and at run-time when using Python.

-In addition to a C++ and Python API, IfcOpenShell comes with an ecosystem of tools, notably including IfcConvert (an application
-to convert IFC models to other formats), the BlenderBIM Add-on (an add-on to Blender providing a graphical IFC authoring platform),
-and many other libraries, CLI apps, and more. Support is also provided for auxiliary standards such as BCF and IDS.
+In addition to a C++ and Python API, IfcOpenShell comes with an ecosystem of tools, notably including IfcConvert (an application to convert IFC models to
+other formats), the BlenderBIM Add-on (an add-on to Blender providing a graphical IFC authoring platform), and many
+other libraries, CLI apps, and more. Support is also provided for auxiliary standards such as BCF and IDS.

 For more information, see:

@@ -32,8 +28,8 @@ For more information, see:
 | Anaconda Daily Build                            | [![Anaconda-Server Badge](https://img.shields.io/conda/vn/ifcopenshell/ifcopenshell)](https://anaconda.org/ifcopenshell/ifcopenshell)        |
 | Anaconda v0.7.0 Stable                          | [![Anaconda-Server Badge](https://img.shields.io/conda/vn/conda-forge/ifcopenshell)](https://anaconda.org/conda-forge/ifcopenshell)          |
 | PyPi Daily Build                                | [![PyPi Badge](https://img.shields.io/pypi/v/ifcopenshell)](https://pypi.org/project/ifcopenshell/)                                          |
-| ArchLinux AUR Package Stable                    | [![AUR Badge](https://img.shields.io/aur/version/ifcopenshell)](https://aur.archlinux.org/packages/ifcopenshell)                             |
-| ArchLinux AUR Package git                       | [![AUR Badge](https://img.shields.io/aur/version/ifcopenshell-git)](https://aur.archlinux.org/packages/ifcopenshell-git)                     |
+| ArchLinux AUR Package Stable                           | [![AUR Badge](https://img.shields.io/aur/version/ifcopenshell)](https://aur.archlinux.org/packages/ifcopenshell)                     |
+| ArchLinux AUR Package git                           | [![AUR Badge](https://img.shields.io/aur/version/ifcopenshell-git)](https://aur.archlinux.org/packages/ifcopenshell-git)                     |
 | BlenderBIM Add-on Chocolatey (under moderation) | [![Chocolatey Badge](https://img.shields.io/chocolatey/v/blenderbim-nightly)](https://community.chocolatey.org/packages/blenderbim-nightly/) |
 | Sponsor development on OpenCollective           | [![Financial Contributors](https://opencollective.com/opensourcebim/tiers/badge.svg)](https://opencollective.com/opensourcebim/)             |
 | Docker hub                                      | [![Docker Pulls](https://img.shields.io/docker/pulls/aecgeeks/ifcopenshell)](https://hub.docker.com/r/aecgeeks/ifcopenshell)                 |
@@ -44,7 +40,7 @@ Contents
 Those marked with an asterisk are part of IfcOpenShell.

 | Name                      | Description                                                           | License             |
-| ------------------------- | --------------------------------------------------------------------- | ------------------- |
+| ------------------------- | ----------------------------------------------------------------------| ------------------- |
 | bcf                       | Library to read and write BCF-XML and query OpenCDE BCF-API modules   | LGPL-3.0-or-later   |
 | blenderbim                | Add-on to Blender providing a graphical native IFC authoring platform | GPL-3.0-or-later    |
 | bsdd                      | Library to query the bSDD API                                         | LGPL-3.0-or-later   |
@@ -55,6 +51,7 @@ Those marked with an asterisk are part of IfcOpenShell.
 | ifcblender                | Historic Blender IFC import add-on                                    | LGPL-3.0-or-later\* |
 | ifccityjson               | Convert CityJSON to IFC                                               | LGPL-3.0-or-later   |
 | ifcclash                  | Clash detection library and CLI app                                   | LGPL-3.0-or-later   |
+| ifccobie                  | Extract IFC data for COBie handover requirements                      | LGPL-3.0-or-later   |
 | ifcconvert                | CLI app to convert IFC to many other formats                          | LGPL-3.0-or-later\* |
 | ifccsv                    | Library and CLI app to export and import schedules from IFC           | LGPL-3.0-or-later   |
 | ifcdiff                   | Compare changes between IFC models                                    | LGPL-3.0-or-later   |
@@ -77,7 +74,6 @@ Those marked with an asterisk are part of IfcOpenShell.
 [IFC]: https://technical.buildingsmart.org/standards/ifc/ "IFC"
 [IFC2x3 TC1]: https://standards.buildingsmart.org/IFC/RELEASE/IFC2x3/TC1/HTML/ "IFC2x3 TC1"
 [IFC4 Add2 TC1]: https://standards.buildingsmart.org/IFC/RELEASE/IFC4/ADD2_TC1/HTML/ "IFC4 Add2 TC1"
-[IFC4x3 Add2]: https://standards.buildingsmart.org/IFC/RELEASE/IFC4_3/ "IFC4x3 Add2"
 [Visual Studio]: https://www.visualstudio.com/ "Visual Studio"
 [Visual C++ Build Tools]: http://landinghub.visualstudio.com/visual-cpp-build-tools "Visual C++ Build Tools"
 [MSYS2]: https://msys2.github.io/ "MSYS2"
@@ -1,40 +0,0 @@
-# Dockerfile for Running AWS Lambda Function with Python and IfcOpenShell
-
-# Base image: Python 3.9 from AWS's public container registry
-FROM public.ecr.aws/docker/library/python:3.9 AS build
-
-# Set the location of your Lambda function code
-ARG FUNCTION_DIR="/var/task"
-
-# Install necessary packages
-RUN apt-get -y update && apt-get -y install unzip curl
-
-# Install AWS Lambda runtime interface client
-RUN pip install --target ${FUNCTION_DIR} awslambdaric
-
-# Set the IfcOpenShell build version (check available builds at: https://blenderbim.org/docs-python/ifcopenshell-python/installation.html)
-ARG IFC_OPENSHELL_BUILD="39-v0.7.0-476ab50"
-
-# Download and extract IfcOpenShell
-RUN curl https://s3.amazonaws.com/ifcopenshell-builds/ifcopenshell-python-${IFC_OPENSHELL_BUILD}-linux64.zip -O && \
-    unzip ifcopenshell-python-${IFC_OPENSHELL_BUILD}-linux64.zip && \
-    mv ifcopenshell ${FUNCTION_DIR} && \
-    rm ifcopenshell-python-${IFC_OPENSHELL_BUILD}-linux64.zip
-
-# Copy the requirements file and install dependencies
-COPY requirements.txt .
-RUN pip install -r requirements.txt
-
-# Copy the Lambda function code
-COPY ./example_handler ${FUNCTION_DIR}/example_handler
-
-# Set the working directory
-WORKDIR ${FUNCTION_DIR}
-
-# Set the entrypoint for the Lambda function
-ENTRYPOINT [ "/usr/local/bin/python", "-m", "awslambdaric" ]
-
-# Set the Python import path to the Lambda function handler
-# This path is relative to the root of the Lambda function code (FUNCTION_DIR)
-# Lambda invocation will look for this path
-CMD ["example_handler.extract_wall_psets_handler"]
@@ -1,27 +0,0 @@
-import ifcopenshell
-import ifcopenshell.util.element
-import boto3
-
-s3 = boto3.client('s3')
-
-def extract_wall_psets_handler(event, context):
-    print("Hello from lambda")
-    print("Event: {}".format(event))
-    print("Context: {}".format(context))
-
-    filename = event['body']['filename']
-    
-    s3.download_file('my_ifc_files_bucket', filename, f'/tmp/{filename}')
-    ifc_file = ifcopenshell.open(f'/tmp/{filename}')
-    walls = ifc_file.by_type('IfcWall')
-    
-    psets = []
-    for wall in walls:
-        wall_data = ifcopenshell.util.element.get_psets(wall)
-        wall_data['id'] = wall.GlobalId
-        psets.append(wall_data)
-
-    return {
-        'statusCode': 200,
-        'body': psets
-    }
@@ -1 +0,0 @@
-boto3
@@ -13,77 +13,68 @@ def request_repo_info(url: str):
    return resp


-def get_choco_package_info() -> str:
-    resp = request_repo_info(URL_CHOCO_PACKAGE)
-    html_txt = str(resp.read())
-    return html_txt
-
-
-def get_latest_blender_version() -> list:
-    html_txt = get_choco_package_info()
-    return re.findall(RE_BLENDER_VERSION_MIN_MAJ_PAT, html_txt)
-
-
-URL_IFCOS_RELEASES = "https://github.com/IfcOpenShell/IfcOpenShell/releases"
-URL_CHOCO_PACKAGE  = "https://community.chocolatey.org/packages/blender"
-URL_BLENDER_CMAKE  = "https://raw.githubusercontent.com/blender/blender/{}/build_files/cmake/Modules/FindPythonLibsUnix.cmake"
-RE_BLENDER_VERSION_MIN_MAJ        = r"Latest Version.+<span>Blender (\d+\.\d+)\..+</span>"
-RE_BLENDER_VERSION_MIN_MAJ_PAT    = r"Latest Version.+<span>Blender (\d+\.\d+\.\d+)</span>"
-RE_BLENDER_PYTHON_VERSION_MAJ_MIN = r"(?:set|SET)\(_PYTHON_VERSION_SUPPORTED (\d+\.\d+)\)"
-
-
 if sys.argv[1] == "--do_choco_release?":
    now = datetime.datetime.now()
    blenderbim_date = (now - datetime.timedelta(days=1)).strftime("%y%m%d")
-    resp = request_repo_info(URL_IFCOS_RELEASES)
+    url = "https://github.com/IfcOpenShell/IfcOpenShell/releases"
+    resp = request_repo_info(url)
    text = str(resp.read())
    if blenderbim_date in text:
        print("do_choco_release", end="")


 elif sys.argv[1] == "--latest_blender_release_maj_min_pat?":
-    latest_blender_version = get_latest_blender_version()
-    if latest_blender_version:
-        print(latest_blender_version[0], end="")
-    else:
-        print("[ERROR] could not determine blender_version_min_maj_pat")
-        quit(1)
+    re_blender_version_min_maj_pat = r"Latest Version.+<span>Blender (\d+\.\d+\.\d+)</span>"
+    url = "https://community.chocolatey.org/packages/blender"
+    resp = request_repo_info(url)
+    html_txt = str(resp.read())
+    found = re.findall(re_blender_version_min_maj_pat, html_txt)
+    if found:
+        print(found[0], end="")


 elif sys.argv[1] == "--latest_blender_release_maj_min?":
-    html_txt = get_choco_package_info()
-    blender_version_min_maj = re.findall(RE_BLENDER_VERSION_MIN_MAJ, html_txt)
-    if blender_version_min_maj:
-        print(blender_version_min_maj[0], end="")
-    else:
-        print("[ERROR] could not determine blender_version_min_maj")
-        quit(1)
+    re_blender_version_min_maj = r"Latest Version.+<span>Blender (\d+\.\d+)\..+</span>"
+    url = "https://community.chocolatey.org/packages/blender"
+    resp = request_repo_info(url)
+    html_txt = str(resp.read())
+    found = re.findall(re_blender_version_min_maj, html_txt)
+    if found:
+        print(found[0], end="")


 elif sys.argv[1] == "--latest_blender_python_version_maj_min?":
-    latest_blender_version = get_latest_blender_version()
-    if latest_blender_version:
-        latest_blender_version_tag = f"v{latest_blender_version[0]}"
-        resp = request_repo_info(URL_BLENDER_CMAKE.format(latest_blender_version_tag))
+    # get latest blender version first
+    re_blender_version_min_maj_pat = r"Latest Version.+<span>Blender (\d+\.\d+\.\d+)</span>"
+    url = "https://community.chocolatey.org/packages/blender"
+    resp = request_repo_info(url)
+    html_txt = str(resp.read())
+    found = re.findall(re_blender_version_min_maj_pat, html_txt)
+    if found:
+        latest_blender_version_tag = f"v{found[0]}"
+        re_blender_python_version_maj_min = r"SET\(PYTHON_VERSION (\d+.\d+) "
+        url = f"https://raw.githubusercontent.com/blender/blender/{latest_blender_version_tag}/build_files/cmake/Modules/FindPythonLibsUnix.cmake"
+        resp = request_repo_info(url)
        html_txt = str(resp.read())
-        found = re.findall(RE_BLENDER_PYTHON_VERSION_MAJ_MIN, html_txt)
+        found = re.findall(re_blender_python_version_maj_min, html_txt)
        if found:
            print(found[0], end="")
-        else:
-            print("[ERROR] could not determine blender_python_version_maj_min")
-            quit(1)


 elif sys.argv[1] == "--pyver?":
-    latest_blender_version = get_latest_blender_version()
-    if latest_blender_version:
-        latest_blender_version_tag = f"v{latest_blender_version[0]}"
-        resp = request_repo_info(URL_BLENDER_CMAKE.format(latest_blender_version_tag))
+    # get latest blender version first
+    re_blender_version_min_maj_pat = r"Latest Version.+<span>Blender (\d+\.\d+\.\d+)</span>"
+    url = "https://community.chocolatey.org/packages/blender"
+    resp = request_repo_info(url)
+    html_txt = str(resp.read())
+    found = re.findall(re_blender_version_min_maj_pat, html_txt)
+    if found:
+        latest_blender_version_tag = f"v{found[0]}"
+        re_blender_python_version_maj_min = r"SET\(PYTHON_VERSION (\d+.\d+) "
+        url = f"https://raw.githubusercontent.com/blender/blender/{latest_blender_version_tag}/build_files/cmake/Modules/FindPythonLibsUnix.cmake"
+        resp = request_repo_info(url)
        html_txt = str(resp.read())
-        found = re.findall(RE_BLENDER_PYTHON_VERSION_MAJ_MIN, html_txt)
+        found = re.findall(re_blender_python_version_maj_min, html_txt)
        if found:
            print(f"py{found[0].replace('.', '')}", end="")
-        else:
-            print("[ERROR] could not determine pyver")
-            quit(1)

@@ -1,43 +0,0 @@
-################################################################################
-#                                                                              #
-# This file is part of IfcOpenShell.                                           #
-#                                                                              #
-# IfcOpenShell is free software: you can redistribute it and/or modify         #
-# it under the terms of the Lesser GNU General Public License as published by  #
-# the Free Software Foundation, either version 3.0 of the License, or          #
-# (at your option) any later version.                                          #
-#                                                                              #
-# IfcOpenShell is distributed in the hope that it will be useful,              #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of               #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the                 #
-# Lesser GNU General Public License for more details.                          #
-#                                                                              #
-# You should have received a copy of the Lesser GNU General Public License     #
-# along with this program. If not, see <http://www.gnu.org/licenses/>.         #
-#                                                                              #
-################################################################################
-
-if(NOT EXISTS "@CMAKE_BINARY_DIR@/install_manifest.txt")
-    message(FATAL_ERROR "Cannot find install manifest: @CMAKE_BINARY_DIR@/install_manifest.txt")
-endif()
-
-file(READ "@CMAKE_BINARY_DIR@/install_manifest.txt" files)
-string(REGEX REPLACE "\n" ";" files "${files}")
-
-foreach(file ${files})
-    message(STATUS "Uninstalling $ENV{DESTDIR}${file}")
-
-    if(IS_SYMLINK "$ENV{DESTDIR}${file}" OR EXISTS "$ENV{DESTDIR}${file}")
-        exec_program(
-            "@CMAKE_COMMAND@" ARGS "-E remove \"$ENV{DESTDIR}${file}\""
-            OUTPUT_VARIABLE rm_out
-            RETURN_VALUE rm_retval
-        )
-
-        if(NOT "${rm_retval}" STREQUAL 0)
-            message(FATAL_ERROR "Problem when removing $ENV{DESTDIR}${file}")
-        endif()
-    else(IS_SYMLINK "$ENV{DESTDIR}${file}" OR EXISTS "$ENV{DESTDIR}${file}")
-        message(STATUS "File $ENV{DESTDIR}${file} does not exist.")
-    endif()
-endforeach()
@@ -0,0 +1,8 @@
+compile:
+	conda activate conda-build && conda-build -c conda-forge . --keep-old-work --python 3.10.5
+
+debug:
+	conda activate conda-build && conda-debug -c conda-forge . --python 3.10.4
+
+env:
+	conda env update --f environment.yml --prune
@@ -4,7 +4,6 @@ set MY_PY_VER=%PY_VER:.=%
 set LIBXML2="%LIBRARY_PREFIX%/lib/libxml2.lib"

 cmake -G "Ninja" ^
- -D SCHEMA_VERSIONS="2x3;4;4x1;4x3;4x3_add1" ^
 -D CMAKE_BUILD_TYPE:STRING=Release ^
 -D CMAKE_INSTALL_PREFIX:FILEPATH="%LIBRARY_PREFIX%" ^
 -D CMAKE_PREFIX_PATH:FILEPATH="%LIBRARY_PREFIX%" ^
@@ -13,7 +13,6 @@ if [ `uname` == Darwin ]; then
 fi

 cmake -G Ninja \
- -DSCHEMA_VERSIONS="2x3;4;4x1;4x3;4x3_add1" \
 -DCMAKE_BUILD_TYPE=Release \
 -DCMAKE_INSTALL_PREFIX=$PREFIX \
  ${CMAKE_PLATFORM_FLAGS[@]} \
@@ -42,4 +41,4 @@ cmake -G Ninja \

 ninja

-ninja install -j 1
+ninja install -j 2
@@ -1,6 +1,2 @@
 CONDA_BUILD_SYSROOT:
-  - /opt/MacOSX10.13.sdk       # [osx]
-
-variant:
-  - novtk
-  - all
+  - /opt/MacOSX10.13.sdk       # [osx]
@@ -0,0 +1,13 @@
+name: conda-build
+channels:
+  - conda-forge
+dependencies:
+  - conda-build
+  - conda-verify
+  - anaconda-client
+  - ninja
+  - doxygen
+  - ripgrep
+  - pip
+  - pip:
+      - lief==0.13
@@ -1,10 +1,6 @@
 {% set name = "ifcopenshell" %}
 {% set version = "0.7.0" %}
-{% set build = 1 %}

-# Higher number -> Always prioritize "novtk" variant over "all" variant
-{% set build = build + 200 %}   # [variant == "novtk"]
-{% set build = build + 100 %}   # [variant == "all"]

 package:
  name: {{ name }}
@@ -14,9 +10,8 @@ source:
  path: ..

 build:
-  string: py{{ CONDA_PY }}_{{ variant }}_h{{ PKG_HASH }}_{{ build }}
  binary_relocation: false [osx]
-  number: {{ build }}
+  number: 1

 requirements:
  build:
@@ -24,12 +19,12 @@ requirements:
    - {{ compiler('cxx') }}
    - ninja >=1.10.2
    - cmake
-    - swig 4.1.1
+    - swig >=4.0.2

  host:
    - python
    - boost-cpp
-    - occt 7.7.2 *{{ variant }}*
+    - occt
    - libxml2
    - cgal-cpp
    - hdf5
@@ -37,32 +32,30 @@ requirements:
    - gmp  # [unix]
    - mpir  # [win]
    - nlohmann_json
-    - zlib

  run:
    - python
-    - occt 7.7.2 *{{ variant }}*
-    - {{ pin_compatible('cgal-cpp', max_pin='x.x.x') }}
-    - {{ pin_compatible('boost-cpp', max_pin='x.x.x') }}
-    - {{ pin_compatible('hdf5', max_pin='x.x.x') }}
+    - boost-cpp
+    - {{ pin_compatible('occt', max_pin='x.x.x') }}
    - libxml2
+    - cgal-cpp
+    - hdf5
    - mpfr
    - gmp  # [unix]
    - mpir  # [win]
    - nlohmann_json
-    - zlib

 test:
  imports:
    - ifcopenshell

 about:
-  home: https://ifcopenshell.org
+  home: http://ifcopenshell.org
  license: LGPL-3.0-or-later
  license_file: COPYING
  summary: 'IfcOpenShell is a library to support the IFC file format'
  description: |
    IfcOpenShell is an open source (LGPL) software library for 
    working with the Industry Foundation Classes (IFC) file format.
-  doc_url: https://ifcopenshell.org/
+  doc_url: http://ifcopenshell.org/
  dev_url: https://github.com/IfcOpenShell/IfcOpenShell
@@ -0,0 +1,11 @@
+#Look for an executable called sphinx-build
+find_program(SPHINX_EXECUTABLE
+             NAMES sphinx-build
+             DOC "Path to sphinx-build executable")
+
+include(FindPackageHandleStandardArgs)
+
+#Handle standard arguments to find_package like REQUIRED and QUIET
+find_package_handle_standard_args(Sphinx
+                                  "Failed to find sphinx-build executable"
+                                  SPHINX_EXECUTABLE)
@@ -0,0 +1,11 @@
+#Look for an executable called sphinx-build
+find_program(SPHINX_EXECUTABLE
+             NAMES sphinx-build
+             DOC "Path to sphinx-build executable")
+
+include(FindPackageHandleStandardArgs)
+
+#Handle standard arguments to find_package like REQUIRED and QUIET
+find_package_handle_standard_args(Sphinx
+                                  "Failed to find sphinx-build executable"
+                                  SPHINX_EXECUTABLE)
@@ -1,33 +0,0 @@
-# IfcOpenShell C++ API documentation
-
-This folder contains the setup to build the IfcOpenShell C++ API documentation from the source code.
-
-## Generating the documentation
-
-> Prerequisites:
-> 
-> Make sure to have [Doxygen](https://www.doxygen.nl) and [Graphviz](https://graphviz.org) installed into your `$PATH` variable.
-> 
-> The documentation also use the [doxygen-awesome](https://jothepro.github.io/doxygen-awesome-css) theme as a git submodule.
-
-Build with the command (from within the `/docs/cpp-api` folder):
-
-```shell
-$ doxygen
-```
-
-To include the current git commit hash into the build documentation, use the following command:
-
-```shell
-$ PROJECT_NUMBER=$(git rev-parse --short HEAD) doxygen
-```
-
-This will extract the current commit hash in short version and sets the propper ENV variable used by doxygen.
-
-The generation of the documentation might take a while depending on your systems hardware, as it is configured to generate the Class graphs using .
-
-The resulting documentation is located unter `/cpp-api/output/html` and can be directly accessed with your browser:
-
-```shell
-$ open ./output/html/index.html
-```
@@ -0,0 +1,240 @@
+APPLY_DEFAULT_MATERIALS
+-----------------------
+
+Given the command invocation:
+
+    Duplex_A_20110907_optimized.ifc d.dae -yv --include attribute GlobalId 3bXiCStxP6Fgxdej$yc50U
+
+You will find log messages along the lines of
+
+    [Warning] {3bXiCStxP6Fgxdej$yc50U} No material and surface styles for:
+    #333=IfcCovering('3bXiCStxP6Fgxdej$yc50U',#1,'Compound Ceiling:Gypsum Board:187483',$,'Compound Ceiling:Gypsum Board',#17840,#17052,'187483',.CEILING.)
+
+This means that there is no IfcStyledItem associated to the representation items and that the element does not have an IfcMaterial association with IfcMaterialRepresentation from which we can derive a style (colour) for the element.
+
+The interactive session below shows how with this setting enabled you will get a default generated material from the IFC element entity type and material indices of 0 pointing to that. With this setting disabled the material index would be -1 to indicate a missing style. Note that there is one material index for every triangle in the list of `shp.geometry.faces`.
+
+    >>> import ifcopenshell, ifcopenshell.geom
+    >>> f = ifcopenshell.open("Duplex_A_20110907_optimized.ifc")
+    >>> s = ifcopenshell.geom.settings()
+    >>> c = f["3bXiCStxP6Fgxdej$yc50U"]
+    >>>
+    >>> shp = ifcopenshell.geom.create_shape(s, c)
+    >>> shp.geometry.material_ids
+    (-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1)
+    >>> [(m.name, m.diffuse) for m in shp.geometry.materials]
+    []
+    >>>
+    >>> s.set(s.APPLY_DEFAULT_MATERIALS, True)
+    >>> shp = ifcopenshell.geom.create_shape(s, c)
+    >>> shp.geometry.material_ids
+    (0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
+    >>> [(m.name, m.diffuse) for m in shp.geometry.materials]
+    [('IfcCovering', (0.7, 0.7, 0.7))]
+
+This is enabled by default for the IfcConvert serializers as they will not gracefully handle -1 material indices and allows users to quickly assign colours based on entity types in their modelling applications.
+
+APPLY_LAYERSETS
+---------------
+
+This setting is available in IfcConvert as `--enable-layerset-slicing`.
+
+For IfcWall and IfcSlab elements, takes the associated IfcMaterialLayerSet and builds a set of surfaces to segment the building element geometry.
+
+Note that enabling this settings is computationally intensive as it involves 3D Boolean operations.
+
+    Duplex_A_20110907_optimized.ifc d1.dae -yv --include attribute GlobalId 2O2Fr$t4X7Zf8NOew3FNr2
+    
+![Image of d1.dae](images/settings-1.png)
+    
+    Duplex_A_20110907_optimized.ifc d2.dae --enable-layerset-slicing -yv --include attribute GlobalId 2O2Fr$t4X7Zf8NOew3FNr2
+    
+![Image of d2.dae](images/settings-2.png)
+
+BUILDING_LOCAL_PLACEMENT
+------------------------
+
+This setting is available in IfcConvert using `--building-local-placement`.
+
+In the typical IfcSite > IfcBuilding > IfcBuildingStorey > ... hierarchy of elements, don't incorporate the ObjectPlacement of the IfcBuilding and above in the placement of elements in the output. This is useful when there is a large offset in this placement that reduces precision in further processing.
+
+CONVERT_BACK_UNITS
+------------------
+
+This setting is available in IfcConvert using `--convert-back-units`.
+
+Internally IfcOpenShell uses meters as the global length unit to do calculations. This setting restores the coordinate positions after conversion by multiplying the factor of the IfcUnit with UnitType=LENGTHUNIT into the output geometry coordinate values.
+
+DISABLE_OPENING_SUBTRACTIONS
+----------------------------
+
+This setting is available in IfcConvert using `--disable-opening-subtraction`.
+
+As in most viewer applications, IfcOpeningElement geometry is subtracted from their host elements. This setting disables this behavior.
+
+    Duplex_A_20110907_optimized.ifc d1.dae -yv --include attribute GlobalId 2O2Fr$t4X7Zf8NOew3FNr2
+    
+![Image of d1.dae](images/settings-1.png)
+    
+    Duplex_A_20110907_optimized.ifc d3.dae --disable-opening-subtraction -yv --include attribute GlobalId 2O2Fr$t4X7Zf8NOew3FNr2
+    
+![Image of d3.dae](images/settings-3.png)
+
+Note that disabling this settings will reduce processing time and improve robustness as it involves 3D Boolean operations.
+
+DISABLE_TRIANGULATION
+---------------------
+
+To be used in conjunction with `USE_BREP_DATA`. Do not apply the triangulation and - when `USE_BREP_DATA` is set - return a OpenCASCADE serialized TopoDS_Shape from `create_shape()` and `iterator`.
+
+    >>> import ifcopenshell, ifcopenshell.geom
+    >>> s = ifcopenshell.geom.settings()
+    >>> s.set(s.DISABLE_TRIANGULATION, True)
+    >>> s.set(s.USE_BREP_DATA, True)
+    >>> f = ifcopenshell.open("Duplex_A_20110907_optimized.ifc")
+    >>> c = f["3bXiCStxP6Fgxdej$yc50U"]
+    >>> shp = ifcopenshell.geom.create_shape(s, c)
+    >>> print(shp.geometry.brep_data)
+
+    CASCADE Topology V1, (c) Matra-Datavision
+    Locations 0
+    Curve2ds 0
+    Curves 12
+    1 4.6750000000000034 -8.0749999999999904 2.657 -2.0455514041918775e-15 -1 0
+    1 4.6750000000000034 -8.0749999999999904 2.657 1 -3.435893306383461e-15 0
+    1 6.2260000000000044 -8.0749999999999957 2.657 -2.0455514041918724e-15 -1 0
+    1 6.226 -10.246000000000031 2.657 -1 6.8717866127669219e-15 0
+    ...
+
+EDGE_ARROWS
+-----------
+
+When `INCLUDE_CURVES` is true and geometric elements include curves (such as the wall axis), add arrow heads to the edges to indicate direction of the curve.
+
+    Duplex_A_20110907_optimized.ifc d4.dae --model --plan --edge-arrows -yv --include attribute GlobalId 2O2Fr$t4X7Zf8NOew3FNr2
+    
+![Image of d4.dae](images/settings-4.png)
+
+EXCLUDE_SOLIDS_AND_SURFACES
+---------------------------
+
+Exclude faces, shells and solids from geometrical output. Implied when using `--plan` without `--model` in IfcConvert.
+
+FASTER_BOOLEANS
+---------------
+
+NOTE: Only applicable when using OCCT 6.9 and earlier.
+
+This setting is available in IfcConvert using `--merge-boolean-operands`.
+
+Fuse the collection of all boolean operands into a single union before applying the boolean subtraction, as opposed to doing individual subtractions. This likely improves performance. From OCCT 7.0 onwards the boolean operations with multiple arguments is used.
+
+GENERATE_UVS
+------------
+
+This setting is available in IfcConvert using `--generate-uvs`.
+
+Applies a box projection on the generated geometry for the element to obtain UV coordinates. This is purely generated, it does not involve texture coordinates stored in the IFC model.
+
+    Duplex_A_20110907_optimized.ifc d5.dae --generate-uvs -yv --include attribute GlobalId 2O2Fr$t4X7Zf8NOew3FNr2
+
+![Image of d5.dae with a UV grid applied in Blender](images/settings-5.png)
+
+INCLUDE_CURVES
+--------------
+
+This setting is available in IfcConvert using `--plan`.
+
+Include edge and wire geometries in the geometric output.
+
+LAYERSET_FIRST
+--------------
+
+This setting is available in IfcConvert using `--layerset-first`.
+
+When not using APPLY_LAYERSETS, take the first material layer from the set to use as the material for the overall element.
+
+NO_NORMALS
+----------
+
+This setting is available in IfcConvert using `--no-normals`.
+
+Do not emit normals on geometric output
+
+SEARCH_FLOOR
+------------
+
+Note: Only applicable to Collada .DAE output when used from IfcConvert.
+
+This setting is available in IfcConvert using `--use-element-hierarchy`.
+
+Include the spatial hierarchy in the elements.
+
+SEW_SHELLS
+----------
+
+This setting is available in IfcConvert using `--orient-shells`.
+
+Re-orient or sew connected face sets to have a consistent outwards orientation.
+
+SITE_LOCAL_PLACEMENT
+--------------------
+
+This setting is available in IfcConvert using `--site-local-placement`.
+
+See `BUILDING_LOCAL_PLACEMENT`, but exclude also the ObjectPlacement of the IfcSite.
+
+USE_BREP_DATA
+-------------
+
+See `DISABLE_TRIANGULATION`.
+
+USE_PYTHON_OPENCASCADE
+----------------------
+
+Note: Only available when an import of `OCC.Core.BRepTools` or `OCC.BRepTools` succeeds.
+
+This implies `USE_WORLD_COORDS` `USE_BREP_DATA` and `DISABLE_TRIANGULATION`. The serialized TopoDS_Shape of `USE_BREP_DATA` is deserialized by Python OpenCASCADE.
+
+USE_WORLD_COORDS
+----------------
+
+Apply the ObjectPlacement of the building elements to the geometric output. This is implied when using the Wavefront .OBJ output in IfcConvert. Note that this also eliminates the possibility for geometric elements to point to the same interpreted geometry result.
+
+VALIDATE_QUANTITIES
+-------------------
+
+This setting is available in IfcConvert using `--validate`.
+
+Running IfcConvert with `--validate` will set a non-zero exit code when ever a log message with severity equal or greater than ERROR has been emitted.
+
+Currently for internal use only. For every building element geometry converted, looks for an associated quantity set where the OwnerHistory's organization name is IfcOpenShell. And looks for the quantities "Total Surface Area", "Volume", "Shape Validation Properties.Surface Genus" and validates these according to the interpreted geometry definition. Emit Logger::Error when calculated values are outside of the tolerance range for the value stored in the model.
+
+WELD_VERTICES
+-------------
+
+Note: In Python, this setting is *on* by default.
+
+Note: This setting only affects triangulated output.
+
+This setting is available in IfcConvert using `--weld-vertices`.
+
+Discards normals and joins vertices solely based on position. This is useful when output is to be modified in a modeling application.
+
+    >>> import ifcopenshell, ifcopenshell.geom
+    >>> s = ifcopenshell.geom.settings()
+    >>> s.set(s.WELD_VERTICES, False)
+    >>> f = ifcopenshell.open("Duplex_A_20110907_optimized.ifc")
+    >>> c = f["3bXiCStxP6Fgxdej$yc50U"]
+    >>> shp = ifcopenshell.geom.create_shape(s, c)
+    >>> shp.geometry.verts
+    (4.675000000000003, -8.07499999999999, 2.657, 4.674999999999999, -10.24600000000002, 2.657, 6.226000000000004, -8.074999999999996, 2.657, 6.226, -10.24600000000003, 2.657, 4.675000000000003, -8.07499999999999, 2.6, 4.674999999999999, -10.24600000000002, 2.6, 6.226000000000004, -8.074999999999996, 2.6, 6.226, -10.24600000000003, 2.6, 4.674999999999999, -10.24600000000002, 2.657, 4.674999999999999, -10.24600000000002, 2.6, 4.675000000000003, -8.07499999999999, 2.657, 4.675000000000003, -8.07499999999999, 2.6, 6.226, -10.24600000000003, 2.657, 4.674999999999999, -10.24600000000002, 2.657, 6.226, -10.24600000000003, 2.6, 4.674999999999999, -10.24600000000002, 2.6, 6.226000000000004, -8.074999999999996, 2.657, 6.226, -10.24600000000003, 2.657, 6.226000000000004, -8.074999999999996, 2.6, 6.226, -10.24600000000003, 2.6, 4.675000000000003, -8.07499999999999, 2.657, 4.675000000000003, -8.07499999999999, 2.6, 6.226000000000004, -8.074999999999996, 2.657, 6.226000000000004, -8.074999999999996, 2.6)
+    >>> shp.geometry.normals
+    (3.059754518198021e-17, 0.0, -1.0, 3.059754518198021e-17, 0.0, -1.0, 3.059754518198021e-17, 0.0, -1.0, 3.059754518198021e-17, 0.0, -1.0, 2.110175529791737e-16, 0.0, -1.0, 2.110175529791737e-16, 0.0, -1.0, 2.110175529791737e-16, 0.0, -1.0, 2.110175529791737e-16, 0.0, -1.0, -1.0, 1.79434333701042e-15, 0.0, -1.0, 1.79434333701042e-15, 0.0, -1.0, 1.79434333701042e-15, 0.0, -1.0, 1.79434333701042e-15, 0.0, 6.8717866127669046e-15, 1.0, 0.0, 6.8717866127669046e-15, 1.0, 0.0, 6.8717866127669046e-15, 1.0, 0.0, 6.8717866127669046e-15, 1.0, 0.0, -1.0, 1.79434333701042e-15, 0.0, -1.0, 1.79434333701042e-15, 0.0, -1.0, 1.79434333701042e-15, 0.0, -1.0, 1.79434333701042e-15, 0.0, 3.4358933063834523e-15, 1.0, 0.0, 3.4358933063834523e-15, 1.0, 0.0, 3.4358933063834523e-15, 1.0, 0.0, 3.4358933063834523e-15, 1.0, 0.0)
+    >>>
+    >>> s.set(s.WELD_VERTICES, True)
+    >>> shp = ifcopenshell.geom.create_shape(s, c)
+    >>> shp.geometry.verts
+    (4.675000000000003, -8.07499999999999, 2.657, 4.674999999999999, -10.24600000000002, 2.657, 6.226000000000004, -8.074999999999996, 2.657, 6.226, -10.24600000000003, 2.657, 4.675000000000003, -8.07499999999999, 2.6, 4.674999999999999, -10.24600000000002, 2.6, 6.226000000000004, -8.074999999999996, 2.6, 6.226, -10.24600000000003, 2.6)
+    >>> shp.geometry.normals
+    ()
@@ -76,7 +76,7 @@ PROJECT_NAME = "IfcOpenShell"
 USE_CURRENT_PYTHON_VERSION = os.getenv("USE_CURRENT_PYTHON_VERSION")
 ADD_COMMIT_SHA = os.getenv("ADD_COMMIT_SHA")

-PYTHON_VERSIONS = ["3.6.14", "3.7.13", "3.8.13", "3.9.11", "3.10.3", "3.11.7", "3.12.1"]
+PYTHON_VERSIONS = ["3.6.14", "3.7.13", "3.8.13", "3.9.11", "3.10.3", "3.11.0"]
 JSON_VERSION = "v3.6.1"
 OCE_VERSION = "0.18.3"
 OCCT_VERSION = "7.5.3"
@@ -892,9 +892,8 @@ if "IfcOpenShell-Python" in targets:
            module_dir = os.path.dirname(run([python_executable, "-c", "import inspect, ifcopenshell; print(inspect.getfile(ifcopenshell))"]))

            if platform.system() != "Darwin":
-                if BUILD_CFG == "Release":
-                    # TODO: This symbol name depends on the Python version?
-                    run([strip, "-s", "-K", "PyInit__ifcopenshell_wrapper", "_ifcopenshell_wrapper.so"], cwd=module_dir)
+                # TODO: This symbol name depends on the Python version?
+                run([strip, "-s", "-K", "PyInit__ifcopenshell_wrapper", "_ifcopenshell_wrapper.so"], cwd=module_dir)

            return module_dir

@@ -1,20 +0,0 @@
-# This CITATION.cff file was generated with cffinit.
-# Visit https://bit.ly/cffinit to generate yours today!
-
-cff-version: 1.2.0
-title: bcf
-message: >-
-  If you use this software, please cite it using the
-  metadata from this file.
-type: software
-authors:
-  - name: "IfcOpenShell contributors"
-repository-code: >-
-  https://github.com/IfcOpenShell/IfcOpenShell/tree/v0.7.0/src/bcf
-abstract: >-
-  Library to read and write BCF-XML and query OpenCDE
-  BCF-API modules
-keywords:
-  - BCF
-  - IFC
-license: LGPL-3.0-or-later
@@ -1,9 +1,3 @@
-VERSION:=`date '+%y%m%d'`
-SED:=sed -i
-ifeq ($(UNAME_S),Darwin)
-SED:=sed -i '' -e
-endif
-
 .PHONY: ci
 ci:
 	tox
@@ -18,13 +12,6 @@ models:
 	cd src && xsdata generate -p bcf.v2.model --unnest-classes --kw-only --slots -ds Google bcf/v2/xsd
 	cd src && xsdata generate -p bcf.v3.model --unnest-classes --kw-only --slots -ds Google bcf/v3/xsd

-.PHONY: dist
-dist:
-	rm -rf dist
-	$(SED) "s/999999/$(VERSION)/" pyproject.toml
-	python -m build
-	$(SED) "s/$(VERSION)/999999/" pyproject.toml
-
 # .PHONY
 # api:
-#     openapi-python-client generate --url https://api.swaggerhub.com/apis/buildingSMART/BCF/3.0
+#     openapi-python-client generate --url https://api.swaggerhub.com/apis/buildingSMART/BCF/3.0
@@ -1,5 +1,84 @@
 # bcf

-A simple Python implementation of the BCF standard. Manipulation of BCF-XML is
-available via `bcfxml.py` and manipulation of BCF-API is available via
-`bcfapi.py`.
+A simple Python implementation of BCF.
+Manipulation of BCF-XML is available via `bcfxml.py` and manipulation of BCF-API
+is available via `bcfapi.py`.
+
+It tries to support BCF-XML version 2.1 and 3.0, and BCF-API 3.0.
+
+## bcfxml
+
+The `bcfxml.load` function lets you read a BCF-XML file.
+It takes care of using the right version based on the "bcf.version" file contained in the BCF package.
+
+The BCF files are extracted and parsed on-demand, and edits are stored in memory until you call the `save` method.
+
+```python
+from bcf.bcfxml import load
+
+# Load a project
+with load("/path/to/file.bcf") as bcfxml:
+    project = bcfxml.project
+    print(project.name)
+
+    # To edit a project, just modify the object directly
+    bcfxml.project.name = "New name"
+
+    # Get a dictionary of topics
+    topics = bcfxml.topics
+
+    for topic_guid, topic_handler in bcfxml.topics.items():
+        topic = topic_handler.topic
+        print("Topic guid is", topic.guid)
+        print("Topic title is", topic.title)
+
+        # Fetch extra data about a topic
+        header = topic_handler.header
+        comments = topic_handler.comments
+        viewpoints = topic_handler.viewpoints
+
+        for comment in comments:
+            print(comment.guid)
+            print(comment.comment)
+            print(comment.author)
+
+    # Get a particular topic
+    topic = bcfxml.get_topic(guid)
+
+    # Modify a topic
+    topic.title = "New title"
+
+    bcfxml.save()
+```
+
+## bcfapi
+
+The `bcfapi` module lets you interact with the BCF-API standard.
+
+```python
+from bcf.v3.bcfapi import FoundationClient, BcfClient
+
+foundation_client = FoundationClient("YOUR_CLIENT_ID", "YOUR_CLIENT_SECRET", "OPENCDE_BASEURL")
+auth_methods = foundation_client.get_auth_methods()
+
+# Our library currently only implements the authorization_code flow
+if "authorization_code" in auth_methods:
+    foundation_client.login()
+
+bcf_client = BcfClient(foundation_client)
+
+versions = foundation_client.get_versions()
+for version in versions:
+if "3.0" in versions:
+    if version["api_id"] == "bcf" and version["version_id"] == "3.0":
+        bcf_client.set_version(version)
+
+data = bcf_client.get_projects()
+print(data)
+project_id = data[0]["project_id"]
+print(project_id)
+data = bcf_client.get_project(project_id)
+print(data)
+data = bcf_client.get_extensions(project_id)
+print(data)
+```
@@ -11,13 +11,13 @@ name = "bcf-client"
 description = "BCF-XML file handler."
 readme = "README.md"
 requires-python = ">=3.8"
-keywords = ["IFC", "BCF", "BIM"]
+keywords = ["IFC", "BCF", "BIM", "eingineering"]
 dependencies = [
    "xsdata",
    "numpy",
    "ifcopenshell",
 ]
-version = "0.0.999999"
+version = "0.0.1"
 classifiers = [
    "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
    "Operating System :: OS Independent",
@@ -76,7 +76,7 @@ deps =
    black
    isort
    pylint
-commands =
+commands = 
    black {posargs:.}
    isort {posargs:.}
    pylint {posargs:.} --output-format=colorized
@@ -138,4 +138,4 @@ max-attributes = 10

 [tool.pylint.format]
 expected-line-ending-format = "LF"
-max-line-length = 120
+max-line-length = 120
@@ -275,7 +275,6 @@ class TopicHandler:
        """
        new_viewpoint = VisualizationInfoHandler.create_new(element, self._xml_handler)
        self.add_visinfo_handler(new_viewpoint)
-        return new_viewpoint

    def add_viewpoint_from_point_and_guids(self, position: NDArray[np.float_], *guids: str) -> None:
        """Add a viewpoint pointing at an XYZ point in space
@@ -288,7 +287,6 @@ class TopicHandler:
            position, *guids, xml_handler=self._xml_handler
        )
        self.add_visinfo_handler(vi_handler)
-        return vi_handler

    def add_visinfo_handler(self, new_viewpoint: VisualizationInfoHandler) -> None:
        self.viewpoints[new_viewpoint.guid + ".bcfv"] = new_viewpoint
@@ -1,26 +0,0 @@
-# This CITATION.cff file was generated with cffinit.
-# Visit https://bit.ly/cffinit to generate yours today!
-
-cff-version: 1.2.0
-title: BlenderBIM Add-on
-message: >-
-  If you use this software, please cite it using the
-  metadata from this file.
-type: software
-authors:
-  - name: "IfcOpenShell contributors"
-repository-code: >-
-  https://github.com/IfcOpenShell/IfcOpenShell/tree/v0.7.0/src/blenderbim
-url: 'https://blenderbim.org/'
-repository-artifact: 'https://blenderbim.org/download.html'
-abstract: >-
-  Add-on to Blender providing a graphical native IFC
-  authoring platform
-keywords:
-  - IFC
-  - Blender
-  - NativeIFC
-license: GPL-3.0-or-later
-commit: 1fb6dac
-version: v0.0.230506
-date-released: '2023-05-23'
@@ -36,163 +36,142 @@ endif
 endif

 VERSION:=`date '+%y%m%d'`
-LAST_COMMIT_HASH:=$(shell git rev-parse HEAD)
-PYVERSION:=py310
-PYPI_IMP:=cp
+PYVERSION:=py37

+ifeq ($(PYVERSION), py37)
+PYLIBDIR:=python3.7
+PYNUMBER:=37
+endif
 ifeq ($(PYVERSION), py39)
 PYLIBDIR:=python3.9
 PYNUMBER:=39
-PYPI_VERSION:=3.9
 endif
 ifeq ($(PYVERSION), py310)
 PYLIBDIR:=python3.10
 PYNUMBER:=310
-PYPI_VERSION:=3.10
-endif
-ifeq ($(PYVERSION), py311)
-PYLIBDIR:=python3.11
-PYNUMBER:=311
-PYPI_VERSION:=3.11
 endif

 ifeq ($(PLATFORM), linux)
-PYPI_PLATFORM:=--platform manylinux_2_17_x86_64
-LXML_ARCH:=manylinux_2_28_x86_64
-SHAPELY_ARCH:=manylinux_2_17_x86_64.manylinux2014_x86_64
-PILLOW_ARCH:=manylinux_2_28_x86_64
+ifeq ($(PYVERSION), py37)
+HPPFCL_URL:=https://anaconda.org/conda-forge/hpp-fcl/1.7.5/download/linux-64/hpp-fcl-1.7.5-py37h5f1835d_0.tar.bz2
+EIGENPY_URL:=https://anaconda.org/conda-forge/eigenpy/2.6.5/download/linux-64/eigenpy-2.6.5-py37h95e2c48_0.tar.bz2
+BOOST_URL:=https://anaconda.org/conda-forge/boost/1.74.0/download/linux-64/boost-1.74.0-py37h0379df6_3.tar.bz2
+LXML_URL:=https://files.pythonhosted.org/packages/30/c0/d0526314971fc661b083ab135747dc68446a3022686da8c16d25fcf6ef07/lxml-4.6.3-cp37-cp37m-manylinux2014_x86_64.whl
+SHAPELY_URL:=https://files.pythonhosted.org/packages/1d/a4/931d0780f31f3ea8c4f9ef6464a2825137c5241e6707a5fb03bef760a7eb/shapely-2.0.1-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
+PILLOW_URL:=https://files.pythonhosted.org/packages/ed/d5/c2e84e1e36ab8ebea033921d5886a056c77e18bab5ab1051fcc22de2e8a2/Pillow-9.2.0-cp37-cp37m-manylinux_2_28_x86_64.whl
+endif
 ifeq ($(PYVERSION), py39)
-HPPFCL_URL:=https://anaconda.org/conda-forge/hpp-fcl/2.4.0/download/linux-64/hpp-fcl-2.4.0-py39h359ec1e_0.conda
-EIGENPY_URL:=https://anaconda.org/conda-forge/eigenpy/3.2.0/download/linux-64/eigenpy-3.2.0-py39hb1babde_0.conda
-BOOST_URL:=https://anaconda.org/conda-forge/boost/1.78.0/download/linux-64/boost-1.78.0-py39h7c9e3ff_4.tar.bz2
+HPPFCL_URL:=https://anaconda.org/conda-forge/hpp-fcl/1.7.5/download/linux-64/hpp-fcl-1.7.5-py39hbcdfc36_0.tar.bz2
+EIGENPY_URL:=https://anaconda.org/conda-forge/eigenpy/2.6.5/download/linux-64/eigenpy-2.6.5-py39h5aed9d1_0.tar.bz2
+BOOST_URL:=https://anaconda.org/conda-forge/boost/1.74.0/download/linux-64/boost-1.74.0-py39h5472131_3.tar.bz2
+LXML_URL:=https://files.pythonhosted.org/packages/19/d9/a69c6aff5673554df48120565a14a50eaa41d29ae03b02faa0b023666318/lxml-4.6.3-cp39-cp39-manylinux2014_x86_64.whl
+SHAPELY_URL:=https://files.pythonhosted.org/packages/2d/f2/8ec281d357e8bb7d08dc8d727f0e4c8ef3dae7d3fa75c69c8e452bb82d50/shapely-2.0.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
+PILLOW_URL:=https://files.pythonhosted.org/packages/01/61/3ff85fb4bb596ce3d223c8fcf93c8df5c12bc8899dfb4fb3cb1c5b20dd5f/Pillow-9.2.0-cp39-cp39-manylinux_2_28_x86_64.whl
 endif
 ifeq ($(PYVERSION), py310)
-HPPFCL_URL:=https://anaconda.org/conda-forge/hpp-fcl/2.4.0/download/linux-64/hpp-fcl-2.4.0-py310hd002f03_0.conda
-EIGENPY_URL:=https://anaconda.org/conda-forge/eigenpy/3.2.0/download/linux-64/eigenpy-3.2.0-py310hcfe0b05_0.conda
-BOOST_URL:=https://anaconda.org/conda-forge/boost/1.78.0/download/linux-64/boost-1.78.0-py310hc4a4660_4.tar.bz2
-endif
-ifeq ($(PYVERSION), py311)
-HPPFCL_URL:=https://anaconda.org/conda-forge/hpp-fcl/2.4.0/download/linux-64/hpp-fcl-2.4.0-py311h04f086a_0.conda
-EIGENPY_URL:=https://anaconda.org/conda-forge/eigenpy/3.2.0/download/linux-64/eigenpy-3.2.0-py311h995a085_0.conda
-BOOST_URL:=https://anaconda.org/conda-forge/boost/1.78.0/download/linux-64/boost-1.78.0-py311h59ea3da_3.tar.bz2
+HPPFCL_URL:=https://anaconda.org/conda-forge/hpp-fcl/1.8.0/download/linux-64/hpp-fcl-1.8.0-py310hdaf7e41_1.tar.bz2
+EIGENPY_URL:=https://anaconda.org/conda-forge/eigenpy/2.6.11/download/linux-64/eigenpy-2.6.11-py310hf3e5c9c_0.tar.bz2
+BOOST_URL:=https://anaconda.org/conda-forge/boost/1.74.0/download/linux-64/boost-1.74.0-py310h7c3ba0c_5.tar.bz2
+LXML_URL:=https://files.pythonhosted.org/packages/25/1e/19b46d8e8881fe0df2e20945d51919eeb1817836d62a90efa8506530e45c/lxml-4.8.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl
+SHAPELY_URL:=https://files.pythonhosted.org/packages/a8/a5/403728b5614b28083f6424dfdefec5fcf58068495fb03bb08532671c642f/shapely-2.0.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
+PILLOW_URL:=https://files.pythonhosted.org/packages/f6/51/320986ebd6d46a0e95c2240468ced73153b691ce07617078bcdf30c609ec/Pillow-9.2.0-cp310-cp310-manylinux_2_28_x86_64.whl
 endif
 ASSIMP_URL:=https://anaconda.org/conda-forge/assimp/5.0.1/download/linux-64/assimp-5.0.1-hedfc422_6.tar.bz2
-QHULL_URL:=https://anaconda.org/conda-forge/qhull/2020.2/download/linux-64/qhull-2020.2-h4bd325d_2.tar.bz2
-OCTOMAP_URL:=https://anaconda.org/conda-forge/octomap/1.9.8/download/linux-64/octomap-1.9.8-h924138e_0.tar.bz2
-BOOSTCPP_URL:=https://anaconda.org/conda-forge/boost-cpp/1.78.0/download/linux-64/boost-cpp-1.78.0-h6582d0a_3.conda
+OCTOMAP_URL:=https://anaconda.org/conda-forge/octomap/1.9.7/download/linux-64/octomap-1.9.7-h4bd325d_0.tar.bz2
 ZLIB_URL:=https://anaconda.org/conda-forge/zlib/1.2.11/download/linux-64/zlib-1.2.11-h516909a_1010.tar.bz2
 endif

 ifeq ($(PLATFORM), macos)
-PYPI_PLATFORM:=--platform macosx_10_9_x86_64
-SHAPELY_ARCH:=macosx_10_9_x86_64
-PILLOW_ARCH:=macosx_10_10_x86_64
+ifeq ($(PYVERSION), py37)
+HPPFCL_URL:=https://anaconda.org/conda-forge/hpp-fcl/1.7.5/download/osx-64/hpp-fcl-1.7.5-py37h2d7f23a_0.tar.bz2
+EIGENPY_URL:=https://anaconda.org/conda-forge/eigenpy/2.6.5/download/osx-64/eigenpy-2.6.5-py37h0695097_0.tar.bz2
+BOOST_URL:=https://anaconda.org/conda-forge/boost/1.74.0/download/osx-64/boost-1.74.0-py37hd79e0ac_3.tar.bz2
+LXML_URL:=https://files.pythonhosted.org/packages/1e/3e/f0abc15d5dac50939bccc589aae336d5ead4c72e7ad1039a2e0f3630ea92/lxml-4.6.3-cp37-cp37m-macosx_10_9_x86_64.whl
+SHAPELY_URL:=https://files.pythonhosted.org/packages/e6/7d/4923f27c340339e1c896c77cafc8ed672c8d381a025bbab6c6ddcba27e8f/shapely-2.0.1-cp37-cp37m-macosx_10_9_x86_64.whl
+PILLOW_URL:=https://files.pythonhosted.org/packages/88/49/c26fc3b5b0e82bdc9d8751d6b939da29327b0d98f7c3b95a575cbfed2743/Pillow-9.2.0-cp37-cp37m-macosx_10_10_x86_64.whl
+endif
 ifeq ($(PYVERSION), py39)
-LXML_ARCH:=macosx_11_0_x86_64
-HPPFCL_URL:=https://anaconda.org/conda-forge/hpp-fcl/2.4.0/download/osx-64/hpp-fcl-2.4.0-py39h26350b9_0.conda
-EIGENPY_URL:=https://anaconda.org/conda-forge/eigenpy/3.2.0/download/osx-64/eigenpy-3.2.0-py39h3323527_0.conda
-BOOST_URL:=https://anaconda.org/conda-forge/boost/1.78.0/download/osx-64/boost-1.78.0-py39h953a6b8_4.tar.bz2
+HPPFCL_URL:=https://anaconda.org/conda-forge/hpp-fcl/1.7.5/download/osx-64/hpp-fcl-1.7.5-py39h1e32b98_0.tar.bz2
+EIGENPY_URL:=https://anaconda.org/conda-forge/eigenpy/2.6.5/download/osx-64/eigenpy-2.6.5-py39h5405915_0.tar.bz2
+BOOST_URL:=https://anaconda.org/conda-forge/boost/1.74.0/download/osx-64/boost-1.74.0-py39ha641261_3.tar.bz2
+LXML_URL:=https://files.pythonhosted.org/packages/b8/74/a71f7ad72e8db54ce899efab84507b801660750cbbfa6a39e6717557d36a/lxml-4.6.3-cp39-cp39-macosx_10_9_x86_64.whl
+SHAPELY_URL:=https://files.pythonhosted.org/packages/36/a4/7e542a209f862f967d7cb8e939eff155f4294a27d17e16441fb8bdd51a2c/shapely-2.0.1-cp39-cp39-macosx_10_9_x86_64.whl
+PILLOW_URL:=https://files.pythonhosted.org/packages/88/7a/ddfe28b485b623361457d4783007c1f9ba83a87f93e7fec32f64793efb6c/Pillow-9.2.0-cp39-cp39-macosx_10_10_x86_64.whl
 endif
 ifeq ($(PYVERSION), py310)
-LXML_ARCH:=macosx_11_0_x86_64
-HPPFCL_URL:=https://anaconda.org/conda-forge/hpp-fcl/2.4.0/download/osx-64/hpp-fcl-2.4.0-py310ha216469_0.conda
-EIGENPY_URL:=https://anaconda.org/conda-forge/eigenpy/3.2.0/download/osx-64/eigenpy-3.2.0-py310h33a8c9b_0.conda
-BOOST_URL:=https://anaconda.org/conda-forge/boost/1.78.0/download/osx-64/boost-1.78.0-py310h3e792ce_4.tar.bz2
-endif
-ifeq ($(PYVERSION), py311)
-LXML_ARCH:=macosx_11_0_universal2
-HPPFCL_URL:=https://anaconda.org/conda-forge/hpp-fcl/2.4.0/download/osx-64/hpp-fcl-2.4.0-py311hebdd1a2_0.conda
-EIGENPY_URL:=https://anaconda.org/conda-forge/eigenpy/3.2.0/download/osx-64/eigenpy-3.2.0-py311h62e90b6_0.conda
-BOOST_URL:=https://anaconda.org/conda-forge/boost/1.78.0/download/osx-64/boost-1.78.0-py311h349b758_4.tar.bz2
+HPPFCL_URL:=https://anaconda.org/conda-forge/hpp-fcl/1.8.0/download/osx-64/hpp-fcl-1.8.0-py310h651ac30_1.tar.bz2
+EIGENPY_URL:=https://anaconda.org/conda-forge/eigenpy/2.6.11/download/osx-64/eigenpy-2.6.11-py310hc03097c_0.tar.bz2
+BOOST_URL:=https://anaconda.org/conda-forge/boost/1.74.0/download/osx-64/boost-1.74.0-py310h509978a_5.tar.bz2
+LXML_URL:=https://files.pythonhosted.org/packages/a1/44/17b7dac7a18807d30e2fe10c3328c152808f5464565e230bfd0e77f178c6/lxml-4.8.0-cp310-cp310-macosx_10_15_x86_64.whl
+SHAPELY_URL:=https://files.pythonhosted.org/packages/1f/2a/dc3353c2431cf53e8d04bb8fba27e584410ca3435c9c85f76d71bf0c0e80/shapely-2.0.1-cp310-cp310-macosx_10_9_x86_64.whl
+PILLOW_URL:=https://files.pythonhosted.org/packages/d8/60/b13c00d403f34110e96c1b5c0afa73ce461efe3fe960c3a7e3e7fe190d82/Pillow-9.2.0-cp310-cp310-macosx_10_10_x86_64.whl
 endif
 ASSIMP_URL:=https://anaconda.org/conda-forge/assimp/5.0.1/download/osx-64/assimp-5.0.1-h1224e73_6.tar.bz2
-QHULL_URL:=https://anaconda.org/conda-forge/qhull/2020.2/download/osx-64/qhull-2020.2-h940c156_2.tar.bz2
-OCTOMAP_URL:=https://anaconda.org/conda-forge/octomap/1.9.8/download/osx-64/octomap-1.9.8-hb8565cd_0.tar.bz2
-BOOSTCPP_URL:=https://anaconda.org/conda-forge/boost-cpp/1.78.0/download/osx-64/boost-cpp-1.78.0-hf5ba120_3.conda
+OCTOMAP_URL:=https://anaconda.org/conda-forge/octomap/1.9.7/download/osx-64/octomap-1.9.7-h940c156_0.tar.bz2
 ZLIB_URL:=https://anaconda.org/conda-forge/zlib/1.2.11/download/osx-64/zlib-1.2.11-h7795811_1010.tar.bz2
 endif

 ifeq ($(PLATFORM), macosm1)
-PYPI_PLATFORM:=--platform macosx_11_0_arm64
-LXML_ARCH:=macosx_11_0_universal2
-SHAPELY_ARCH:=macosx_11_0_arm64
-PILLOW_ARCH:=macosx_11_0_arm64
+ifeq ($(PYVERSION), py37)
+# Warning: py37 not supported on Apple M1
+HPPFCL_URL:=https://anaconda.org/conda-forge/hpp-fcl/1.7.5/download/osx-64/hpp-fcl-1.7.5-py37h2d7f23a_0.tar.bz2
+EIGENPY_URL:=https://anaconda.org/conda-forge/eigenpy/2.6.5/download/osx-64/eigenpy-2.6.5-py37h0695097_0.tar.bz2
+BOOST_URL:=https://anaconda.org/conda-forge/boost/1.74.0/download/osx-64/boost-1.74.0-py37hd79e0ac_3.tar.bz2
+LXML_URL:=https://anaconda.org/conda-forge/lxml/4.9.1/download/osx-64/lxml-4.9.1-py37h994c40b_0.tar.bz2
+SHAPELY_URL:=https://files.pythonhosted.org/packages/e6/7d/4923f27c340339e1c896c77cafc8ed672c8d381a025bbab6c6ddcba27e8f/shapely-2.0.1-cp37-cp37m-macosx_10_9_x86_64.whl
+PILLOW_URL:=https://files.pythonhosted.org/packages/aa/bc/21097cd891dd2fa02f2b3d767e02e883e026482e59d29975d1bc30024aa3/Pillow-9.2.0-cp39-cp39-macosx_11_0_arm64.whl
+endif
 ifeq ($(PYVERSION), py39)
-HPPFCL_URL:=https://anaconda.org/conda-forge/hpp-fcl/2.4.0/download/osx-arm64/hpp-fcl-2.4.0-py39h82b2ff2_0.conda
-EIGENPY_URL:=https://anaconda.org/conda-forge/eigenpy/3.2.0/download/osx-arm64/eigenpy-3.2.0-py39h3a9e884_0.conda
-BOOST_URL:=https://anaconda.org/conda-forge/boost/1.78.0/download/osx-arm64/boost-1.78.0-py39h99de9ae_4.tar.bz2
+HPPFCL_URL:=https://anaconda.org/conda-forge/hpp-fcl/1.7.5/download/osx-arm64/hpp-fcl-1.7.5-py39ha69f3c1_2.tar.bz2
+EIGENPY_URL:=https://anaconda.org/conda-forge/eigenpy/2.6.7/download/osx-arm64/eigenpy-2.6.7-py39ha69f3c1_0.tar.bz2
+BOOST_URL:=https://anaconda.org/conda-forge/boost/1.78.0/download/osx-arm64/boost-1.78.0-py39h2550fe3_0.tar.bz2
+LXML_URL:=https://anaconda.org/conda-forge/lxml/4.9.1/download/osx-arm64/lxml-4.9.1-py39h9eb174b_0.tar.bz2
+SHAPELY_URL:=https://files.pythonhosted.org/packages/ea/aa/45fbd031edf3149cb767d8b9f9db45d5faf0324d743c6b8fb0298cc022d0/shapely-2.0.1-cp39-cp39-macosx_11_0_arm64.whl
+PILLOW_URL:=https://files.pythonhosted.org/packages/aa/bc/21097cd891dd2fa02f2b3d767e02e883e026482e59d29975d1bc30024aa3/Pillow-9.2.0-cp39-cp39-macosx_11_0_arm64.whl
 endif
 ifeq ($(PYVERSION), py310)
-HPPFCL_URL:=https://anaconda.org/conda-forge/hpp-fcl/2.4.0/download/osx-arm64/hpp-fcl-2.4.0-py310hdb6c3eb_0.conda
-EIGENPY_URL:=https://anaconda.org/conda-forge/eigenpy/3.2.0/download/osx-arm64/eigenpy-3.2.0-py310h96e9823_0.conda
-BOOST_URL:=https://anaconda.org/conda-forge/boost/1.78.0/download/osx-arm64/boost-1.78.0-py310h629746b_4.tar.bz2
-endif
-ifeq ($(PYVERSION), py311)
-HPPFCL_URL:=https://anaconda.org/conda-forge/hpp-fcl/2.4.0/download/osx-arm64/hpp-fcl-2.4.0-py311hc0c29b9_0.conda
-EIGENPY_URL:=https://anaconda.org/conda-forge/eigenpy/3.2.0/download/osx-arm64/eigenpy-3.2.0-py311h24fa84d_0.conda
-BOOST_URL:=https://anaconda.org/conda-forge/boost/1.78.0/download/osx-arm64/boost-1.78.0-py311h5c64717_4.tar.bz2
+HPPFCL_URL:=https://anaconda.org/conda-forge/hpp-fcl/1.8.0/download/osx-arm64/hpp-fcl-1.8.0-py310h5699539_2.tar.bz2
+EIGENPY_URL:=https://anaconda.org/conda-forge/eigenpy/2.6.9/download/osx-arm64/eigenpy-2.6.9-py310habfc766_1.tar.bz2
+BOOST_URL:=https://anaconda.org/conda-forge/boost/1.78.0/download/osx-arm64/boost-1.78.0-py310h4566fd1_0.tar.bz2
+LXML_URL:=https://anaconda.org/conda-forge/lxml/4.9.1/download/osx-arm64/lxml-4.9.1-py310h02f21da_0.tar.bz2
+SHAPELY_URL:=https://files.pythonhosted.org/packages/ec/41/d59208743e737184e1b403e95a937aebb022b8459e99efbcd5208fc8be46/shapely-2.0.1-cp310-cp310-macosx_11_0_arm64.whl
+PILLOW_URL:=https://files.pythonhosted.org/packages/0c/5f/117b653cad585f3aedfe0de996c292e67d4b020ed77f652e5a6c8c24f908/Pillow-9.2.0-cp310-cp310-macosx_11_0_arm64.whl
 endif
 ASSIMP_URL:=https://anaconda.org/conda-forge/assimp/5.0.1/download/osx-arm64/assimp-5.0.1-h0f81e16_7.tar.bz2
-QHULL_URL:=https://anaconda.org/conda-forge/qhull/2020.2/download/osx-arm64/qhull-2020.2-hc021e02_2.tar.bz2
-OCTOMAP_URL:=https://anaconda.org/conda-forge/octomap/1.9.8/download/osx-arm64/octomap-1.9.8-hffc8910_0.tar.bz2
-BOOSTCPP_URL:=https://anaconda.org/conda-forge/boost-cpp/1.78.0/download/osx-arm64/boost-cpp-1.78.0-h9ed8d21_3.conda
+OCTOMAP_URL:=https://anaconda.org/conda-forge/octomap/1.9.7/download/osx-arm64/octomap-1.9.7-hc021e02_0.tar.bz2
 ZLIB_URL:=https://anaconda.org/conda-forge/zlib/1.2.11/download/osx-arm64/zlib-1.2.11-h90dfc92_1014.tar.bz2
 endif

 ifeq ($(PLATFORM), win)
-PYPI_PLATFORM:=--platform win_amd64
-LXML_ARCH:=win_amd64
-SHAPELY_ARCH:=win_amd64
-PILLOW_ARCH:=win_amd64
+ifeq ($(PYVERSION), py37)
+HPPFCL_URL:=https://anaconda.org/conda-forge/hpp-fcl/1.7.5/download/win-64/hpp-fcl-1.7.5-py37h839d6b1_0.tar.bz2
+EIGENPY_URL:=https://anaconda.org/conda-forge/eigenpy/2.6.5/download/win-64/eigenpy-2.6.5-py37h2c32e34_0.tar.bz2
+BOOST_URL:=https://anaconda.org/conda-forge/boost/1.74.0/download/win-64/boost-1.74.0-py37h3b38789_3.tar.bz2
+LXML_URL:=https://files.pythonhosted.org/packages/9e/5e/171ee9d40a600f565fe691ec5bf7596247ec62cfb2edc00c91afe8ea837b/lxml-4.6.3-cp37-cp37m-win_amd64.whl
+SHAPELY_URL:=https://files.pythonhosted.org/packages/e2/87/b8b8d8d57b429b01aa56b7d723075c09f33c988b8091bb6f790c83436909/shapely-2.0.1-cp37-cp37m-win_amd64.whl
+PILLOW_URL:=https://files.pythonhosted.org/packages/69/f5/9e802159d78b2eaf26bf1f8b94648605993f5ca7247ac8870f065063fc40/Pillow-9.2.0-cp37-cp37m-win_amd64.whl
+endif
 ifeq ($(PYVERSION), py39)
-HPPFCL_URL:=https://anaconda.org/conda-forge/hpp-fcl/2.4.0/download/win-64/hpp-fcl-2.4.0-py39hf3ebc58_0.conda
-EIGENPY_URL:=https://anaconda.org/conda-forge/eigenpy/3.2.0/download/win-64/eigenpy-3.2.0-py39ha1f6a47_0.conda
-BOOST_URL:=https://anaconda.org/conda-forge/boost/1.78.0/download/win-64/boost-1.78.0-py39hea4d8d1_4.tar.bz2
+HPPFCL_URL:=https://anaconda.org/conda-forge/hpp-fcl/1.7.5/download/win-64/hpp-fcl-1.7.5-py39h2e7c763_0.tar.bz2
+EIGENPY_URL:=https://anaconda.org/conda-forge/eigenpy/2.6.5/download/win-64/eigenpy-2.6.5-py39h3ce40e6_0.tar.bz2
+BOOST_URL:=https://anaconda.org/conda-forge/boost/1.74.0/download/win-64/boost-1.74.0-py39hefe7e4c_3.tar.bz2
+LXML_URL:=https://files.pythonhosted.org/packages/72/d4/426ecb8849c47c3e370c87aa0ac05d85768df917ffea27fcd6686a5e6495/lxml-4.6.3-cp39-cp39-win_amd64.whl
+SHAPELY_URL:=https://files.pythonhosted.org/packages/a7/ae/eab645c4075093584b7a65ab71cb8ff4563a015bd935c9b55dba14b2c1eb/shapely-2.0.1-cp39-cp39-win_amd64.whl
+PILLOW_URL:=https://files.pythonhosted.org/packages/19/3f/b4d4bcf05dbcbe07f2e9613a8f4180c297395e73a91d8ad22c32c6624f8c/Pillow-9.2.0-cp39-cp39-win_amd64.whl
 endif
 ifeq ($(PYVERSION), py310)
-HPPFCL_URL:=https://anaconda.org/conda-forge/hpp-fcl/2.4.0/download/win-64/hpp-fcl-2.4.0-py310h1bf3f0a_0.conda
-EIGENPY_URL:=https://anaconda.org/conda-forge/eigenpy/3.2.0/download/win-64/eigenpy-3.2.0-py310h7fb871d_0.conda
-BOOST_URL:=https://anaconda.org/conda-forge/boost/1.78.0/download/win-64/boost-1.78.0-py310h220cb41_4.tar.bz2
+HPPFCL_URL:=https://anaconda.org/conda-forge/hpp-fcl/1.8.0/download/win-64/hpp-fcl-1.8.0-py310hc5a3c62_1.tar.bz2
+EIGENPY_URL:=https://anaconda.org/conda-forge/eigenpy/2.6.11/download/win-64/eigenpy-2.6.11-py310hbd43d28_0.tar.bz2
+BOOST_URL:=https://anaconda.org/conda-forge/boost/1.74.0/download/win-64/boost-1.74.0-py310hc781a3c_5.tar.bz2
+LXML_URL:=https://files.pythonhosted.org/packages/f6/71/65c80a4caa1617a4c6e8fe1500cebb179db96232e2f623bfe6a1f4294e39/lxml-4.8.0-cp310-cp310-win_amd64.whl
+SHAPELY_URL:=https://files.pythonhosted.org/packages/81/8a/7ac076a86b2632f1872284c5e60ed5f2fc26094875a85b35d9fa17b52504/shapely-2.0.1-cp310-cp310-win_amd64.whl
+PILLOW_URL:=https://files.pythonhosted.org/packages/02/55/67a3c17b9e7d972ed8c246f104da99ca4f3ea42fba566697e479011b84b6/Pillow-9.2.0-cp310-cp310-win_amd64.whl
 endif
-ifeq ($(PYVERSION), py311)
-HPPFCL_URL:=https://anaconda.org/conda-forge/hpp-fcl/2.4.0/download/win-64/hpp-fcl-2.4.0-py311hd263b2c_0.conda
-EIGENPY_URL:=https://anaconda.org/conda-forge/eigenpy/3.2.0/download/win-64/eigenpy-3.2.0-py311hd354db1_0.conda
-BOOST_URL:=https://anaconda.org/conda-forge/boost/1.78.0/download/win-64/boost-1.78.0-py311h12feb9d_3.tar.bz2
-endif
-ASSIMP_URL:=https://anaconda.org/conda-forge/assimp/5.2.5/download/win-64/assimp-5.2.5-h4dcb625_0.tar.bz2
-QHULL_URL:=https://anaconda.org/conda-forge/qhull/2020.2/download/win-64/qhull-2020.2-h70d2c02_2.tar.bz2
-OCTOMAP_URL:=https://anaconda.org/conda-forge/octomap/1.9.8/download/win-64/octomap-1.9.8-h91493d7_0.tar.bz2
-BOOSTCPP_URL:=https://anaconda.org/conda-forge/boost-cpp/1.78.0/download/win-64/boost-cpp-1.78.0-h9f4b32c_3.conda
+ASSIMP_URL:=https://anaconda.org/conda-forge/assimp/5.0.1/download/win-64/assimp-5.0.1-hc2aa0de_6.tar.bz2
+OCTOMAP_URL:=https://anaconda.org/conda-forge/octomap/1.9.7/download/win-64/octomap-1.9.7-h5362a0b_0.tar.bz2
 ZLIB_URL:=https://anaconda.org/conda-forge/zlib/1.2.11/download/win-64/zlib-1.2.11-h62dcd97_1010.tar.bz2
 endif

-LXML_NAME:=lxml
-LXML_VER:=4.9.4
-SHAPELY_NAME:=shapely
-SHAPELY_VER:=2.0.2
-PILLOW_NAME:=pillow
-PILLOW_PKG_NAME:=Pillow
-PILLOW_VER:=9.5.0
-SHAPELY_URL:=https://files.pythonhosted.org/packages/cp$(PYNUMBER)/s/$(SHAPELY_NAME)/$(SHAPELY_NAME)-$(SHAPELY_VER)-cp$(PYNUMBER)-cp$(PYNUMBER)-$(SHAPELY_ARCH).whl
-PILLOW_URL:=https://files.pythonhosted.org/packages/cp$(PYNUMBER)/p/$(PILLOW_NAME)/$(PILLOW_PKG_NAME)-$(PILLOW_VER)-cp$(PYNUMBER)-cp$(PYNUMBER)-$(PILLOW_ARCH).whl
-
-ifeq ($(PLATFORM), macosm1)
-ifeq ($(PYVERSION), py39)
-LXML_URL:=https://anaconda.org/conda-forge/lxml/4.9.1/download/osx-arm64/lxml-4.9.1-py39h0520ce3_1.tar.bz2
-endif
-ifeq ($(PYVERSION), py310)
-LXML_URL:=https://anaconda.org/conda-forge/lxml/4.9.1/download/osx-arm64/lxml-4.9.1-py310h02f21da_0.tar.bz2
-endif
-ifeq ($(PYVERSION), py311)
-LXML_URL:=https://anaconda.org/conda-forge/lxml/4.9.1/download/osx-arm64/lxml-4.9.1-py311h246f609_1.tar.bz2
-endif
-else
-LXML_URL:=https://files.pythonhosted.org/packages/cp$(PYNUMBER)/l/$(LXML_NAME)/$(LXML_NAME)-$(LXML_VER)-cp$(PYNUMBER)-cp$(PYNUMBER)-$(LXML_ARCH).whl
-endif
-$(info $$LXML_URL is [${LXML_URL}])
-$(info $$SHAPELY_URL is [${SHAPELY_URL}])
-$(info $$PILLOW_URL is [${PILLOW_URL}])
-
 .PHONY: bump
 bump:
 	cd . && $(SED) "s/$(OLD)/$(NEW)/" Makefile
@@ -211,7 +190,7 @@ endif
 	cp -r blenderbim/* dist/blenderbim/

 	# Provides IfcOpenShell Python functionality
-	cd dist/working && wget https://s3.amazonaws.com/ifcopenshell-builds/ifcopenshell-python-$(PYNUMBER)-v0.7.0-6c9e130-$(PLATFORM)64.zip
+	cd dist/working && wget https://s3.amazonaws.com/ifcopenshell-builds/ifcopenshell-python-$(PYNUMBER)-v0.7.0-476ab50-$(PLATFORM)64.zip
 	cd dist/working && unzip ifcopenshell-python*
 	cp -r dist/working/ifcopenshell dist/blenderbim/libs/site/packages/

@@ -227,7 +206,9 @@ endif
 	# IfcOpenBot sometimes lags behind, so we hotfix the Python utilities
 	cp -r dist/working/IfcOpenShell-0.7.0/src/ifcopenshell-python/ifcopenshell/util/* dist/blenderbim/libs/site/packages/ifcopenshell/util/
 	cp -r dist/working/IfcOpenShell-0.7.0/src/ifcopenshell-python/ifcopenshell/api/* dist/blenderbim/libs/site/packages/ifcopenshell/api/
-	cp dist/working/IfcOpenShell-0.7.0/src/ifcopenshell-python/ifcopenshell/*.py dist/blenderbim/libs/site/packages/ifcopenshell/
+	cp dist/working/IfcOpenShell-0.7.0/src/ifcopenshell-python/ifcopenshell/entity_instance.py dist/blenderbim/libs/site/packages/ifcopenshell/
+	cp dist/working/IfcOpenShell-0.7.0/src/ifcopenshell-python/ifcopenshell/file.py dist/blenderbim/libs/site/packages/ifcopenshell/
+	cp dist/working/IfcOpenShell-0.7.0/src/ifcopenshell-python/ifcopenshell/validate.py dist/blenderbim/libs/site/packages/ifcopenshell/
 	cp dist/working/IfcOpenShell-0.7.0/src/ifcopenshell-python/ifcopenshell/express/rule_executor.py dist/blenderbim/libs/site/packages/ifcopenshell/express/
 	# Provides bcf functionality
 	cp -r dist/working/IfcOpenShell-0.7.0/src/bcf/src/bcf dist/blenderbim/libs/site/packages/
@@ -241,10 +222,8 @@ endif
 	cp -r dist/working/IfcOpenShell-0.7.0/src/ifcbimtester/bimtester dist/blenderbim/libs/site/packages/
 	# Provides IFCTester functionality
 	cp -r dist/working/IfcOpenShell-0.7.0/src/ifctester/ifctester dist/blenderbim/libs/site/packages/
-	# Provides IFCFM functionality
-	cp -r dist/working/IfcOpenShell-0.7.0/src/ifcfm/ifcfm dist/blenderbim/libs/site/packages/
-	# Provides bSDD functionality
-	cp -r dist/working/IfcOpenShell-0.7.0/src/bsdd/* dist/blenderbim/libs/site/packages/
+	# Provides IFCCOBie functionality
+	cp -r dist/working/IfcOpenShell-0.7.0/src/ifccobie/* dist/blenderbim/libs/site/packages/
 	# Provides IFCDiff functionality
 	cp -r dist/working/IfcOpenShell-0.7.0/src/ifcdiff/* dist/blenderbim/libs/site/packages/
 	# Provides IFCCSV functionality
@@ -425,24 +404,18 @@ endif
 	mkdir dist/working
 	cd dist/working && $(PYTHON) -m venv env
 	cd dist/working && mkdir site-packages
-	# Required by IfcCSV
-	cd dist/working && . env/bin/activate && $(PIP) install pandas $(PYPI_PLATFORM) --python-version $(PYPI_VERSION) --implementation $(PYPI_IMP) --only-binary=:all: --target=./site-packages
-	cd dist/working && . env/bin/activate && $(PIP) install openpyxl --target=./site-packages
-	cd dist/working && . env/bin/activate && $(PIP) install odfpy --target=./site-packages
 	# Required by IFCCityJSON
 	cd dist/working && . env/bin/activate && $(PIP) install cjio --target=./site-packages
 	# Provides express rule validation for ifcopenshell.validate
 	cd dist/working && . env/bin/activate && $(PIP) install pytest --target=./site-packages
-	# Provides Brickschema functionality
-	cd dist/working && . env/bin/activate && $(PIP) install brickschema[persistence] --target=./site-packages
+	cd dist/working/site-packages/ && rm -r *dist-info*
 	cp -r dist/working/site-packages/* dist/blenderbim/libs/site/packages/
 	rm -rf dist/working

 	# Required by IFCClash
 	mkdir dist/working
 	cd dist/working && wget $(HPPFCL_URL)
-	cd dist/working && unzip hpp-fcl*
-	cd dist/working && tar -I zstd -xvf pkg*
+	cd dist/working && tar -xf hpp-fcl*
 ifeq ($(PLATFORM), linux)
 	cp -r dist/working/lib/$(PYLIBDIR)/site-packages/hppfcl dist/blenderbim/libs/site/packages/
 	cp -r dist/working/lib/*.so* dist/blenderbim/libs/
@@ -451,10 +424,6 @@ ifeq ($(PLATFORM), macos)
 	cp -r dist/working/lib/$(PYLIBDIR)/site-packages/hppfcl dist/blenderbim/libs/site/packages/
 	cp -r dist/working/lib/*.dylib dist/blenderbim/libs/
 endif
-ifeq ($(PLATFORM), macosm1)
-	cp -r dist/working/lib/$(PYLIBDIR)/site-packages/hppfcl dist/blenderbim/libs/site/packages/
-	cp -r dist/working/lib/*.dylib dist/blenderbim/libs/
-endif
 ifeq ($(PLATFORM), win)
 	cp -r dist/working/Lib/site-packages/hppfcl dist/blenderbim/libs/site/packages/
 	cp -r dist/working/Library/bin/*.dll dist/blenderbim/libs/site/packages/hppfcl/
@@ -471,27 +440,6 @@ endif
 ifeq ($(PLATFORM), macos)
 	cp -r dist/working/lib/*.dylib dist/blenderbim/libs/
 endif
-ifeq ($(PLATFORM), macosm1)
-	cp -r dist/working/lib/*.dylib dist/blenderbim/libs/
-endif
-ifeq ($(PLATFORM), win)
-	cp -r dist/working/Library/bin/*.dll dist/blenderbim/libs/site/packages/hppfcl/
-endif
-	rm -rf dist/working
-
-	# Required by hpp-fcl
-	mkdir dist/working
-	cd dist/working && wget $(QHULL_URL)
-	cd dist/working && tar -xf qhull*
-ifeq ($(PLATFORM), linux)
-	cp -r dist/working/lib/*.so* dist/blenderbim/libs/
-endif
-ifeq ($(PLATFORM), macos)
-	cp -r dist/working/lib/*.dylib dist/blenderbim/libs/
-endif
-ifeq ($(PLATFORM), macosm1)
-	cp -r dist/working/lib/*.dylib dist/blenderbim/libs/
-endif
 ifeq ($(PLATFORM), win)
 	cp -r dist/working/Library/bin/*.dll dist/blenderbim/libs/site/packages/hppfcl/
 endif
@@ -500,17 +448,13 @@ endif
 	# Required by hpp-fcl
 	mkdir dist/working
 	cd dist/working && wget $(EIGENPY_URL)
-	cd dist/working && unzip eigenpy*
-	cd dist/working && tar -I zstd -xvf pkg*
+	cd dist/working && tar -xf eigenpy*
 ifeq ($(PLATFORM), linux)
 	cp -r dist/working/lib/*.so* dist/blenderbim/libs/
 endif
 ifeq ($(PLATFORM), macos)
 	cp -r dist/working/lib/*.dylib dist/blenderbim/libs/
 endif
-ifeq ($(PLATFORM), macosm1)
-	cp -r dist/working/lib/*.dylib dist/blenderbim/libs/
-endif
 ifeq ($(PLATFORM), win)
 	cp -r dist/working/Library/bin/*.dll dist/blenderbim/libs/site/packages/hppfcl/
 endif
@@ -526,11 +470,8 @@ endif
 ifeq ($(PLATFORM), macos)
 	cp -r dist/working/lib/*.dylib dist/blenderbim/libs/
 endif
-ifeq ($(PLATFORM), macosm1)
-	cp -r dist/working/lib/*.dylib dist/blenderbim/libs/
-endif
 ifeq ($(PLATFORM), win)
-	cp -r dist/working/Library/bin/*.dll dist/blenderbim/libs/site/packages/hppfcl/
+	# Uh, do nothing, apparently? No DLLs are shipped.
 endif
 	rm -rf dist/working

@@ -544,33 +485,11 @@ endif
 ifeq ($(PLATFORM), macos)
 	cp -r dist/working/lib/*.dylib dist/blenderbim/libs/
 endif
-ifeq ($(PLATFORM), macosm1)
-	cp -r dist/working/lib/*.dylib dist/blenderbim/libs/
-endif
 ifeq ($(PLATFORM), win)
 	cp -r dist/working/Library/bin/*.dll dist/blenderbim/libs/site/packages/hppfcl/
 endif
 	rm -rf dist/working

-	# Required by hpp-fcl
-	mkdir dist/working
-	cd dist/working && wget $(BOOSTCPP_URL)
-	cd dist/working && unzip boost-cpp*
-	cd dist/working && tar -I zstd -xvf pkg*
-ifeq ($(PLATFORM), linux)
-	cp -r dist/working/lib/libboost_serialization.so* dist/blenderbim/libs/
-endif
-ifeq ($(PLATFORM), macos)
-	cp -r dist/working/lib/libboost_serialization.dylib dist/blenderbim/libs/
-endif
-ifeq ($(PLATFORM), macosm1)
-	cp -r dist/working/lib/libboost_serialization.dylib dist/blenderbim/libs/
-endif
-ifeq ($(PLATFORM), win)
-	cp -r dist/working/Library/bin/boost_serialization.dll dist/blenderbim/libs/site/packages/hppfcl/
-endif
-	rm -rf dist/working
-
 	# Required by hpp-fcl
 	mkdir dist/working
 	cd dist/working && wget $(ZLIB_URL)
@@ -581,9 +500,6 @@ endif
 ifeq ($(PLATFORM), macos)
 	cp -r dist/working/lib/*.dylib dist/blenderbim/libs/
 endif
-ifeq ($(PLATFORM), macosm1)
-	cp -r dist/working/lib/*.dylib dist/blenderbim/libs/
-endif
 ifeq ($(PLATFORM), win)
 	cp -r dist/working/Library/bin/*.dll dist/blenderbim/libs/site/packages/hppfcl/
 endif
@@ -636,6 +552,28 @@ endif
 	cd dist/working/parse_type-0.5.2/ && cp -r parse_type ../../blenderbim/libs/site/packages/
 	rm -rf dist/working

+	# Required by IFCCOBie for XLSX support
+	# TODO: see if we can replace this with openpyxl which does both read/write
+	mkdir dist/working
+	cd dist/working && wget https://files.pythonhosted.org/packages/0c/bc/82d6783f83f65f56d8b77d052773c4a2f952fa86385f0cd54e1e006658d7/XlsxWriter-1.2.9.tar.gz
+	cd dist/working && tar -xzvf XlsxWriter*
+	cd dist/working/XlsxWriter-1.2.9/ && cp -r xlsxwriter ../../blenderbim/libs/site/packages/
+	rm -rf dist/working
+
+	# Required by IFCCOBie for ODS support
+	mkdir dist/working
+	cd dist/working && wget https://files.pythonhosted.org/packages/97/73/8ade73f6749177003f7ce3304f524774adda96e6aaab30ea79fd8fda7934/odfpy-1.4.1.tar.gz
+	cd dist/working && tar -xzvf odfpy*
+	cd dist/working/odfpy-1.4.1/ && cp -r odf ../../blenderbim/libs/site/packages/
+	rm -rf dist/working
+
+	# Required by odfpy
+	mkdir dist/working
+	cd dist/working && wget https://files.pythonhosted.org/packages/a4/5f/f8aa58ca0cf01cbcee728abc9d88bfeb74e95e6cb4334cfd5bed5673ea77/defusedxml-0.6.0.tar.gz
+	cd dist/working && tar -xzvf defusedxml*
+	cd dist/working/defusedxml-0.6.0/ && cp -r defusedxml ../../blenderbim/libs/site/packages/
+	rm -rf dist/working
+
 	# Required by augin
 	mkdir dist/working
 	cd dist/working && wget https://files.pythonhosted.org/packages/76/b4/b7baffbda025efd5dc8fcd8d2e953e3aa939c236a484084fa8f4c3588ee9/boto3-1.17.17.tar.gz
@@ -671,13 +609,46 @@ endif
 	cp -r dist/working/IFC2JSON_python-master/file_converters/ifcjson dist/blenderbim/libs/site/packages/
 	rm -rf dist/working

+	# Provides OpenLCA functionality
+	mkdir dist/working
+	cd dist/working && wget https://files.pythonhosted.org/packages/85/33/f91b96e9e8608ff65a003b692e8a9cdd60f2178f60617e5b1d21334c009c/olca-ipc-0.0.10.tar.gz
+	cd dist/working && tar -xzvf olca-ipc*
+	cd dist/working/olca-ipc-0.0.10/ && cp -r olca ../../blenderbim/libs/site/packages/
+	rm -rf dist/working
+
 	# Provides Brickschema functionality
 	mkdir dist/working
+	cd dist/working && wget https://files.pythonhosted.org/packages/ca/37/8309da9a72407d2f5eb5489c197ac3cfe96ee3ccba1902d2a0ecc7843f92/brickschema-0.5.1.tar.gz
+	cd dist/working && tar -xzvf brickschema*
+	# This is an evil hack because we don't want to bundle flask
+	echo "" > dist/working/brickschema-0.5.1/brickschema/web.py
+	cd dist/working/brickschema-0.5.1/ && cp -r brickschema ../../blenderbim/libs/site/packages/
 	# For now lets bundle the latest nightly schema
 	cd dist/working && wget https://github.com/BrickSchema/Brick/releases/download/nightly/Brick.ttl
 	cd dist/working && cp Brick.ttl ../blenderbim/bim/schema/Brick.ttl
 	rm -rf dist/working

+	# Required by brickschema
+	mkdir dist/working
+	cd dist/working && wget https://files.pythonhosted.org/packages/c7/22/37bb938be8e5c20d443b0c9ba0a243573b671b01739efb0a19f81bc5b470/pyshacl-0.17.2.tar.gz
+	cd dist/working && tar -xzvf pyshacl*
+	cd dist/working/pyshacl-0.17.2/ && cp -r pyshacl ../../blenderbim/libs/site/packages/
+	rm -rf dist/working
+
+	# Required by brickschema
+	mkdir dist/working
+	cd dist/working && wget https://files.pythonhosted.org/packages/d2/a7/be8244688bfcee37c23733ab4fe8e6afa6d4403bd2674a3ae7bd2cecc77b/rdflib-6.0.2.tar.gz
+	cd dist/working && tar -xzvf rdflib*
+	cd dist/working/rdflib-6.0.2/ && cp -r rdflib ../../blenderbim/libs/site/packages/
+	rm -rf dist/working
+
+	# Required by brickschema
+	mkdir dist/working
+	cd dist/working && wget https://files.pythonhosted.org/packages/7d/c7/208aece36279e4f1236e437119358786e39530ecc1719d4e1afeddba5288/owlrl-6.0.2.tar.gz
+	cd dist/working && tar -xzvf owlrl*
+	cd dist/working/owlrl-6.0.2/ && cp -r owlrl ../../blenderbim/libs/site/packages/
+	rm -rf dist/working
+
 	# Required by brickschema
 	# This is a bit of a dodgy one, it should be provided by setuptools which Blender doesn't ship.
 	mkdir dist/working
@@ -693,20 +664,7 @@ endif
 	cp -r dist/working/bpypolyskel-master/bpypolyskel dist/blenderbim/libs/site/packages/
 	rm -rf dist/working

-	# Required for Desktop icon and file association
-	cp -r blenderbim/libs/desktop dist/blenderbim/libs/
-
-	# generate translations module for BBIM build
-	git clone https://github.com/IfcOpenShell/blenderbim-translations.git dist/working
-	python scripts/bbim_translations.py -i "dist/working" -o "dist/blenderbim"
-	rm -rf dist/working
-
-	# Remove dependencies also bundled with Blender
-	rm -rf dist/blenderbim/libs/site/packages/numpy
-	rm -rf dist/blenderbim/libs/site/packages/numpy.libs
-
 	cd dist/blenderbim && $(SED) "s/999999/$(VERSION)/" __init__.py
-	cd dist/blenderbim/bim && $(SED) "s/8888888/$(LAST_COMMIT_HASH)/" __init__.py
 	cd dist && zip -r blenderbim-$(VERSION)-$(PYVERSION)-$(PLATFORM).zip ./*
 	rm -rf dist/blenderbim

@@ -22,21 +22,19 @@ import site

 bl_info = {
    "name": "BlenderBIM",
-    "description": "Transforms Blender into a native Building Information Model authoring platform using IFC.",
+    "description": "Author, import, and export data using the Industry Foundation Classes schema",
    "author": "IfcOpenShell Contributors",
-    "blender": (3, 1, 0),
+    "blender": (2, 80, 0),
    "version": (0, 0, 999999),
-    "location": "File Menu, Scene Properties Tab. See documentation for more.",
-    "doc_url": "https://blenderbim.org/docs",
+    "location": "File > Export, File > Import, Scene / Object / Material / Mesh Properties",
    "tracker_url": "https://github.com/IfcOpenShell/IfcOpenShell/issues",
-    "category": "System",
+    "category": "Import-Export",
 }

 if sys.modules.get("bpy", None):
    # Process *.pth in /libs/site/packages to setup globally importable modules
    # This is 3 levels deep as required by the static RPATH of ../../ from dependencies taken from Anaconda
-    # site.addsitedir(os.path.join(os.path.dirname(os.path.realpath(__file__)), "libs", "site", "packages"))
-    sys.path.insert(0, os.path.join(os.path.dirname(os.path.realpath(__file__)), "libs", "site", "packages"))
+    site.addsitedir(os.path.join(os.path.dirname(os.path.realpath(__file__)), "libs", "site", "packages"))

    import blenderbim.bim

@@ -16,25 +16,15 @@
 # You should have received a copy of the GNU General Public License
 # along with BlenderBIM Add-on.  If not, see <http://www.gnu.org/licenses/>.

-import os
-from pathlib import Path
 import bpy
-import bpy.utils.previews
 import blenderbim
 import importlib
 from . import handler, ui, prop, operator, helper

-try:
-    from blenderbim.translations import translations_dict
-except ImportError:
-    translations_dict = {}
-cwd = os.path.dirname(os.path.realpath(__file__))
-
 modules = {
    "project": None,
    "search": None,
    "bcf": None,
-    "bsdd": None,
    "root": None,
    "unit": None,
    "model": None,
@@ -48,9 +38,8 @@ modules = {
    "spatial": None,
    "void": None,
    "aggregate": None,
-    "nest": None,
    "geometry": None,
-    "fm": None,
+    "cobie": None,
    "resource": None,
    "cost": None,
    "sequence": None,
@@ -72,6 +61,7 @@ modules = {
    "document": None,
    "pset_template": None,
    "clash": None,
+    "lca": None,
    "csv": None,
    "tester": None,
    "bimtester": None,
@@ -82,7 +72,6 @@ modules = {
    "augin": None,
    "debug": None,
    "ifcgit": None,
-    "covering": None,
    # Uncomment this line to enable loading of the demo module. Happy hacking!
    # The name "demo" must correlate to a folder name in `bim/module/`.
    # "demo": None,
@@ -96,121 +85,77 @@ for name in modules.keys():
 classes = [
    operator.AddIfcFile,
    operator.BIM_OT_add_section_plane,
-    operator.BIM_OT_open_webbrowser,
    operator.BIM_OT_remove_section_plane,
-    operator.BIM_OT_show_description,
-    operator.EditBlenderCollection,
-    operator.FileAssociate,
-    operator.FileUnassociate,
+    operator.ConfigureVisibility,
    operator.OpenUpstream,
    operator.OpenUri,
    operator.ReloadIfcFile,
    operator.RemoveIfcFile,
    operator.SelectDataDir,
    operator.SelectIfcFile,
+    operator.ReloadSelectedIfcFile,
    operator.SelectSchemaDir,
    operator.SelectURIAttribute,
-    operator.SetTab,
-    operator.SwitchTab,
+    operator.EditBlenderCollection,
+    operator.BIM_OT_open_webbrowser,
+    operator.BIM_OT_show_description,
    prop.StrProperty,
    operator.BIM_OT_enum_property_search,  # /!\ Register AFTER prop.StrProperty
    prop.ObjProperty,
    prop.Attribute,
-    prop.BIMAreaProperties,
-    prop.BIMTabProperties,
+    prop.ModuleVisibility,
    prop.BIMProperties,
    prop.IfcParameter,
    prop.PsetQto,
    prop.GlobalId,
    prop.BIMObjectProperties,
-    prop.BIMCollectionProperties,
    prop.BIMMaterialProperties,
    prop.BIMMeshProperties,
-    prop.BIMFacet,
-    prop.BIMFilterGroup,
+    ui.BIM_PT_section_plane,
    ui.BIM_UL_generic,
    ui.BIM_UL_topics,
    ui.BIM_ADDON_preferences,
-    # Tabs panel
-    ui.BIM_PT_tabs,
-    # Project overview
-    ui.BIM_PT_tab_project_info,
-    ui.BIM_PT_tab_project_setup,
-    ui.BIM_PT_tab_geometry,
-    ui.BIM_PT_tab_stakeholders,
-    ui.BIM_PT_tab_grouping_and_filtering,
-    # Object information
-    ui.BIM_PT_tab_object_metadata,
-    ui.BIM_PT_tab_misc,
-    # Geometry and materials
-    ui.BIM_PT_tab_placement,
-    ui.BIM_PT_tab_representations,
-    ui.BIM_PT_tab_geometric_relationships,
-    ui.BIM_PT_tab_parametric_geometry,
-    ui.BIM_PT_tab_profiles,
-    ui.BIM_PT_tab_materials,
-    ui.BIM_PT_tab_styles,
-    # Drawings and documents
-    ui.BIM_PT_tab_sheets,
-    ui.BIM_PT_tab_drawings,
-    ui.BIM_PT_tab_schedules,
-    ui.BIM_PT_tab_references,
-    # Services and systems
-    ui.BIM_PT_tab_services,
-    ui.BIM_PT_tab_zones,
-    # Structural analysis
-    ui.BIM_PT_tab_structural,
-    # Construction scheduling
-    ui.BIM_PT_tab_status,
-    ui.BIM_PT_tab_resources,
-    ui.BIM_PT_tab_cost,
-    ui.BIM_PT_tab_sequence,
-    # Facility management
-    ui.BIM_PT_tab_handover,
-    ui.BIM_PT_tab_operations,
-    # Quality and coordination
-    ui.BIM_PT_tab_quality_control,
-    ui.BIM_PT_tab_clash_detection,
-    ui.BIM_PT_tab_collaboration,
-    ui.BIM_PT_tab_sandbox,
-    # TODO: move this somewhere else and clean it up
-    ui.BIM_PT_section_plane,
+    # Scene panel groups
+    ui.BIM_PT_project_info,
+    ui.BIM_PT_project_setup,
+    ui.BIM_PT_collaboration,
+    ui.BIM_PT_selection,
+    ui.BIM_PT_geometry,
+    ui.BIM_PT_services,
+    ui.BIM_PT_structural,
+    ui.BIM_PT_4D5D,
+    ui.BIM_PT_quality_control,
+    ui.BIM_PT_integrations,
+    # Object panel groups
+    ui.BIM_PT_object_metadata,
+    ui.BIM_PT_geometry_object,
+    ui.BIM_PT_services_object,
+    ui.BIM_PT_utilities_object,
+    ui.BIM_PT_misc_object,
 ]

 for mod in modules.values():
    classes.extend(mod.classes)

-addon_keymaps = []
-icons = None
-is_registering = False
-last_commit_hash = "8888888"
-overridden_scene_panels = dict()
-

 def on_register(scene):
-    global is_registering
-
-    if is_registering:
-        return
-    is_registering = True
-    handler.load_post(scene)
+    handler.setDefaultProperties(scene)
    if not bpy.app.background:
        bpy.app.handlers.depsgraph_update_post.remove(on_register)
-    is_registering = False


 def register():
    for cls in classes:
        bpy.utils.register_class(cls)
    bpy.app.handlers.depsgraph_update_post.append(on_register)
+    bpy.app.handlers.undo_pre.append(handler.undo_pre)
    bpy.app.handlers.undo_post.append(handler.undo_post)
+    bpy.app.handlers.redo_pre.append(handler.redo_pre)
    bpy.app.handlers.redo_post.append(handler.redo_post)
-    bpy.app.handlers.load_post.append(handler.load_post)
+    bpy.app.handlers.load_post.append(handler.setDefaultProperties)
    bpy.app.handlers.load_post.append(handler.loadIfcStore)
+    bpy.app.handlers.save_post.append(handler.ensureIfcExported)
    bpy.types.Scene.BIMProperties = bpy.props.PointerProperty(type=prop.BIMProperties)
-    bpy.types.Screen.BIMAreaProperties = bpy.props.CollectionProperty(type=prop.BIMAreaProperties)
-    bpy.types.Screen.BIMTabProperties = bpy.props.PointerProperty(type=prop.BIMTabProperties)
-    bpy.types.Collection.BIMCollectionProperties = bpy.props.PointerProperty(type=prop.BIMCollectionProperties)
    bpy.types.Object.BIMObjectProperties = bpy.props.PointerProperty(type=prop.BIMObjectProperties)
    bpy.types.Material.BIMObjectProperties = bpy.props.PointerProperty(type=prop.BIMObjectProperties)
    bpy.types.Material.BIMMaterialProperties = bpy.props.PointerProperty(type=prop.BIMMaterialProperties)
@@ -218,59 +163,25 @@ def register():
    bpy.types.Curve.BIMMeshProperties = bpy.props.PointerProperty(type=prop.BIMMeshProperties)
    bpy.types.Camera.BIMMeshProperties = bpy.props.PointerProperty(type=prop.BIMMeshProperties)
    bpy.types.PointLight.BIMMeshProperties = bpy.props.PointerProperty(type=prop.BIMMeshProperties)
+    bpy.types.SCENE_PT_unit.append(ui.ifc_units)
    if hasattr(bpy.types, "UI_MT_button_context_menu"):
        bpy.types.UI_MT_button_context_menu.append(ui.draw_custom_context_menu)
-    bpy.types.STATUSBAR_HT_header.append(ui.draw_statusbar)

    for mod in modules.values():
        mod.register()

-    wm = bpy.context.window_manager
-    if wm.keyconfigs.addon:
-        km = wm.keyconfigs.addon.keymaps.new(name="Window", space_type="EMPTY")
-        kmi = km.keymap_items.new("bim.switch_tab", "TAB", "PRESS", ctrl=True)
-        addon_keymaps.append((km, kmi))
-
-    global icons
-
-    icons_dir = os.path.join(cwd, "data", "icons")
-    icon_preview = bpy.utils.previews.new()
-    for filename in os.listdir(icons_dir):
-        if filename.endswith(".png"):
-            icon_name = os.path.splitext(filename)[0]
-            icon_path = os.path.join(icons_dir, filename)
-            icon_preview.load(icon_name, icon_path, "IMAGE")
-
-    icons = icon_preview
-
-    global last_commit_hash
-    try:
-        import git
-
-        path = Path(__file__).resolve().parent
-        repo = git.Repo(str(path), search_parent_directories=True)
-        last_commit_hash = repo.head.object.hexsha
-    except:
-        pass
-
-    bpy.app.translations.register("blenderbim", translations_dict)
-

 def unregister():
-    global icons
-
-    bpy.utils.previews.remove(icons)
-
    for cls in reversed(classes):
        if getattr(cls, "is_registered", None) is None:
            bpy.utils.unregister_class(cls)
        elif cls.is_registered:
            bpy.utils.unregister_class(cls)

-    bpy.app.handlers.load_post.remove(handler.load_post)
+    bpy.app.handlers.load_post.remove(handler.setDefaultProperties)
    bpy.app.handlers.load_post.remove(handler.loadIfcStore)
+    bpy.app.handlers.save_post.remove(handler.ensureIfcExported)
    del bpy.types.Scene.BIMProperties
-    del bpy.types.Collection.BIMCollectionProperties
    del bpy.types.Object.BIMObjectProperties
    del bpy.types.Material.BIMObjectProperties
    del bpy.types.Material.BIMMaterialProperties
@@ -278,24 +189,9 @@ def unregister():
    del bpy.types.Curve.BIMMeshProperties
    del bpy.types.Camera.BIMMeshProperties
    del bpy.types.PointLight.BIMMeshProperties
+    bpy.types.SCENE_PT_unit.remove(ui.ifc_units)
    if hasattr(bpy.types, "UI_MT_button_context_menu"):
        bpy.types.UI_MT_button_context_menu.remove(ui.draw_custom_context_menu)
-    bpy.types.STATUSBAR_HT_header.remove(ui.draw_statusbar)

    for mod in reversed(list(modules.values())):
        mod.unregister()
-
-    wm = bpy.context.window_manager
-    kc = wm.keyconfigs.addon
-    if kc:
-        for km, kmi in addon_keymaps:
-            km.keymap_items.remove(kmi)
-    addon_keymaps.clear()
-
-    for panel in tuple(overridden_scene_panels.keys()):
-        original_panel, override_panel = overridden_scene_panels[panel]
-        bpy.utils.unregister_class(override_panel)
-        bpy.utils.register_class(original_panel)
-        del overridden_scene_panels[panel]
-
-    bpy.app.translations.unregister("blenderbim")
@@ -27,12 +27,6 @@ text, tspan { /* 2.5mm */ fill: black; stroke: none; font-family: 'OpenGost Type
 .IfcAnnotation { fill: none; stroke: black; stroke-linecap: 'round'; stroke-width: 0.25; }
 .IfcGeographicElement { fill: none; stroke: black; stroke-linecap: 'round'; stroke-width: 1; }
 .PredefinedType-LINEWORK { stroke: black; stroke-width: 0.25; }
-.PredefinedType-LINEWORK.dashed { stroke-dasharray: 3, 2; }
-.PredefinedType-LINEWORK.fine { stroke-width: 0.18; stroke: #777777; }
-.PredefinedType-LINEWORK.thin { stroke-width: 0.25; }
-.PredefinedType-LINEWORK.medium { stroke-width: 0.35; }
-.PredefinedType-LINEWORK.thick { stroke-width: 0.5; }
-.PredefinedType-LINEWORK.strong { stroke-width: 1; }
 .PredefinedType-BACKGROUND { stroke: black; stroke-width: 0.18; }
 .PredefinedType-GRID { marker-start: url(#grid-marker); marker-end: url(#grid-marker); }
 .PredefinedType-SECTION { stroke-dasharray: 12.5, 3, 3, 3; }
@@ -46,6 +40,7 @@ text, tspan { /* 2.5mm */ fill: black; stroke: none; font-family: 'OpenGost Type
 .PredefinedType-SLOPEPERCENT { marker-end: url(#radius-marker-end); }
 .PredefinedType-SLOPEFRACTION { marker-end: url(#radius-marker-end); }
 .PredefinedType-DIAMETER { marker-start: url(#diameter-marker-start); marker-end: url(#diameter-marker-end); }
+.PredefinedType-HIDDENLINE { stroke-dasharray: 3, 2; }
 .PredefinedType-STAIRARROW { marker-start: url(#stair-marker-start); marker-end: url(#stair-marker-end); }
 .PredefinedType-BOUNDARY { fill: none; stroke: red; stroke-width: 1; stroke-dasharray: 12, 4, 3, 4, 3, 4; }
 .PredefinedType-SEALANT { fill: url(#crosshatch1); stroke-width: 0.25; }
@@ -75,7 +75,7 @@
    <marker id="stair-marker-end" markerHeight="42" markerWidth="21" orient="auto" refX="21" refY="21">
        <path d="M 0 0 L 21 21 L 0 42" class="annotation stair" style="stroke-width:2; marker-start: none; marker-end: none;" />
    </marker>
-    <marker id="plan-level-marker" markerHeight="30" markerWidth="30" refX="15" refY="15" orient="auto">
+    <marker id="plan-level-marker" markerHeight="30" markerWidth="30" refX="15" refY="15">
        <g>
            <path d="M 15 0 L 15 30" class="annotation" style="stroke-width:1;" />
            <path d="M 0 15 L 30 15" class="annotation" style="stroke-width:1;" />
@@ -84,7 +84,7 @@
            <path d="M 15 15 L 22.5 15 A 7.5 7.5 0 0 1 15 22.5 Z" fill="black"/>
        </g>
    </marker>
-    <marker id="section-level-marker" markerHeight="11" markerWidth="90" refX="20" refY="10" orient="auto-start-reverse">
+    <marker id="section-level-marker" markerHeight="11" markerWidth="90" refX="20" refY="10">
        <g>
            <path d="M 0 1 L 20 1 L 10 11 Z" fill="black" />
            <path d="M 0 1 L 90 1" class="annotation" style="stroke-width:1;" />
@@ -1,755 +0,0 @@
-{
-    "Technical": {
-        "render_type": "VIEWPORT",
-        "raster_style": {
-            "bpy.data.worlds[0].color": [
-                1.0,
-                1.0,
-                1.0
-            ],
-            "scene.render.bake_bias": 0.0010000000474974513,
-            "scene.render.bake_margin": 16,
-            "scene.render.bake_margin_type": "ADJACENT_FACES",
-            "scene.render.bake_samples": 256,
-            "scene.render.bake_type": "NORMALS",
-            "scene.render.bake_user_scale": 0.0,
-            "scene.render.border_max_x": 1.0,
-            "scene.render.border_max_y": 1.0,
-            "scene.render.border_min_x": 0.0,
-            "scene.render.border_min_y": 0.0,
-            "scene.render.dither_intensity": 1.0,
-            "scene.render.engine": "BLENDER_WORKBENCH",
-            "scene.render.film_transparent": false,
-            "scene.render.filter_size": 1.5,
-            "scene.render.fps": 24,
-            "scene.render.fps_base": 1.0,
-            "scene.render.frame_map_new": 100,
-            "scene.render.frame_map_old": 100,
-            "scene.render.hair_subdiv": 0,
-            "scene.render.hair_type": "STRAND",
-            "scene.render.line_thickness": 1.0,
-            "scene.render.line_thickness_mode": "ABSOLUTE",
-            "scene.render.metadata_input": "SCENE",
-            "scene.render.motion_blur_shutter": 0.5,
-            "scene.render.pixel_aspect_x": 1.0,
-            "scene.render.pixel_aspect_y": 1.0,
-            "scene.render.preview_pixel_size": "AUTO",
-            "scene.render.resolution_percentage": 100,
-            "scene.render.resolution_x": 1000,
-            "scene.render.resolution_y": 1000,
-            "scene.render.sequencer_gl_preview": "SOLID",
-            "scene.render.simplify_child_particles": 1.0,
-            "scene.render.simplify_child_particles_render": 1.0,
-            "scene.render.simplify_gpencil": false,
-            "scene.render.simplify_gpencil_antialiasing": true,
-            "scene.render.simplify_gpencil_modifier": true,
-            "scene.render.simplify_gpencil_onplay": false,
-            "scene.render.simplify_gpencil_shader_fx": true,
-            "scene.render.simplify_gpencil_tint": true,
-            "scene.render.simplify_gpencil_view_fill": true,
-            "scene.render.simplify_shadows": 1.0,
-            "scene.render.simplify_shadows_render": 1.0,
-            "scene.render.simplify_subdivision": 6,
-            "scene.render.simplify_subdivision_render": 6,
-            "scene.render.simplify_volumes": 1.0,
-            "scene.render.stamp_font_size": 12,
-            "scene.render.stamp_note_text": "",
-            "scene.render.threads": 20,
-            "scene.render.threads_mode": "AUTO",
-            "scene.render.use_bake_clear": true,
-            "scene.render.use_bake_lores_mesh": false,
-            "scene.render.use_bake_multires": false,
-            "scene.render.use_bake_selected_to_active": false,
-            "scene.render.use_bake_user_scale": false,
-            "scene.render.use_border": false,
-            "scene.render.use_compositing": true,
-            "scene.render.use_crop_to_border": false,
-            "scene.render.use_file_extension": true,
-            "scene.render.use_freestyle": false,
-            "scene.render.use_high_quality_normals": false,
-            "scene.render.use_lock_interface": false,
-            "scene.render.use_motion_blur": false,
-            "scene.render.use_multiview": false,
-            "scene.render.use_overwrite": true,
-            "scene.render.use_persistent_data": false,
-            "scene.render.use_placeholder": false,
-            "scene.render.use_render_cache": false,
-            "scene.render.use_sequencer": true,
-            "scene.render.use_sequencer_override_scene_strip": false,
-            "scene.render.use_simplify": false,
-            "scene.render.use_single_layer": false,
-            "scene.render.use_stamp": false,
-            "scene.render.use_stamp_camera": true,
-            "scene.render.use_stamp_date": true,
-            "scene.render.use_stamp_filename": true,
-            "scene.render.use_stamp_frame": true,
-            "scene.render.use_stamp_frame_range": false,
-            "scene.render.use_stamp_hostname": false,
-            "scene.render.use_stamp_labels": true,
-            "scene.render.use_stamp_lens": false,
-            "scene.render.use_stamp_marker": false,
-            "scene.render.use_stamp_memory": false,
-            "scene.render.use_stamp_note": false,
-            "scene.render.use_stamp_render_time": true,
-            "scene.render.use_stamp_scene": true,
-            "scene.render.use_stamp_sequencer_strip": false,
-            "scene.render.use_stamp_time": true,
-            "scene.render.views_format": "STEREO_3D",
-            "scene.view_settings.exposure": 0.0,
-            "scene.view_settings.gamma": 1.0,
-            "scene.view_settings.look": "None",
-            "scene.view_settings.use_curve_mapping": false,
-            "scene.view_settings.view_transform": "Standard",
-            "scene.display.shading.aov_name": "",
-            "scene.display.shading.background_color": [
-                0.0,
-                0.0,
-                0.0
-            ],
-            "scene.display.shading.background_type": "THEME",
-            "scene.display.shading.cavity_ridge_factor": 1.0,
-            "scene.display.shading.cavity_type": "BOTH",
-            "scene.display.shading.cavity_valley_factor": 1.0,
-            "scene.display.shading.color_type": "SINGLE",
-            "scene.display.shading.curvature_ridge_factor": 1.0,
-            "scene.display.shading.curvature_valley_factor": 1.0,
-            "scene.display.shading.light": "FLAT",
-            "scene.display.shading.object_outline_color": [
-                0.0,
-                0.0,
-                0.0
-            ],
-            "scene.display.shading.render_pass": "COMBINED",
-            "scene.display.shading.shadow_intensity": 0.5,
-            "scene.display.shading.show_backface_culling": false,
-            "scene.display.shading.show_cavity": false,
-            "scene.display.shading.show_object_outline": true,
-            "scene.display.shading.show_shadows": false,
-            "scene.display.shading.show_specular_highlight": true,
-            "scene.display.shading.show_xray": false,
-            "scene.display.shading.show_xray_wireframe": false,
-            "scene.display.shading.single_color": [
-                1.0,
-                1.0,
-                1.0
-            ],
-            "scene.display.shading.studio_light": "Default",
-            "scene.display.shading.studiolight_background_alpha": 0.0,
-            "scene.display.shading.studiolight_background_blur": 0.0,
-            "scene.display.shading.studiolight_intensity": 0.0,
-            "scene.display.shading.studiolight_rotate_z": 0.0,
-            "scene.display.shading.type": "SOLID",
-            "scene.display.shading.use_compositor": "DISABLED",
-            "scene.display.shading.use_dof": false,
-            "scene.display.shading.use_scene_lights": false,
-            "scene.display.shading.use_scene_lights_render": false,
-            "scene.display.shading.use_scene_world": false,
-            "scene.display.shading.use_scene_world_render": false,
-            "scene.display.shading.use_studiolight_view_rotation": true,
-            "scene.display.shading.use_world_space_lighting": false,
-            "scene.display.shading.wireframe_color_type": "MATERIAL",
-            "scene.display.shading.xray_alpha": 0.5,
-            "scene.display.shading.xray_alpha_wireframe": 0.0,
-            "scene.display.light_direction": [
-                0.5,
-                0.5,
-                0.5
-            ],
-            "scene.display.matcap_ssao_attenuation": 1.0,
-            "scene.display.matcap_ssao_distance": 0.20000000298023224,
-            "scene.display.matcap_ssao_samples": 16,
-            "scene.display.render_aa": "8",
-            "scene.display.shadow_focus": 0.0,
-            "scene.display.shadow_shift": 0.10000000149011612,
-            "scene.display.viewport_aa": "FXAA",
-            "space.overlay.backwire_opacity": 0.5,
-            "space.overlay.bone_wire_alpha": 1.0,
-            "space.overlay.display_handle": "SELECTED",
-            "space.overlay.fade_inactive_alpha": 0.4000000059604645,
-            "space.overlay.gpencil_fade_layer": 0.5,
-            "space.overlay.gpencil_fade_objects": 0.5,
-            "space.overlay.gpencil_grid_opacity": 0.5,
-            "space.overlay.gpencil_vertex_paint_opacity": 1.0,
-            "space.overlay.grid_lines": 16,
-            "space.overlay.grid_scale": 1.0,
-            "space.overlay.grid_subdivisions": 10,
-            "space.overlay.normals_constant_screen_size": 7.0,
-            "space.overlay.normals_length": 0.10000000149011612,
-            "space.overlay.sculpt_curves_cage_opacity": 0.5,
-            "space.overlay.sculpt_mode_face_sets_opacity": 1.0,
-            "space.overlay.sculpt_mode_mask_opacity": 0.75,
-            "space.overlay.show_annotation": true,
-            "space.overlay.show_axis_x": false,
-            "space.overlay.show_axis_y": false,
-            "space.overlay.show_axis_z": false,
-            "space.overlay.show_bones": true,
-            "space.overlay.show_cursor": true,
-            "space.overlay.show_curve_normals": false,
-            "space.overlay.show_edge_bevel_weight": true,
-            "space.overlay.show_edge_crease": true,
-            "space.overlay.show_edge_seams": true,
-            "space.overlay.show_edge_sharp": true,
-            "space.overlay.show_edges": false,
-            "space.overlay.show_extra_edge_angle": false,
-            "space.overlay.show_extra_edge_length": false,
-            "space.overlay.show_extra_face_angle": false,
-            "space.overlay.show_extra_face_area": false,
-            "space.overlay.show_extra_indices": false,
-            "space.overlay.show_extras": true,
-            "space.overlay.show_face_center": false,
-            "space.overlay.show_face_normals": false,
-            "space.overlay.show_face_orientation": false,
-            "space.overlay.show_faces": true,
-            "space.overlay.show_fade_inactive": false,
-            "space.overlay.show_floor": false,
-            "space.overlay.show_freestyle_edge_marks": true,
-            "space.overlay.show_freestyle_face_marks": true,
-            "space.overlay.show_look_dev": false,
-            "space.overlay.show_motion_paths": true,
-            "space.overlay.show_object_origins": false,
-            "space.overlay.show_object_origins_all": false,
-            "space.overlay.show_occlude_wire": false,
-            "space.overlay.show_onion_skins": false,
-            "space.overlay.show_ortho_grid": true,
-            "space.overlay.show_outline_selected": true,
-            "space.overlay.show_overlays": true,
-            "space.overlay.show_paint_wire": false,
-            "space.overlay.show_relationship_lines": false,
-            "space.overlay.show_sculpt_curves_cage": true,
-            "space.overlay.show_sculpt_face_sets": true,
-            "space.overlay.show_sculpt_mask": true,
-            "space.overlay.show_split_normals": false,
-            "space.overlay.show_stats": false,
-            "space.overlay.show_statvis": false,
-            "space.overlay.show_text": true,
-            "space.overlay.show_vertex_normals": false,
-            "space.overlay.show_viewer_attribute": true,
-            "space.overlay.show_weight": false,
-            "space.overlay.show_wireframes": true,
-            "space.overlay.show_wpaint_contours": false,
-            "space.overlay.show_xray_bone": false,
-            "space.overlay.texture_paint_mode_opacity": 1.0,
-            "space.overlay.use_debug_freeze_view_culling": false,
-            "space.overlay.use_gpencil_canvas_xray": false,
-            "space.overlay.use_gpencil_edit_lines": true,
-            "space.overlay.use_gpencil_fade_gp_objects": false,
-            "space.overlay.use_gpencil_fade_layers": false,
-            "space.overlay.use_gpencil_fade_objects": false,
-            "space.overlay.use_gpencil_grid": false,
-            "space.overlay.use_gpencil_multiedit_line_only": false,
-            "space.overlay.use_gpencil_onion_skin": false,
-            "space.overlay.use_gpencil_show_directions": false,
-            "space.overlay.use_gpencil_show_material_name": false,
-            "space.overlay.use_normals_constant_screen_size": false,
-            "space.overlay.vertex_opacity": 1.0,
-            "space.overlay.vertex_paint_mode_opacity": 1.0,
-            "space.overlay.viewer_attribute_opacity": 1.0,
-            "space.overlay.weight_paint_mode_opacity": 1.0,
-            "space.overlay.wireframe_opacity": 1.0,
-            "space.overlay.wireframe_threshold": 0.0,
-            "space.overlay.xray_alpha_bone": 0.0
-        }
-    },
-    "Shaded": {
-        "render_type": "VIEWPORT",
-        "raster_style": {
-            "bpy.data.worlds[0].color": [
-                1.0,
-                1.0,
-                1.0
-            ],
-            "scene.render.bake_bias": 0.0010000000474974513,
-            "scene.render.bake_margin": 16,
-            "scene.render.bake_margin_type": "ADJACENT_FACES",
-            "scene.render.bake_samples": 256,
-            "scene.render.bake_type": "NORMALS",
-            "scene.render.bake_user_scale": 0.0,
-            "scene.render.border_max_x": 1.0,
-            "scene.render.border_max_y": 1.0,
-            "scene.render.border_min_x": 0.0,
-            "scene.render.border_min_y": 0.0,
-            "scene.render.dither_intensity": 1.0,
-            "scene.render.engine": "BLENDER_WORKBENCH",
-            "scene.render.film_transparent": false,
-            "scene.render.filter_size": 1.5,
-            "scene.render.fps": 24,
-            "scene.render.fps_base": 1.0,
-            "scene.render.frame_map_new": 100,
-            "scene.render.frame_map_old": 100,
-            "scene.render.hair_subdiv": 0,
-            "scene.render.hair_type": "STRAND",
-            "scene.render.line_thickness": 1.0,
-            "scene.render.line_thickness_mode": "ABSOLUTE",
-            "scene.render.metadata_input": "SCENE",
-            "scene.render.motion_blur_shutter": 0.5,
-            "scene.render.pixel_aspect_x": 1.0,
-            "scene.render.pixel_aspect_y": 1.0,
-            "scene.render.preview_pixel_size": "AUTO",
-            "scene.render.resolution_percentage": 100,
-            "scene.render.resolution_x": 1000,
-            "scene.render.resolution_y": 1000,
-            "scene.render.sequencer_gl_preview": "SOLID",
-            "scene.render.simplify_child_particles": 1.0,
-            "scene.render.simplify_child_particles_render": 1.0,
-            "scene.render.simplify_gpencil": false,
-            "scene.render.simplify_gpencil_antialiasing": true,
-            "scene.render.simplify_gpencil_modifier": true,
-            "scene.render.simplify_gpencil_onplay": false,
-            "scene.render.simplify_gpencil_shader_fx": true,
-            "scene.render.simplify_gpencil_tint": true,
-            "scene.render.simplify_gpencil_view_fill": true,
-            "scene.render.simplify_shadows": 1.0,
-            "scene.render.simplify_shadows_render": 1.0,
-            "scene.render.simplify_subdivision": 6,
-            "scene.render.simplify_subdivision_render": 6,
-            "scene.render.simplify_volumes": 1.0,
-            "scene.render.stamp_font_size": 12,
-            "scene.render.stamp_note_text": "",
-            "scene.render.threads": 20,
-            "scene.render.threads_mode": "AUTO",
-            "scene.render.use_bake_clear": true,
-            "scene.render.use_bake_lores_mesh": false,
-            "scene.render.use_bake_multires": false,
-            "scene.render.use_bake_selected_to_active": false,
-            "scene.render.use_bake_user_scale": false,
-            "scene.render.use_border": false,
-            "scene.render.use_compositing": true,
-            "scene.render.use_crop_to_border": false,
-            "scene.render.use_file_extension": true,
-            "scene.render.use_freestyle": false,
-            "scene.render.use_high_quality_normals": false,
-            "scene.render.use_lock_interface": false,
-            "scene.render.use_motion_blur": false,
-            "scene.render.use_multiview": false,
-            "scene.render.use_overwrite": true,
-            "scene.render.use_persistent_data": false,
-            "scene.render.use_placeholder": false,
-            "scene.render.use_render_cache": false,
-            "scene.render.use_sequencer": true,
-            "scene.render.use_sequencer_override_scene_strip": false,
-            "scene.render.use_simplify": false,
-            "scene.render.use_single_layer": false,
-            "scene.render.use_stamp": false,
-            "scene.render.use_stamp_camera": true,
-            "scene.render.use_stamp_date": true,
-            "scene.render.use_stamp_filename": true,
-            "scene.render.use_stamp_frame": true,
-            "scene.render.use_stamp_frame_range": false,
-            "scene.render.use_stamp_hostname": false,
-            "scene.render.use_stamp_labels": true,
-            "scene.render.use_stamp_lens": false,
-            "scene.render.use_stamp_marker": false,
-            "scene.render.use_stamp_memory": false,
-            "scene.render.use_stamp_note": false,
-            "scene.render.use_stamp_render_time": true,
-            "scene.render.use_stamp_scene": true,
-            "scene.render.use_stamp_sequencer_strip": false,
-            "scene.render.use_stamp_time": true,
-            "scene.render.views_format": "STEREO_3D",
-            "scene.view_settings.exposure": 0.0,
-            "scene.view_settings.gamma": 1.0,
-            "scene.view_settings.look": "None",
-            "scene.view_settings.use_curve_mapping": false,
-            "scene.view_settings.view_transform": "Standard",
-            "scene.display.shading.aov_name": "",
-            "scene.display.shading.background_color": [
-                0.0,
-                0.0,
-                0.0
-            ],
-            "scene.display.shading.background_type": "THEME",
-            "scene.display.shading.cavity_ridge_factor": 1.0,
-            "scene.display.shading.cavity_type": "BOTH",
-            "scene.display.shading.cavity_valley_factor": 1.0,
-            "scene.display.shading.color_type": "MATERIAL",
-            "scene.display.shading.curvature_ridge_factor": 1.0,
-            "scene.display.shading.curvature_valley_factor": 1.0,
-            "scene.display.shading.light": "STUDIO",
-            "scene.display.shading.object_outline_color": [
-                0.0,
-                0.0,
-                0.0
-            ],
-            "scene.display.shading.render_pass": "COMBINED",
-            "scene.display.shading.shadow_intensity": 0.5,
-            "scene.display.shading.show_backface_culling": false,
-            "scene.display.shading.show_cavity": true,
-            "scene.display.shading.show_object_outline": true,
-            "scene.display.shading.show_shadows": true,
-            "scene.display.shading.show_specular_highlight": true,
-            "scene.display.shading.show_xray": false,
-            "scene.display.shading.show_xray_wireframe": false,
-            "scene.display.shading.single_color": [
-                1.0,
-                1.0,
-                1.0
-            ],
-            "scene.display.shading.studio_light": "Default",
-            "scene.display.shading.studiolight_background_alpha": 0.0,
-            "scene.display.shading.studiolight_background_blur": 0.0,
-            "scene.display.shading.studiolight_intensity": 0.0,
-            "scene.display.shading.studiolight_rotate_z": 0.0,
-            "scene.display.shading.type": "RENDERED",
-            "scene.display.shading.use_compositor": "DISABLED",
-            "scene.display.shading.use_dof": false,
-            "scene.display.shading.use_scene_lights": false,
-            "scene.display.shading.use_scene_lights_render": false,
-            "scene.display.shading.use_scene_world": false,
-            "scene.display.shading.use_scene_world_render": false,
-            "scene.display.shading.use_studiolight_view_rotation": true,
-            "scene.display.shading.use_world_space_lighting": false,
-            "scene.display.shading.wireframe_color_type": "MATERIAL",
-            "scene.display.shading.xray_alpha": 0.5,
-            "scene.display.shading.xray_alpha_wireframe": 0.0,
-            "scene.display.light_direction": [
-                0.5,
-                0.5,
-                0.5
-            ],
-            "scene.display.matcap_ssao_attenuation": 1.0,
-            "scene.display.matcap_ssao_distance": 0.20000000298023224,
-            "scene.display.matcap_ssao_samples": 16,
-            "scene.display.render_aa": "8",
-            "scene.display.shadow_focus": 0.0,
-            "scene.display.shadow_shift": 0.10000000149011612,
-            "scene.display.viewport_aa": "FXAA",
-            "space.overlay.backwire_opacity": 0.5,
-            "space.overlay.bone_wire_alpha": 1.0,
-            "space.overlay.display_handle": "SELECTED",
-            "space.overlay.fade_inactive_alpha": 0.4000000059604645,
-            "space.overlay.gpencil_fade_layer": 0.5,
-            "space.overlay.gpencil_fade_objects": 0.5,
-            "space.overlay.gpencil_grid_opacity": 0.5,
-            "space.overlay.gpencil_vertex_paint_opacity": 1.0,
-            "space.overlay.grid_lines": 16,
-            "space.overlay.grid_scale": 1.0,
-            "space.overlay.grid_subdivisions": 10,
-            "space.overlay.normals_constant_screen_size": 7.0,
-            "space.overlay.normals_length": 0.10000000149011612,
-            "space.overlay.sculpt_curves_cage_opacity": 0.5,
-            "space.overlay.sculpt_mode_face_sets_opacity": 1.0,
-            "space.overlay.sculpt_mode_mask_opacity": 0.75,
-            "space.overlay.show_annotation": true,
-            "space.overlay.show_axis_x": false,
-            "space.overlay.show_axis_y": false,
-            "space.overlay.show_axis_z": false,
-            "space.overlay.show_bones": true,
-            "space.overlay.show_cursor": true,
-            "space.overlay.show_curve_normals": false,
-            "space.overlay.show_edge_bevel_weight": true,
-            "space.overlay.show_edge_crease": true,
-            "space.overlay.show_edge_seams": true,
-            "space.overlay.show_edge_sharp": true,
-            "space.overlay.show_edges": false,
-            "space.overlay.show_extra_edge_angle": false,
-            "space.overlay.show_extra_edge_length": false,
-            "space.overlay.show_extra_face_angle": false,
-            "space.overlay.show_extra_face_area": false,
-            "space.overlay.show_extra_indices": false,
-            "space.overlay.show_extras": true,
-            "space.overlay.show_face_center": false,
-            "space.overlay.show_face_normals": false,
-            "space.overlay.show_face_orientation": false,
-            "space.overlay.show_faces": true,
-            "space.overlay.show_fade_inactive": false,
-            "space.overlay.show_floor": false,
-            "space.overlay.show_freestyle_edge_marks": true,
-            "space.overlay.show_freestyle_face_marks": true,
-            "space.overlay.show_look_dev": false,
-            "space.overlay.show_motion_paths": true,
-            "space.overlay.show_object_origins": false,
-            "space.overlay.show_object_origins_all": false,
-            "space.overlay.show_occlude_wire": false,
-            "space.overlay.show_onion_skins": false,
-            "space.overlay.show_ortho_grid": true,
-            "space.overlay.show_outline_selected": true,
-            "space.overlay.show_overlays": true,
-            "space.overlay.show_paint_wire": false,
-            "space.overlay.show_relationship_lines": false,
-            "space.overlay.show_sculpt_curves_cage": true,
-            "space.overlay.show_sculpt_face_sets": true,
-            "space.overlay.show_sculpt_mask": true,
-            "space.overlay.show_split_normals": false,
-            "space.overlay.show_stats": false,
-            "space.overlay.show_statvis": false,
-            "space.overlay.show_text": true,
-            "space.overlay.show_vertex_normals": false,
-            "space.overlay.show_viewer_attribute": true,
-            "space.overlay.show_weight": false,
-            "space.overlay.show_wireframes": false,
-            "space.overlay.show_wpaint_contours": false,
-            "space.overlay.show_xray_bone": false,
-            "space.overlay.texture_paint_mode_opacity": 1.0,
-            "space.overlay.use_debug_freeze_view_culling": false,
-            "space.overlay.use_gpencil_canvas_xray": false,
-            "space.overlay.use_gpencil_edit_lines": true,
-            "space.overlay.use_gpencil_fade_gp_objects": false,
-            "space.overlay.use_gpencil_fade_layers": false,
-            "space.overlay.use_gpencil_fade_objects": false,
-            "space.overlay.use_gpencil_grid": false,
-            "space.overlay.use_gpencil_multiedit_line_only": false,
-            "space.overlay.use_gpencil_onion_skin": false,
-            "space.overlay.use_gpencil_show_directions": false,
-            "space.overlay.use_gpencil_show_material_name": false,
-            "space.overlay.use_normals_constant_screen_size": false,
-            "space.overlay.vertex_opacity": 1.0,
-            "space.overlay.vertex_paint_mode_opacity": 1.0,
-            "space.overlay.viewer_attribute_opacity": 1.0,
-            "space.overlay.weight_paint_mode_opacity": 1.0,
-            "space.overlay.wireframe_opacity": 1.0,
-            "space.overlay.wireframe_threshold": 0.0,
-            "space.overlay.xray_alpha_bone": 0.0
-        }
-    },
-    "Blender Default": {
-        "render_type": "VIEWPORT",
-        "raster_style": {
-            "bpy.data.worlds[0].color": [
-                0.05087608844041824,
-                0.05087608844041824,
-                0.05087608844041824
-            ],
-            "scene.render.bake_bias": 0.0010000000474974513,
-            "scene.render.bake_margin": 16,
-            "scene.render.bake_margin_type": "ADJACENT_FACES",
-            "scene.render.bake_samples": 256,
-            "scene.render.bake_type": "NORMALS",
-            "scene.render.bake_user_scale": 0.0,
-            "scene.render.border_max_x": 1.0,
-            "scene.render.border_max_y": 1.0,
-            "scene.render.border_min_x": 0.0,
-            "scene.render.border_min_y": 0.0,
-            "scene.render.dither_intensity": 1.0,
-            "scene.render.engine": "BLENDER_EEVEE",
-            "scene.render.film_transparent": false,
-            "scene.render.filter_size": 1.5,
-            "scene.render.fps": 24,
-            "scene.render.fps_base": 1.0,
-            "scene.render.frame_map_new": 100,
-            "scene.render.frame_map_old": 100,
-            "scene.render.hair_subdiv": 0,
-            "scene.render.hair_type": "STRAND",
-            "scene.render.line_thickness": 1.0,
-            "scene.render.line_thickness_mode": "ABSOLUTE",
-            "scene.render.metadata_input": "SCENE",
-            "scene.render.motion_blur_shutter": 0.5,
-            "scene.render.pixel_aspect_x": 1.0,
-            "scene.render.pixel_aspect_y": 1.0,
-            "scene.render.preview_pixel_size": "AUTO",
-            "scene.render.resolution_percentage": 100,
-            "scene.render.resolution_x": 1000,
-            "scene.render.resolution_y": 1000,
-            "scene.render.sequencer_gl_preview": "SOLID",
-            "scene.render.simplify_child_particles": 1.0,
-            "scene.render.simplify_child_particles_render": 1.0,
-            "scene.render.simplify_gpencil": false,
-            "scene.render.simplify_gpencil_antialiasing": true,
-            "scene.render.simplify_gpencil_modifier": true,
-            "scene.render.simplify_gpencil_onplay": false,
-            "scene.render.simplify_gpencil_shader_fx": true,
-            "scene.render.simplify_gpencil_tint": true,
-            "scene.render.simplify_gpencil_view_fill": true,
-            "scene.render.simplify_shadows": 1.0,
-            "scene.render.simplify_shadows_render": 1.0,
-            "scene.render.simplify_subdivision": 6,
-            "scene.render.simplify_subdivision_render": 6,
-            "scene.render.simplify_volumes": 1.0,
-            "scene.render.stamp_font_size": 12,
-            "scene.render.stamp_note_text": "",
-            "scene.render.threads": 20,
-            "scene.render.threads_mode": "AUTO",
-            "scene.render.use_bake_clear": true,
-            "scene.render.use_bake_lores_mesh": false,
-            "scene.render.use_bake_multires": false,
-            "scene.render.use_bake_selected_to_active": false,
-            "scene.render.use_bake_user_scale": false,
-            "scene.render.use_border": false,
-            "scene.render.use_compositing": true,
-            "scene.render.use_crop_to_border": false,
-            "scene.render.use_file_extension": true,
-            "scene.render.use_freestyle": false,
-            "scene.render.use_high_quality_normals": false,
-            "scene.render.use_lock_interface": false,
-            "scene.render.use_motion_blur": false,
-            "scene.render.use_multiview": false,
-            "scene.render.use_overwrite": true,
-            "scene.render.use_persistent_data": false,
-            "scene.render.use_placeholder": false,
-            "scene.render.use_render_cache": false,
-            "scene.render.use_sequencer": true,
-            "scene.render.use_sequencer_override_scene_strip": false,
-            "scene.render.use_simplify": false,
-            "scene.render.use_single_layer": false,
-            "scene.render.use_stamp": false,
-            "scene.render.use_stamp_camera": true,
-            "scene.render.use_stamp_date": true,
-            "scene.render.use_stamp_filename": true,
-            "scene.render.use_stamp_frame": true,
-            "scene.render.use_stamp_frame_range": false,
-            "scene.render.use_stamp_hostname": false,
-            "scene.render.use_stamp_labels": true,
-            "scene.render.use_stamp_lens": false,
-            "scene.render.use_stamp_marker": false,
-            "scene.render.use_stamp_memory": false,
-            "scene.render.use_stamp_note": false,
-            "scene.render.use_stamp_render_time": true,
-            "scene.render.use_stamp_scene": true,
-            "scene.render.use_stamp_sequencer_strip": false,
-            "scene.render.use_stamp_time": true,
-            "scene.render.views_format": "STEREO_3D",
-            "scene.view_settings.exposure": 0.0,
-            "scene.view_settings.gamma": 1.0,
-            "scene.view_settings.look": "None",
-            "scene.view_settings.use_curve_mapping": false,
-            "scene.view_settings.view_transform": "Filmic",
-            "scene.display.shading.aov_name": "",
-            "scene.display.shading.background_color": [
-                0.0,
-                0.0,
-                0.0
-            ],
-            "scene.display.shading.background_type": "THEME",
-            "scene.display.shading.cavity_ridge_factor": 1.0,
-            "scene.display.shading.cavity_type": "WORLD",
-            "scene.display.shading.cavity_valley_factor": 1.0,
-            "scene.display.shading.color_type": "MATERIAL",
-            "scene.display.shading.curvature_ridge_factor": 0.0,
-            "scene.display.shading.curvature_valley_factor": 0.0,
-            "scene.display.shading.light": "STUDIO",
-            "scene.display.shading.object_outline_color": [
-                0.0,
-                0.0,
-                0.0
-            ],
-            "scene.display.shading.render_pass": "COMBINED",
-            "scene.display.shading.shadow_intensity": 0.5,
-            "scene.display.shading.show_backface_culling": false,
-            "scene.display.shading.show_cavity": false,
-            "scene.display.shading.show_object_outline": false,
-            "scene.display.shading.show_shadows": false,
-            "scene.display.shading.show_specular_highlight": true,
-            "scene.display.shading.show_xray": false,
-            "scene.display.shading.show_xray_wireframe": false,
-            "scene.display.shading.single_color": [
-                0.800000011920929,
-                0.800000011920929,
-                0.800000011920929
-            ],
-            "scene.display.shading.studio_light": "Default",
-            "scene.display.shading.studiolight_background_alpha": 0.0,
-            "scene.display.shading.studiolight_background_blur": 0.0,
-            "scene.display.shading.studiolight_intensity": 0.0,
-            "scene.display.shading.studiolight_rotate_z": 0.0,
-            "scene.display.shading.type": "RENDERED",
-            "scene.display.shading.use_compositor": "DISABLED",
-            "scene.display.shading.use_dof": false,
-            "scene.display.shading.use_scene_lights": false,
-            "scene.display.shading.use_scene_lights_render": false,
-            "scene.display.shading.use_scene_world": false,
-            "scene.display.shading.use_scene_world_render": false,
-            "scene.display.shading.use_studiolight_view_rotation": true,
-            "scene.display.shading.use_world_space_lighting": false,
-            "scene.display.shading.wireframe_color_type": "MATERIAL",
-            "scene.display.shading.xray_alpha": 0.5,
-            "scene.display.shading.xray_alpha_wireframe": 0.0,
-            "scene.display.light_direction": [
-                0.5773502588272095,
-                0.5773502588272095,
-                0.5773502588272095
-            ],
-            "scene.display.matcap_ssao_attenuation": 1.0,
-            "scene.display.matcap_ssao_distance": 0.20000000298023224,
-            "scene.display.matcap_ssao_samples": 16,
-            "scene.display.render_aa": "8",
-            "scene.display.shadow_focus": 0.0,
-            "scene.display.shadow_shift": 0.10000000149011612,
-            "scene.display.viewport_aa": "FXAA",
-            "space.overlay.backwire_opacity": 0.5,
-            "space.overlay.bone_wire_alpha": 1.0,
-            "space.overlay.display_handle": "SELECTED",
-            "space.overlay.fade_inactive_alpha": 0.4000000059604645,
-            "space.overlay.gpencil_fade_layer": 0.5,
-            "space.overlay.gpencil_fade_objects": 0.5,
-            "space.overlay.gpencil_grid_opacity": 0.5,
-            "space.overlay.gpencil_vertex_paint_opacity": 1.0,
-            "space.overlay.grid_lines": 16,
-            "space.overlay.grid_scale": 1.0,
-            "space.overlay.grid_subdivisions": 10,
-            "space.overlay.normals_constant_screen_size": 7.0,
-            "space.overlay.normals_length": 0.10000000149011612,
-            "space.overlay.sculpt_curves_cage_opacity": 0.5,
-            "space.overlay.sculpt_mode_face_sets_opacity": 1.0,
-            "space.overlay.sculpt_mode_mask_opacity": 0.75,
-            "space.overlay.show_annotation": true,
-            "space.overlay.show_axis_x": true,
-            "space.overlay.show_axis_y": true,
-            "space.overlay.show_axis_z": false,
-            "space.overlay.show_bones": true,
-            "space.overlay.show_cursor": true,
-            "space.overlay.show_curve_normals": false,
-            "space.overlay.show_edge_bevel_weight": true,
-            "space.overlay.show_edge_crease": true,
-            "space.overlay.show_edge_seams": true,
-            "space.overlay.show_edge_sharp": true,
-            "space.overlay.show_edges": false,
-            "space.overlay.show_extra_edge_angle": false,
-            "space.overlay.show_extra_edge_length": false,
-            "space.overlay.show_extra_face_angle": false,
-            "space.overlay.show_extra_face_area": false,
-            "space.overlay.show_extra_indices": false,
-            "space.overlay.show_extras": true,
-            "space.overlay.show_face_center": false,
-            "space.overlay.show_face_normals": false,
-            "space.overlay.show_face_orientation": false,
-            "space.overlay.show_faces": true,
-            "space.overlay.show_fade_inactive": false,
-            "space.overlay.show_floor": true,
-            "space.overlay.show_freestyle_edge_marks": true,
-            "space.overlay.show_freestyle_face_marks": true,
-            "space.overlay.show_look_dev": false,
-            "space.overlay.show_motion_paths": true,
-            "space.overlay.show_object_origins": true,
-            "space.overlay.show_object_origins_all": false,
-            "space.overlay.show_occlude_wire": false,
-            "space.overlay.show_onion_skins": false,
-            "space.overlay.show_ortho_grid": true,
-            "space.overlay.show_outline_selected": true,
-            "space.overlay.show_overlays": true,
-            "space.overlay.show_paint_wire": false,
-            "space.overlay.show_relationship_lines": true,
-            "space.overlay.show_sculpt_curves_cage": true,
-            "space.overlay.show_sculpt_face_sets": true,
-            "space.overlay.show_sculpt_mask": true,
-            "space.overlay.show_split_normals": false,
-            "space.overlay.show_stats": false,
-            "space.overlay.show_statvis": false,
-            "space.overlay.show_text": true,
-            "space.overlay.show_vertex_normals": false,
-            "space.overlay.show_viewer_attribute": true,
-            "space.overlay.show_weight": false,
-            "space.overlay.show_wireframes": false,
-            "space.overlay.show_wpaint_contours": false,
-            "space.overlay.show_xray_bone": false,
-            "space.overlay.texture_paint_mode_opacity": 1.0,
-            "space.overlay.use_debug_freeze_view_culling": false,
-            "space.overlay.use_gpencil_canvas_xray": false,
-            "space.overlay.use_gpencil_edit_lines": true,
-            "space.overlay.use_gpencil_fade_gp_objects": false,
-            "space.overlay.use_gpencil_fade_layers": false,
-            "space.overlay.use_gpencil_fade_objects": false,
-            "space.overlay.use_gpencil_grid": false,
-            "space.overlay.use_gpencil_multiedit_line_only": false,
-            "space.overlay.use_gpencil_onion_skin": false,
-            "space.overlay.use_gpencil_show_directions": false,
-            "space.overlay.use_gpencil_show_material_name": false,
-            "space.overlay.use_normals_constant_screen_size": false,
-            "space.overlay.vertex_opacity": 1.0,
-            "space.overlay.vertex_paint_mode_opacity": 1.0,
-            "space.overlay.viewer_attribute_opacity": 1.0,
-            "space.overlay.weight_paint_mode_opacity": 1.0,
-            "space.overlay.wireframe_opacity": 1.0,
-            "space.overlay.wireframe_threshold": 1.0,
-            "space.overlay.xray_alpha_bone": 0.0
-        }
-    }
-}
@@ -21,9 +21,6 @@
        <line x1="-5" x2="5" style="stroke: black; stroke-width: 0.25;" />
        <text y="2.5" class="regular" text-anchor="middle" dominant-baseline="middle" data-type="text-template"></text>
    </g>
-    <g id="window-tag">
-        <path style="fill: white; stroke: black; stroke-width: 0.25;" d="m 0.0161133,-6.0583333 5.2339915,3.8366023 -2.031433,6.1633977 c 0,0 -6.4894866,-0.027414 -6.4894866,-0.027414 l -1.97929,-6.1803395 5.2662181,-3.7922467" />
-    </g>
    <g id="space-tag">
        <text y="-5" class="large" text-anchor="middle" dominant-baseline="middle" data-type="text-template"></text>
        <rect x="-6" y="-2.5" width="12" height="5" fill="white" stroke="black" style="stroke-width: 0.25;" />
@@ -44,29 +41,4 @@
        <circle r="5" fill="white" stroke="black" style="stroke-width: 0.25;" />
        <line x1="-5" y1="0" x2="5" y2="0" style="stroke: black; stroke-width: 0.25;" />
    </g>
-    <g id="dot">
-        <circle r="1" fill="black" stroke="black" style="stroke-width: 0.25;" />
-    </g>
-    <g id="setout-tag">
-        <circle fill="white" stroke="black" r="2.5" style="stroke-width: 0.5"/>
-        <path d="M 0 0 L -2.5 0 A 2.5 2.5 0 0 1 0 -2.5 Z" fill="black"/>
-        <path d="M 0 0 L 2.5 0 A 2.5 2.5 0 0 1 0 2.5 Z" fill="black"/>
-        <text x="3" y="-8" class="regular" text-anchor="start" dominant-baseline="auto" data-type="text-template"></text>
-        <text x="3" y="-4" class="regular" text-anchor="start" dominant-baseline="auto" data-type="text-template"></text>
-    </g>
-    <g id="setout-point">
-        <circle fill="white" stroke="black" r="2.5" style="stroke-width: 0.5"/>
-        <path d="M 0 0 L -2.5 0 A 2.5 2.5 0 0 1 0 -2.5 Z" fill="black"/>
-        <path d="M 0 0 L 2.5 0 A 2.5 2.5 0 0 1 0 2.5 Z" fill="black"/>
-    </g>
-    <g id="control-point">
-        <path style="fill: white; stroke: black; stroke-width: 0.5;" d="M 2.286165,1.4798666 H -1.0000316e-7 -2.2861651 L -1.1430826,-0.5000101 -1.0000316e-7,-2.479888 1.1430827,-0.5000101 Z" />
-        <circle r="0.5" fill="black" stroke="black" style="stroke-width: 0.25;" />
-    </g>
-    <g id="traverse-point">
-        <path style="fill: white; stroke: black; stroke-width: 0.5;" d="M -2,-2 2,2 M -2,2 2,-2" />
-    </g>
-    <g id="spot-elevation">
-        <path style="fill: white; stroke: black; stroke-width: 0.5;" d="M 0,-2 0,2 M -2,0 2,0" />
-    </g>
 </svg>
@@ -1,55 +1,67 @@
 <link href="jsgantt.css" rel="stylesheet" type="text/css"/>
-<link href="../../module/sequence/gantt/main.css" rel="stylesheet" type="text/css"/>
 <script src="jsgantt.js" type="text/javascript"></script>
-<script type="text/javascript" src="../../module/sequence/gantt/index.js"></script>
-<script>
-var json_data = `{{{json_data}}}`;
-</script>
+<style>
+.gtaskcellwkend,
+.gtaskcellcurrent,
+.gminorheadingwkend {
+  background-color: #e1e1e1;
+}

-<div id="options" class="no-print">
-  <h4>Choose a language:
-  <select id="lang" class="sweet_button" onchange="set_language(event)">
-    <option value='cn'>Chinese (cn)</option>
-    <option value='cs'>Czech (cs)</option>
-    <option value='nl'>Dutch (Standard)</option>
-    <option value='en' selected>English (en)</option>
-    <option value='fr'>French (fr)</option>
-    <option value='de'>German (de)</option>
-    <option value='hu'>Hungarian (hu)</option>
-    <option value='id'>Indonesian (id)</option>
-    <option value='it'>Italian (it)</option>
-    <option value='ja'>Japanese (ja)</option>
-    <option value='pt'>Portuguese (pt)</option>
-    <option value='ru'>Russian (ru)</option>
-    <option value='es'>Spanish (es)</option>
-    <option value='sv'>Swedish (sv)</option>
-    <option value='tr'>Turkish (tr)</option>
-  </select>
-  </h4>
+.gitemhighlight td {
+  background-color: #ffdaaa;
+}

-  <br>
-</div>
-<div class="top-right no-print" id="print_options">
-  <select class="sweet_button" id="print_page_size">
-    <option value="210,297">A4 Portrait</option>
-    <option value="297,210">A4 Landscape</option>
-    <option value="297,420">A3 Portrait</option>
-    <option value="420,297">A3 Landscape</option>
-    <option value="420,594">A2 Portrait</option>
-    <option value="594,420">A2 Landscape</option>
-    <option value="594,841">A1 Portrait</option>
-    <option value="841,594">A1 Landscape</option>
-    <option value="841,1189">A0 Portrait</option>
-    <option value="1189,841">A0 Landscape</option>
-  </select>
-</div>
+.gtaskblue {
+  background: #4281A4;
+}

-<div id="schedule-data" class="no-print"></div>
-<div id="schedule-header" style=""></div>
+.gtaskred {
+  background: #C1666B;
+}
+
+.gtaskgreen {
+  background: #48A9A6;
+}
+
+.gtaskyellow {
+  background: #D4B483;
+}
+
+.gmainleft {
+  overflow: visible;
+  flex: 0 1 auto;
+}
+
+</style>
+<a href="#print" id="print">Print Mode</a>
 <div style="position:relative" class="gantt" id="GanttChartDIV"></div>
-
-<script>
-var data = `{{{data}}}`;
-setupPage(data);
-create_gantt_chart(atob(json_data))
+<script type="text/javascript">
+var g = new JSGantt.GanttChart(document.getElementById('GanttChartDIV'), 'day');
+g.setOptions({
+    vCaptionType: 'Caption',  // Set to Show Caption : None,Caption,Resource,Duration,Complete,
+    vQuarterColWidth: 36,
+    vDateTaskDisplayFormat: 'day dd month yyyy', // Shown in tool tip box
+    vDayMajorDateDisplayFormat: 'mon yyyy - Week ww',// Set format to dates in the "Major" header of the "Day" view
+    vWeekMinorDateDisplayFormat: 'dd mon', // Set format to display dates in the "Minor" header of the "Week" view
+    vLang: 'en',
+    vShowTaskInfoLink: 1, // Show link in tool tip (0/1)
+    vShowEndWeekDate: 0,  // Show/Hide the date for the last day of the week in header for daily
+    vUseSingleCell: 10000, // Set the threshold cell per table row (Helps performance for large data.
+    vFormatArr: ['Day', 'Week', 'Month', 'Quarter'], // Even with setUseSingleCell using Hour format on such a large chart can cause issues in some browsers,
+    vShowRes: false, // Disable the resource column.
+    vShowComp: false, // Disable the completion column.
+    vShowDur: false, // Disable the duration column, because jsgantt doesn't calculate durations the way we want.
+    vAdditionalHeaders: {ifcduration: {title: 'Duration'}},
+    vUseToolTip: false, // Disable tooltips.
+    vTotalHeight: 900,
+});
+document.getElementById('print').addEventListener('click', function() {
+    g.setTotalHeight("");
+    g.Draw();
+});
+var json_data = `
+{{{json_data}}}
+`;
+JSGantt.parseJSONString(json_data, g);
+g.Draw();
 </script>
@@ -5,27 +5,24 @@ FILE_NAME('EPset_Drawing.ifc','2020-01-01T00:00:00',(),(),'EPset_Drawing','EPset
 FILE_SCHEMA(('IFC4'));
 ENDSEC;
 DATA;
-#1=IFCPROPERTYSETTEMPLATE('2JhNIvqZrFnAgxfhK0XVQX',$,'EPset_Drawing','',.PSET_OCCURRENCEDRIVEN.,'IfcAnnotation',(#2,#3,#4,#5,#6,#7,#8,#9,#10,#11,#12,#13,#14,#15,#16,#17,#18,#19,#20,#21,#22));
+#1=IFCPROPERTYSETTEMPLATE('2JhNIvqZrFnAgxfhK0XVQX',$,'EPset_Drawing','',.PSET_OCCURRENCEDRIVEN.,'IfcAnnotation',(#2,#3,#4,#5,#6,#7,#8,#9,#10,#11,#12,#13,#14,#15,#16,#17,#18,#19));
 #2=IFCSIMPLEPROPERTYTEMPLATE('23JavTMk98ZxXhrUEnjAcf',$,'TargetView','',.P_SINGLEVALUE.,'IfcLabel',$,$,$,$,$,.READWRITE.);
 #3=IFCSIMPLEPROPERTYTEMPLATE('1yVWUt5H9DAOuu0OaMMLpe',$,'Scale','The scale of this drawing represented as a numerator and denominator, such as 1/100',.P_SINGLEVALUE.,'IfcLabel',$,$,$,$,$,.READWRITE.);
 #4=IFCSIMPLEPROPERTYTEMPLATE('3gsuPBtU93b8f0gg1pjkq6',$,'HumanScale','The scale of this drawing in human readable format, such as 1:100',.P_SINGLEVALUE.,'IfcLabel',$,$,$,$,$,.READWRITE.);
-#5=IFCSIMPLEPROPERTYTEMPLATE('2T$a4OFsv2LeD5JeBKEV4f',$,'IsNTS','Whether or not the scale is intended to be significant',.P_SINGLEVALUE.,'IfcBoolean',$,$,$,$,$,.READWRITE.);
-#6=IFCSIMPLEPROPERTYTEMPLATE('0AK5C2UpL4$eaac2LszAx$',$,'HasUnderlay','',.P_SINGLEVALUE.,'IfcBoolean',$,$,$,$,$,.READWRITE.);
-#7=IFCSIMPLEPROPERTYTEMPLATE('2j2ZEZR8X5tONm7kli5hM6',$,'HasLinework','',.P_SINGLEVALUE.,'IfcBoolean',$,$,$,$,$,.READWRITE.);
-#8=IFCSIMPLEPROPERTYTEMPLATE('1ttChRysH9UuEX2FeMj5Hu',$,'HasAnnotation','',.P_SINGLEVALUE.,'IfcBoolean',$,$,$,$,$,.READWRITE.);
-#9=IFCSIMPLEPROPERTYTEMPLATE('2NPPxuABv1huDTVh32TFgw',$,'GlobalReferencing','',.P_SINGLEVALUE.,'IfcBoolean',$,$,$,$,$,.READWRITE.);
-#10=IFCSIMPLEPROPERTYTEMPLATE('10hT_1zrzEbRRKMXYAWvtD',$,'Metadata','',.P_SINGLEVALUE.,'IfcText',$,$,$,$,$,.READWRITE.);
-#11=IFCSIMPLEPROPERTYTEMPLATE('3Z0BXPSG5CWgtI33ioV7aj',$,'Include','Selector expression to include ifc elements in the drawing',.P_SINGLEVALUE.,'IfcText',$,$,$,$,$,.READWRITE.);
-#12=IFCSIMPLEPROPERTYTEMPLATE('1RVts_g3PAw98PJA2yL3bO',$,'Exclude','Selector expression to exclude ifc elements in the drawing',.P_SINGLEVALUE.,'IfcText',$,$,$,$,$,.READWRITE.);
-#13=IFCSIMPLEPROPERTYTEMPLATE('0c1$8NpYDEaBiJrj16jHIo',$,'Stylesheet','',.P_SINGLEVALUE.,'IfcText',$,$,$,$,$,.READWRITE.);
-#14=IFCSIMPLEPROPERTYTEMPLATE('3mRF52q81FQB$h4oTh7M45',$,'Markers','',.P_SINGLEVALUE.,'IfcText',$,$,$,$,$,.READWRITE.);
-#15=IFCSIMPLEPROPERTYTEMPLATE('1rhr_0N3LDtuORcEJP0KXM',$,'Symbols','',.P_SINGLEVALUE.,'IfcText',$,$,$,$,$,.READWRITE.);
-#16=IFCSIMPLEPROPERTYTEMPLATE('2sHDBuW7P4TROy$hL2w7ct',$,'Patterns','',.P_SINGLEVALUE.,'IfcText',$,$,$,$,$,.READWRITE.);
-#17=IFCSIMPLEPROPERTYTEMPLATE('1$xfo9EVb26QLqmPll2_RK',$,'MetricPrecision','',.P_SINGLEVALUE.,'IfcReal',$,$,$,$,$,.READWRITE.);
-#18=IFCSIMPLEPROPERTYTEMPLATE('38uAtrp9nD_901NO42zd$7',$,'ImperialPrecision','',.P_SINGLEVALUE.,'IfcLabel',$,$,$,$,$,.READWRITE.);
-#19=IFCSIMPLEPROPERTYTEMPLATE('1MX0uffTL6TOvtvEJpxFmk',$,'DecimalPlaces','',.P_SINGLEVALUE.,'IfcInteger',$,$,$,$,$,.READWRITE.);
-#20=IFCSIMPLEPROPERTYTEMPLATE('0joEq0Rd10cxweEh0NeHT6',$,'JoinCriteria','Comma separated selection keys which determine what cut objects are to be joined.',.P_SINGLEVALUE.,'IfcText',$,$,$,$,$,.READWRITE.);
-#21=IFCSIMPLEPROPERTYTEMPLATE('0nYMT3OSj5gArVniCWZRtv',$,'ShadingStyles','',.P_SINGLEVALUE.,'IfcText',$,$,$,$,$,.READWRITE.);
-#22=IFCSIMPLEPROPERTYTEMPLATE('3VWG22eZXBdQwdKlzMeVQH',$,'CurrentShadingStyle','',.P_SINGLEVALUE.,'IfcLabel',$,$,$,$,$,.READWRITE.);
+#5=IFCSIMPLEPROPERTYTEMPLATE('0AK5C2UpL4$eaac2LszAx$',$,'HasUnderlay','',.P_SINGLEVALUE.,'IfcBoolean',$,$,$,$,$,.READWRITE.);
+#6=IFCSIMPLEPROPERTYTEMPLATE('2j2ZEZR8X5tONm7kli5hM6',$,'HasLinework','',.P_SINGLEVALUE.,'IfcBoolean',$,$,$,$,$,.READWRITE.);
+#7=IFCSIMPLEPROPERTYTEMPLATE('1ttChRysH9UuEX2FeMj5Hu',$,'HasAnnotation','',.P_SINGLEVALUE.,'IfcBoolean',$,$,$,$,$,.READWRITE.);
+#8=IFCSIMPLEPROPERTYTEMPLATE('2NPPxuABv1huDTVh32TFgw',$,'GlobalReferencing','',.P_SINGLEVALUE.,'IfcBoolean',$,$,$,$,$,.READWRITE.);
+#9=IFCSIMPLEPROPERTYTEMPLATE('10hT_1zrzEbRRKMXYAWvtD',$,'Metadata','',.P_SINGLEVALUE.,'IfcText',$,$,$,$,$,.READWRITE.);
+#10=IFCSIMPLEPROPERTYTEMPLATE('3Z0BXPSG5CWgtI33ioV7aj',$,'Include','Selector expression to include ifc elements in the drawing',.P_SINGLEVALUE.,'IfcText',$,$,$,$,$,.READWRITE.);
+#11=IFCSIMPLEPROPERTYTEMPLATE('1RVts_g3PAw98PJA2yL3bO',$,'Exclude','Selector expression to exclude ifc elements in the drawing',.P_SINGLEVALUE.,'IfcText',$,$,$,$,$,.READWRITE.);
+#12=IFCSIMPLEPROPERTYTEMPLATE('0c1$8NpYDEaBiJrj16jHIo',$,'Stylesheet','',.P_SINGLEVALUE.,'IfcURIReference',$,$,$,$,$,.READWRITE.);
+#13=IFCSIMPLEPROPERTYTEMPLATE('3mRF52q81FQB$h4oTh7M45',$,'Markers','',.P_SINGLEVALUE.,'IfcURIReference',$,$,$,$,$,.READWRITE.);
+#14=IFCSIMPLEPROPERTYTEMPLATE('1rhr_0N3LDtuORcEJP0KXM',$,'Symbols','',.P_SINGLEVALUE.,'IfcURIReference',$,$,$,$,$,.READWRITE.);
+#15=IFCSIMPLEPROPERTYTEMPLATE('2sHDBuW7P4TROy$hL2w7ct',$,'Patterns','',.P_SINGLEVALUE.,'IfcURIReference',$,$,$,$,$,.READWRITE.);
+#16=IFCSIMPLEPROPERTYTEMPLATE('1$xfo9EVb26QLqmPll2_RK',$,'MetricPrecision','',.P_SINGLEVALUE.,'IfcReal',$,$,$,$,$,.READWRITE.);
+#17=IFCSIMPLEPROPERTYTEMPLATE('38uAtrp9nD_901NO42zd$7',$,'ImperialPrecision','',.P_SINGLEVALUE.,'IfcLabel',$,$,$,$,$,.READWRITE.);
+#18=IFCSIMPLEPROPERTYTEMPLATE('1MX0uffTL6TOvtvEJpxFmk',$,'DecimalPlaces','',.P_SINGLEVALUE.,'IfcInteger',$,$,$,$,$,.READWRITE.);
+#19=IFCSIMPLEPROPERTYTEMPLATE('0joEq0Rd10cxweEh0NeHT6',$,'JoinCriteria','Comma separated selection keys which determine what cut objects are to be joined.',.P_SINGLEVALUE.,'IfcText',$,$,$,$,$,.READWRITE.);
 ENDSEC;
 END-ISO-10303-21;
@@ -1,13 +0,0 @@
-ISO-10303-21;
-HEADER;
-FILE_DESCRIPTION((),'2;1');
-FILE_NAME('EPset_Status.ifc','2020-01-01T00:00:00',(),(),'EPset_Status','EPset_Status',$);
-FILE_SCHEMA(('IFC4'));
-ENDSEC;
-DATA;
-#1=IFCPROPERTYSETTEMPLATE('3JoyTt$cz4fhYuQvJeTMhs',$,'EPset_Status','',.PSET_TYPEDRIVENOVERRIDE.,'IfcProduct',(#2,#4));
-#2= IFCSIMPLEPROPERTYTEMPLATE('2HBOdOfz5E3hZ7IBLCq$$D',$,'Status','Status of the element, predominately used in renovation or retrofitting projects. The status can be assigned to as "New" - element designed as new addition, "Existing" - element exists and remains, "Demolish" - element existed but is to be demolished,  "Temporary" - element will exists only temporary (like a temporary support structure).',.P_ENUMERATEDVALUE.,'IfcLabel',$,#3,$,$,$,.READWRITE.);
-#3= IFCPROPERTYENUMERATION('EPEnum_ElementStatus',(IFCLABEL('NEW'),IFCLABEL('EXISTING'),IFCLABEL('DEMOLISH'),IFCLABEL('TEMPORARY'),IFCLABEL('OTHER'),IFCLABEL('NOTKNOWN'),IFCLABEL('UNSET')),$);
-#4=IFCSIMPLEPROPERTYTEMPLATE('3ttXxqmlz62BlxjzEPpqvH',$,'UserDefinedStatus','',.P_SINGLEVALUE.,'IfcLabel',$,$,$,$,$,.READWRITE.);
-ENDSEC;
-END-ISO-10303-21;
@@ -1,16 +0,0 @@
-ISO-10303-21;
-HEADER;
-FILE_DESCRIPTION((),'2;1');
-FILE_NAME('EQto_BodyGeometryValidation.ifc','2020-01-01T00:00:00',(),(),'EQto_BodyGeometryValidation','EQto_BodyGeometryValidation',$);
-FILE_SCHEMA(('IFC4'));
-ENDSEC;
-DATA;
-#1=IFCPROPERTYSETTEMPLATE('2KS9su6r517uLXTGKwwDdn',$,'EQto_BodyGeometryValidation','Quantities supplied for validating the correct interpretation of the body shape representation at import. In case of multiple representation items, the quantities are summed for each of the items (irrespective of any overlap). Choosing a suitable tolerance value for comparing the supplied numbers to the numbers calculated from the reconstructed geometry is at the discretion of the importing application.',.QTO_OCCURRENCEDRIVEN.,'IfcProduct',(#2,#3,#4,#5,#6,#7));
-#2=IFCSIMPLEPROPERTYTEMPLATE('3iCdOOLRjCwQ_HRTB41Xh8',$,'GrossSurfaceArea','Total gross area of the object, normally generated as perimeter * length + 2 * cross section area. It is the sum of OuterSurfaceArea + (2 x CrossSectionArea) and shall only be given, if the OuterSurfaceArea and CrossSectionArea cannot be established separately.\X2\000A000A\X0\Total gross surface area of the element before applying product-level geometric features such as openings and projections.',.Q_AREA.,$,$,$,$,$,$,.READWRITE.);
-#3=IFCSIMPLEPROPERTYTEMPLATE('0juemEqF5889vg7HwR87Fv',$,'NetSurfaceArea','Net surface area of the object, normally generated as perimeter * length + 2 * cross section area taking into account possible processing features (cut-out''s, etc.) or openings and recesses.\X2\000A000A\X0\Total net surface area of the element after applying product-level geometric features such as openings and projections.',.Q_AREA.,$,$,$,$,$,$,.READWRITE.);
-#4=IFCSIMPLEPROPERTYTEMPLATE('1LUuLSnMXFDgGLBCvte8aH',$,'GrossVolume','Total gross volume of the object. Openings, recesses, enclosed objects and projections are not taken into account.\X2\000A000A\X0\Total gross volume of the element before applying product-level geometric features such as openings and projections.',.Q_VOLUME.,$,$,$,$,$,$,.READWRITE.);
-#5=IFCSIMPLEPROPERTYTEMPLATE('0ny7TXUFz8wvnoQ2eU8czF',$,'NetVolume','Total net volume of the object, taking into account possible processing features (cut-out''s, etc.) or openings and recesses.\X2\000A000A\X0\Total net volume of the element before applying product-level geometric features such as openings and projections.',.Q_VOLUME.,$,$,$,$,$,$,.READWRITE.);
-#6=IFCSIMPLEPROPERTYTEMPLATE('31g8_gdUv8KRkOWzW48KoP',$,'SurfaceGenusBeforeFeatures','The Surface Genus of the evaluated representation items before applying product-level geometric features such as openings and projections.Surface Genus is a topological measure that represents the number of "holes" or "handles" on a surface. For example, a sphere has genus 0, and a torus has genus 1.Computed using the Euler characteristic:$$\\chi=V-E+F$$With the numbers of vertices (V), edges (E) and faces (F)$$\\chi=2\X2\2212\X0\2g\X2\2212\X0\b$$With surface genus (g) and the number of boundaries (b) the latter zero in case of an enclosed volume.',.Q_COUNT.,$,$,$,$,$,$,.READWRITE.);
-#7=IFCSIMPLEPROPERTYTEMPLATE('3kBBtGUebC09mUggGTKpjj',$,'SurfaceGenusAfterFeatures','The Surface Genus of the evaluated representation items after applying product-level geometric features such as openings and projections.Surface Genus is a topological measure that represents the number of "holes" or "handles" on a surface. For example, a sphere has genus 0, and a torus has genus 1.Computed using the Euler characteristic:$$\\chi=V-E+F$$With the numbers of vertices (V), edges (E) and faces (F)$$\\chi=2\X2\2212\X0\2g\X2\2212\X0\b$$With surface genus (g) and the number of boundaries (b) the latter zero in case of an enclosed volume.',.Q_COUNT.,$,$,$,$,$,$,.READWRITE.);
-ENDSEC;
-END-ISO-10303-21;
@@ -18,7 +18,7 @@ DATA;
 #11=IFCSIMPLEPROPERTYTEMPLATE('1DtsPn5a9FG8$zXHDDMavY',$,'ShowEndArrow','Display end arrow.',.P_SINGLEVALUE.,'IfcBoolean',$,$,$,$,$,.READWRITE.);
 #12=IFCSIMPLEPROPERTYTEMPLATE('2$6U0mLI9AiPRWeBabdY3u',$,'EndArrowSymbol','Custom symbol for the end of the section marker arrow. Need to make sure it''s present in "symbols.svg".',.P_SINGLEVALUE.,'IfcLabel',$,$,$,$,$,.READWRITE.);
 #13=IFCSIMPLEPROPERTYTEMPLATE('1naFqntIL7igCY7hCaE7kq',$,'HasConnectedSectionLine','Connect or disconnect section markers with line (by default = True).',.P_SINGLEVALUE.,'IfcBoolean',$,$,$,$,$,.READWRITE.);
-#14=IFCPROPERTYSETTEMPLATE('3V8oZ8YRD3_O7uR5vcUleS',$,'BBIM_Documentation','',.PSET_OCCURRENCEDRIVEN.,'IfcProject',(#15,#16,#17,#18,#19,#20,#21,#22,#23));
+#14=IFCPROPERTYSETTEMPLATE('3V8oZ8YRD3_O7uR5vcUleS',$,'BBIM_Documentation','',.PSET_OCCURRENCEDRIVEN.,'IfcProject',(#15,#16,#17,#18,#19,#20,#21,#22));
 #15=IFCSIMPLEPROPERTYTEMPLATE('0ulAhgk3v9qfGlDILauR6J',$,'SheetsDir','Default sheets directory',.P_SINGLEVALUE.,'IfcLabel',$,$,$,$,$,.READWRITE.);
 #16=IFCSIMPLEPROPERTYTEMPLATE('2yvlVKiQXASucfH40deCvu',$,'LayoutsDir','Default layouts directory',.P_SINGLEVALUE.,'IfcLabel',$,$,$,$,$,.READWRITE.);
 #17=IFCSIMPLEPROPERTYTEMPLATE('2kXZqXicL3jRwsOnLM_0ho',$,'TitleblocksDir','Default titleblocks directory',.P_SINGLEVALUE.,'IfcLabel',$,$,$,$,$,.READWRITE.);
@@ -27,12 +27,8 @@ DATA;
 #20=IFCSIMPLEPROPERTYTEMPLATE('23tejOrxj859R_eCRp1AFP',$,'MarkersPath','Default markers SVG',.P_SINGLEVALUE.,'IfcLabel',$,$,$,$,$,.READWRITE.);
 #21=IFCSIMPLEPROPERTYTEMPLATE('1UDakJ5_f7kBhggNSW4$h5',$,'SymbolsPath','Default symbols SVG',.P_SINGLEVALUE.,'IfcLabel',$,$,$,$,$,.READWRITE.);
 #22=IFCSIMPLEPROPERTYTEMPLATE('0d53LEtgLDQxnv__NfgH7i',$,'PatternsPath','Default patterns SVG',.P_SINGLEVALUE.,'IfcLabel',$,$,$,$,$,.READWRITE.);
-#23=IFCSIMPLEPROPERTYTEMPLATE('26qFNMv7nCHgU6Jd7Anga5',$,'ShadingStylesPath','Default shading styles',.P_SINGLEVALUE.,'IfcLabel',$,$,$,$,$,.READWRITE.);
-#24=IFCPROPERTYSETTEMPLATE('0I9merLinF5Ap$aZwaclgm',$,'BBIM_Dimension','',.PSET_OCCURRENCEDRIVEN.,'IfcAnnotation,IfcTypeProduct',(#25,#26,#27,#28));
-#25=IFCSIMPLEPROPERTYTEMPLATE('1rL2AbQsXD8RbpoWH5pYOV',$,'ShowDescriptionOnly','Hide the measurement values and show only annotation description',.P_SINGLEVALUE.,'IfcBoolean',$,$,$,$,$,.READWRITE.);
-#26=IFCSIMPLEPROPERTYTEMPLATE('0SVyOfB0rC2xNfdRYf3XvY',$,'SuppressZeroInches','Suppress 0 inch values in dimension annotation text (for example: 12'' - 0" -> 12'')',.P_SINGLEVALUE.,'IfcBoolean',$,$,$,$,$,.READWRITE.);
-#27=IFCSIMPLEPROPERTYTEMPLATE('2bUmj458PBqPAtUoI3MXsb',$,'TextPrefix','Text to add before annotation measurement value',.P_SINGLEVALUE.,'IfcLabel',$,$,$,$,$,.READWRITE.);
-#28=IFCSIMPLEPROPERTYTEMPLATE('0bnzttUb9BPuN597uNTXOE',$,'TextSuffix','Text to add after annotation measurement value',.P_SINGLEVALUE.,'IfcLabel',$,$,$,$,$,.READWRITE.);
-
+#23=IFCPROPERTYSETTEMPLATE('0I9merLinF5Ap$aZwaclgm',$,'BBIM_Dimension','',.PSET_OCCURRENCEDRIVEN.,'IfcAnnotation,IfcTypeProduct',(#24,#25));
+#24=IFCSIMPLEPROPERTYTEMPLATE('1rL2AbQsXD8RbpoWH5pYOV',$,'ShowDescriptionOnly','Hide the measurement values and show only annotation description',.P_SINGLEVALUE.,'IfcBoolean',$,$,$,$,$,.READWRITE.);
+#25=IFCSIMPLEPROPERTYTEMPLATE('0SVyOfB0rC2xNfdRYf3XvY',$,'SuppressZeroInches','Suppress 0 inch values in dimension annotation text (for example: 12'' - 0" -> 12'')',.P_SINGLEVALUE.,'IfcBoolean',$,$,$,$,$,.READWRITE.);
 ENDSEC;
 END-ISO-10303-21;
@@ -1,23 +0,0 @@
-ISO-10303-21;
-HEADER;
-FILE_DESCRIPTION(('ViewDefinition [CoordinationView]'),'2;1');
-FILE_NAME('','2023-09-28T23:00:50',(),(),'IfcOpenShell v0.7.0-fbd8ea1ed','IfcOpenShell v0.7.0-fbd8ea1ed','');
-FILE_SCHEMA(('IFC4'));
-ENDSEC;
-DATA;
-#1=IFCPROPERTYSETTEMPLATE('1TLQmgUKf0I8Zi07bm9Jqn',$,'ePSet_ProjectedCRS','',.PSET_OCCURRENCEDRIVEN.,'IfcProject',(#2,#3,#4,#5,#6,#7));
-#2=IFCSIMPLEPROPERTYTEMPLATE('2cH53PtVT3v88uf_uGFblG',$,'Name','',.P_SINGLEVALUE.,'IfcLabel',$,$,$,$,$,.READWRITE.);
-#3=IFCSIMPLEPROPERTYTEMPLATE('3JsReA6vXDqR7aNC$haRYW',$,'Description','',.P_SINGLEVALUE.,'IfcText',$,$,$,$,$,.READWRITE.);
-#4=IFCSIMPLEPROPERTYTEMPLATE('0u0uEsT5HFtuX5GvozO9ba',$,'GeodeticDatum','',.P_SINGLEVALUE.,'IfcIdentifier',$,$,$,$,$,.READWRITE.);
-#5=IFCSIMPLEPROPERTYTEMPLATE('1JgEX9Fsf0$ggxYltdkqiY',$,'VerticalDatum','',.P_SINGLEVALUE.,'IfcIdentifier',$,$,$,$,$,.READWRITE.);
-#6=IFCSIMPLEPROPERTYTEMPLATE('3ahTZjYrD0MAOo5IH6QuGH',$,'MapProjection','',.P_SINGLEVALUE.,'IfcIdentifier',$,$,$,$,$,.READWRITE.);
-#7=IFCSIMPLEPROPERTYTEMPLATE('3hqJR2ghD0GAti7q4sXKj7',$,'MapZone','',.P_SINGLEVALUE.,'IfcIdentifier',$,$,$,$,$,.READWRITE.);
-#8=IFCPROPERTYSETTEMPLATE('1jGHTycOj0vA8xHfRl4TNs',$,'ePSet_MapConversion','',.PSET_OCCURRENCEDRIVEN.,'IfcProject',(#9,#10,#11,#12,#13,#15));
-#9=IFCSIMPLEPROPERTYTEMPLATE('0nxsULXo17JRrAvNteYtNR',$,'Eastings','',.P_SINGLEVALUE.,'IfcLengthMeasure',$,$,$,$,$,.READWRITE.);
-#10=IFCSIMPLEPROPERTYTEMPLATE('26RfaGJs5CqemN0Xin12XL',$,'Northings','',.P_SINGLEVALUE.,'IfcLengthMeasure',$,$,$,$,$,.READWRITE.);
-#11=IFCSIMPLEPROPERTYTEMPLATE('0ziCn3nZv3m850VEUwWH42',$,'OrthogonalHeight','',.P_SINGLEVALUE.,'IfcLengthMeasure',$,$,$,$,$,.READWRITE.);
-#12=IFCSIMPLEPROPERTYTEMPLATE('3d4BOt4In8WR119ms1SaAe',$,'XAxisAbscissa','',.P_SINGLEVALUE.,'IfcReal',$,$,$,$,$,.READWRITE.);
-#13=IFCSIMPLEPROPERTYTEMPLATE('1Q4Voqj2j84RQRI8l67m28',$,'XAxisOrdinate','',.P_SINGLEVALUE.,'IfcReal',$,$,$,$,$,.READWRITE.);
-#15=IFCSIMPLEPROPERTYTEMPLATE('0O1Hc0$XnDNOG_jPBmbW5r',$,'Scale','',.P_SINGLEVALUE.,'IfcReal',$,$,$,$,$,.READWRITE.);
-ENDSEC;
-END-ISO-10303-21;
@@ -0,0 +1,214 @@
+# BlenderBIM Add-on - OpenBIM Blender Add-on
+# Copyright (C) 2021 Dion Moult <dion@thinkmoult.com>
+#
+# This file is part of BlenderBIM Add-on.
+#
+# BlenderBIM Add-on is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# BlenderBIM Add-on is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with BlenderBIM Add-on.  If not, see <http://www.gnu.org/licenses/>.
+
+presets = {
+    "Basic": ["project", "search", "bcf", "attribute", "spatial", "pset", "qto"],
+    "Admin": [
+        "project",
+        "search",
+        "bcf",
+        "root",
+        "unit",
+        "model",
+        "georeference",
+        "context",
+        "drawing",
+        "misc",
+        "attribute",
+        "type",
+        "spatial",
+        "void",
+        "aggregate",
+        "geometry",
+        "cobie",
+        "resource",
+        "cost",
+        "sequence",
+        "group",
+        "system",
+        "structural",
+        "boundary",
+        "profile",
+        "material",
+        "style",
+        "layer",
+        "owner",
+        "pset",
+        "qto",
+        "classification",
+        "constraint",
+        "document",
+        "pset_template",
+        "clash",
+        "lca",
+        "csv",
+        "bimtester",
+        "diff",
+        "patch",
+        "covetool",
+        "augin",
+        "debug",
+    ],
+    "BIM Coordination": [
+        "project",
+        "search",
+        "bcf",
+        "root",
+        "unit",
+        "georeference",
+        "attribute",
+        "type",
+        "spatial",
+        "void",
+        "aggregate",
+        "owner",
+        "pset",
+        "qto",
+        "clash",
+        "csv",
+        "bimtester",
+        "diff",
+        "patch",
+        "debug",
+    ],
+    "Architecture": [
+        "project",
+        "search",
+        "bcf",
+        "root",
+        "unit",
+        "model",
+        "georeference",
+        "context",
+        "drawing",
+        "misc",
+        "attribute",
+        "type",
+        "spatial",
+        "void",
+        "aggregate",
+        "geometry",
+        "group",
+        "system",
+        "boundary",
+        "profile",
+        "material",
+        "style",
+        "layer",
+        "owner",
+        "pset",
+        "qto",
+        "classification",
+        "pset_template",
+        "clash",
+        "csv",
+    ],
+    "Structural Engineering": [
+        "project",
+        "search",
+        "bcf",
+        "root",
+        "unit",
+        "model",
+        "georeference",
+        "context",
+        "drawing",
+        "misc",
+        "attribute",
+        "type",
+        "spatial",
+        "void",
+        "aggregate",
+        "geometry",
+        "group",
+        "system",
+        "structural",
+        "boundary",
+        "profile",
+        "material",
+        "style",
+        "layer",
+        "owner",
+        "pset",
+        "qto",
+        "classification",
+        "pset_template",
+        "clash",
+        "csv",
+    ],
+    "MEP": [
+        "project",
+        "search",
+        "bcf",
+        "root",
+        "unit",
+        "model",
+        "georeference",
+        "context",
+        "drawing",
+        "misc",
+        "attribute",
+        "type",
+        "spatial",
+        "void",
+        "aggregate",
+        "geometry",
+        "group",
+        "system",
+        "boundary",
+        "profile",
+        "material",
+        "style",
+        "layer",
+        "owner",
+        "pset",
+        "qto",
+        "classification",
+        "pset_template",
+        "clash",
+        "csv",
+    ],
+    "Quantity Surveying": ["project", "search", "attribute", "spatial", "void", "pset", "qto", "classification", "csv"],
+    "Model Enrichment": [
+        "project",
+        "search",
+        "root",
+        "attribute",
+        "spatial",
+        "pset",
+        "qto",
+        "pset_template",
+        "csv",
+        "patch",
+    ],
+    "3D Visualisation": ["project", "search", "bcf", "attribute", "spatial", "pset", "qto"],
+    "4D Scheduling": ["project", "search", "attribute", "spatial", "resource", "cost", "sequence", "pset", "qto"],
+    "5D Cost Management": [
+        "project",
+        "search",
+        "attribute",
+        "spatial",
+        "resource",
+        "cost",
+        "sequence",
+        "pset",
+        "qto",
+        "lca",
+    ],
+    "Facility Management": ["project", "search", "attribute", "spatial", "cobie", "pset", "qto", "lca"],
+}
@@ -0,0 +1,2 @@
+Name,foo
+TransomThickness,500
@@ -44,8 +44,9 @@ class IfcExporter:
        self.file = IfcStore.get_file()
        self.set_header()
        IfcStore.update_cache()
-        self.sync_all_objects()
-        self.sync_edited_objects()
+        if bpy.context.scene.BIMProjectProperties.is_authoring:
+            self.sync_all_objects()
+            self.sync_edited_objects()
        extension = self.ifc_export_settings.output_file.split(".")[-1].lower()
        if extension == "ifczip":
            with tempfile.TemporaryDirectory() as unzipped_path:
@@ -82,7 +83,7 @@ class IfcExporter:
        )
        self.file.wrapped_data.header.file_name.preprocessor_version = "IfcOpenShell {}".format(ifcopenshell.version)
        self.file.wrapped_data.header.file_name.originating_system = "{} {}".format(
-            self.get_application_name(), tool.Blender.get_blenderbim_version()
+            self.get_application_name(), self.get_application_version()
        )

    def sync_all_objects(self):
@@ -93,8 +94,6 @@ class IfcExporter:
            try:
                if isinstance(obj, bpy.types.Material):
                    continue
-                if obj.library:
-                    continue
                tool.Collector.sync(obj)
                result = self.sync_object_placement(obj)
                if result:
@@ -164,7 +163,7 @@ class IfcExporter:
        return "BlenderBIM"

    def get_application_version(self):
-        version = ".".join(
+        return ".".join(
            [
                str(x)
                for x in [
@@ -174,9 +173,6 @@ class IfcExporter:
                ][0]
            ]
        )
-        if blenderbim.bim.last_commit_hash != "8888888":
-            version += f"-{blenderbim.bim.last_commit_hash[:7]}"
-        return version


 class IfcExportSettings:
@@ -16,34 +16,47 @@
 # You should have received a copy of the GNU General Public License
 # along with BlenderBIM Add-on.  If not, see <http://www.gnu.org/licenses/>.

-import os
 import bpy
 import json
 import addon_utils
 import ifcopenshell.api.owner.settings
-import blenderbim.bim
 import blenderbim.tool as tool
 import blenderbim.core.owner as core_owner
+from blenderbim.bim.module.drawing.prop import RasterStyleProperty
 from bpy.app.handlers import persistent
 from blenderbim.bim.ifc import IfcStore
 from blenderbim.bim.module.owner.prop import get_user_person, get_user_organisation
 from blenderbim.bim.module.model.data import AuthoringData
-from blenderbim.bim.module.model.workspace import LIST_OF_TOOLS, TOOLS_TO_CLASSES_MAP
-from mathutils import Vector
-from math import cos, degrees


-cwd = os.path.dirname(os.path.realpath(__file__))
 global_subscription_owner = object()


+def mode_callback(obj, data):
+    if not bpy.context.scene.BIMProjectProperties.is_authoring:
+        return
+    objects = bpy.context.selected_objects
+    if bpy.context.active_object:
+        objects += [bpy.context.active_object]
+    for obj in objects:
+        if (
+            obj.mode != "EDIT"
+            or not obj.data
+            or not isinstance(obj.data, (bpy.types.Mesh, bpy.types.Curve, bpy.types.TextCurve))
+            or not obj.BIMObjectProperties.ifc_definition_id
+        ):
+            continue
+        if obj.data.BIMMeshProperties.ifc_definition_id:
+            tool.Ifc.edit(obj)
+        elif IfcStore.get_file().by_id(obj.BIMObjectProperties.ifc_definition_id).is_a("IfcGridAxis"):
+            tool.Ifc.edit(obj)
+
+
 def name_callback(obj, data):
+    # TODO Do we still need this, now that we are monitoring the undo redo objects?
    try:
        obj.name
    except:
-        # The object is invalid but somehow still has a callback. Clear all
-        # msgbus subscriptions to prevent useless further triggers.
-        bpy.msgbus.clear_by_owner(obj)
        return  # In case the object RNA is gone during an undo / redo operation
    # Blender names are up to 63 UTF-8 bytes
    if len(bytes(obj.name, "utf-8")) >= 63:
@@ -57,31 +70,25 @@ def name_callback(obj, data):
        refresh_ui_data()
        return

-    if not obj.BIMObjectProperties.ifc_definition_id:
+    if not obj.BIMObjectProperties.ifc_definition_id or "/" not in obj.name:
        return
-
-    if obj.BIMObjectProperties.is_renaming:
-        obj.BIMObjectProperties.is_renaming = False
-        return
-
    element = IfcStore.get_file().by_id(obj.BIMObjectProperties.ifc_definition_id)
-    if "/" in obj.name:
-        object_name = obj.name
-        element_name = obj.name.split("/", 1)[1]
-    else:
-        element_name = obj.name
-        object_name = element.is_a() + f"/{element_name}"
-        obj.name = object_name  # NOTE: doesn't trigger infinite recursion
-
-    if element.is_a("IfcGridAxis"):
-        element.AxisTag = object_name.split("/")[1]
-        refresh_ui_data()
-
    if not element.is_a("IfcRoot"):
        return
-    element.Name = element_name
-    if obj.BIMObjectProperties.collection:
-        obj.BIMObjectProperties.collection.name = object_name
+    if element.is_a("IfcSpatialStructureElement") or (hasattr(element, "IsDecomposedBy") and element.IsDecomposedBy):
+        collection = obj.users_collection[0]
+        collection.name = obj.name
+    if element.is_a("IfcGrid"):
+        axis_obj = IfcStore.get_element(element.UAxes[0].id())
+        axis_collection = axis_obj.users_collection[0]
+        grid_collection = None
+        for collection in bpy.data.collections:
+            if axis_collection.name in collection.children.keys():
+                grid_collection = collection
+                break
+        if grid_collection:
+            grid_collection.name = obj.name
+    element.Name = "/".join(obj.name.split("/")[1:])
    refresh_ui_data()


@@ -92,62 +99,6 @@ def color_callback(obj, data):

 def active_object_callback():
    refresh_ui_data()
-    update_bim_tool_props()
-
-
-def update_bim_tool_props():
-    """update BIM Tools props (such as extrusion_depth, length and x_angle) when active object changes"""
-    obj = bpy.context.active_object
-
-    # bunch of checks to see if we're in a valid state
-    if not obj:
-        return
-    mode = bpy.context.mode
-    current_tool = bpy.context.workspace.tools.from_space_view3d_mode(mode)
-    if not current_tool or current_tool.idname not in LIST_OF_TOOLS:
-        return
-    element = tool.Ifc.get_entity(obj)
-    if not element:
-        return
-    representation = ifcopenshell.util.representation.get_representation(element, "Model", "Body", "MODEL_VIEW")
-    if not representation:
-        return
-
-    props = bpy.context.scene.BIMModelProperties
-    if element.is_a("IfcElementType") or element.is_a("IfcElement"):
-        element_type = ifcopenshell.util.element.get_type(element)
-        if element_type:
-            is_bim_tool = current_tool.idname == "bim.bim_tool"
-            if is_bim_tool:
-                props.ifc_class = element_type.is_a()
-            if is_bim_tool or TOOLS_TO_CLASSES_MAP.get(current_tool.idname) == element_type.is_a():
-                props.relating_type_id = str(element_type.id())
-    extrusion = tool.Model.get_extrusion(representation)
-    if not extrusion:
-        return
-
-    def get_x_angle(extrusion):
-        x, y, z = extrusion.ExtrudedDirection.DirectionRatios
-        x_angle = Vector((0, 1)).angle_signed(Vector((y, z)))
-        return x_angle
-
-    si_conversion = ifcopenshell.util.unit.calculate_unit_scale(tool.Ifc.get())
-    if not AuthoringData.is_loaded:
-        AuthoringData.load()
-
-    if AuthoringData.data["active_material_usage"] == "LAYER2":
-        x_angle = get_x_angle(extrusion)
-        axis = tool.Model.get_wall_axis(obj)["reference"]
-        props.extrusion_depth = extrusion.Depth * si_conversion * cos(x_angle)
-        props.length = (axis[1] - axis[0]).length
-        props.x_angle = x_angle
-
-    elif AuthoringData.data["active_material_usage"] == "LAYER3":
-        x_angle = get_x_angle(extrusion)
-        props.x_angle = x_angle
-
-    elif AuthoringData.data["active_material_usage"] == "PROFILE":
-        props.extrusion_depth = extrusion.Depth * si_conversion


 def active_material_index_callback(obj, data):
@@ -182,42 +133,67 @@ def refresh_ui_data():
        except AttributeError:
            pass

-        # TODO: deprecate prop purge functions and refactor into data classes.
+
+def purge_module_data():
+    from blenderbim.bim import modules
+
+    refresh_ui_data()
+    for name, value in modules.items():
+        try:
+            getattr(getattr(getattr(ifcopenshell.api, name), "data"), "Data").purge()
+        except AttributeError:
+            pass
+
        try:
            getattr(value, "prop").purge()
        except AttributeError:
            pass

-    if isinstance(tool.Ifc.get(), ifcopenshell.sqlite):
-        tool.Ifc.get().clear_cache()
-

@persistent
 def loadIfcStore(scene):
    IfcStore.purge()
-    refresh_ui_data()
+    purge_module_data()
    if not IfcStore.get_file():
        return
    IfcStore.get_schema()
    IfcStore.relink_all_objects()


+@persistent
+def undo_pre(scene):
+    IfcStore.track_undo_redo_stack_object_map()
+
+
@persistent
 def undo_post(scene):
    if IfcStore.last_transaction != bpy.context.scene.BIMProperties.last_transaction:
        IfcStore.last_transaction = bpy.context.scene.BIMProperties.last_transaction
-        IfcStore.undo(until_key=bpy.context.scene.BIMProperties.last_transaction)
-        refresh_ui_data()
-    tool.Ifc.rebuild_element_maps()
+        IfcStore.undo()
+        purge_module_data()
+    IfcStore.track_undo_redo_stack_selected_objects()
+    IfcStore.reload_undo_redo_stack_objects()
+
+
+@persistent
+def redo_pre(scene):
+    IfcStore.track_undo_redo_stack_object_map()


@persistent
 def redo_post(scene):
    if IfcStore.last_transaction != bpy.context.scene.BIMProperties.last_transaction:
        IfcStore.last_transaction = bpy.context.scene.BIMProperties.last_transaction
-        IfcStore.redo(until_key=bpy.context.scene.BIMProperties.last_transaction)
-        refresh_ui_data()
-    tool.Ifc.rebuild_element_maps()
+        IfcStore.redo()
+        purge_module_data()
+    IfcStore.track_undo_redo_stack_selected_objects()
+    IfcStore.reload_undo_redo_stack_objects()
+
+
+@persistent
+def ensureIfcExported(scene):
+    if IfcStore.get_file() and not bpy.context.scene.BIMProperties.ifc_file:
+        bpy.ops.export_ifc.bim("INVOKE_DEFAULT")


 def get_application(ifc):
@@ -248,110 +224,82 @@ def get_application_version():
    )


-def viewport_shading_changed_callback(area):
-    shading = area.spaces.active.shading.type
-    if shading == "RENDERED":
-        bpy.context.scene.BIMStylesProperties.active_style_type = "External"
-
-
-@classmethod
-def poll_check_blender_tab(cls, context):
-    return tool.Blender.is_tab(context, "BLENDER")
-
-
-def get_override_scene_panel(panel_name):
-    original_panel = getattr(bpy.types, panel_name)
-
-    override_panel = type(f"Override_{panel_name}", (original_panel,), {})
-    override_panel.bl_idname = f"{panel_name}_override"
-
-    # some blender panel depend on other and register_class will throw an error
-    # if we won't override their `bl_parent_id`
-    bl_parent_id = getattr(override_panel, "bl_parent_id", None)
-    if bl_parent_id is not None:
-        override_panel.bl_parent_id = f"{bl_parent_id}_override"
-
-    # override poll method
-    poll = getattr(override_panel, "poll", None)
-    if poll is None:
-        override_panel.poll = poll_check_blender_tab
-    else:
-
-        @classmethod
-        def wrapped_poll(cls, context):
-            return super(override_panel, cls).poll(context) and poll_check_blender_tab.__func__(cls, context)
-
-        override_panel.poll = wrapped_poll
-
-    return override_panel
-
-
-# TODO: possibly override scene panels from other addons too?
-# list can be updated from
-# https://projects.blender.org/blender/blender/src/branch/main/scripts/startup/bl_ui/properties_scene.py#L421
-OVERRIDE_SCENE_PANELS = (
-    "SCENE_PT_scene",
-    "SCENE_PT_unit",
-    "SCENE_PT_physics",
-    "SCENE_PT_rigid_body_world",
-    "SCENE_PT_rigid_body_world_settings",
-    "SCENE_PT_rigid_body_cache",
-    "SCENE_PT_rigid_body_field_weights",
-    "SCENE_PT_audio",
-    "SCENE_PT_keying_sets",
-    "SCENE_PT_custom_props",
-    # after SCENE_PT_keying_sets
-    "SCENE_PT_keying_set_paths",
-    "SCENE_PT_keyframing_settings",
-)
-if bpy.app.version >= (4, 0):
-    OVERRIDE_SCENE_PANELS += ("SCENE_PT_simulation",)
-
-
@persistent
-def load_post(scene):
+def setDefaultProperties(scene):
    global global_subscription_owner
    active_object_key = bpy.types.LayerObjects, "active"
    bpy.msgbus.subscribe_rna(
        key=active_object_key, owner=global_subscription_owner, args=(), notify=active_object_callback
    )
-
-    # subscribe to changes in viewport shading mode
-    # NOTE: couldn't find a way to make it work for new areas too
-    # it starts working for them after blender restart though
-    for screen in bpy.data.screens:
-        for area in screen.areas:
-            if area.type != "VIEW_3D":
-                continue
-            shading = area.spaces.active.shading
-            key = shading.path_resolve("type", False)
-
-            bpy.msgbus.subscribe_rna(
-                key=key, owner=global_subscription_owner, args=(area,), notify=viewport_shading_changed_callback
-            )
-
    ifcopenshell.api.owner.settings.get_user = lambda ifc: core_owner.get_user(tool.Owner)
    ifcopenshell.api.owner.settings.get_application = get_application
-    AuthoringData.type_thumbnails = {}
+    # TODO: Move to drawing module
+    if len(bpy.context.scene.DocProperties.drawing_styles) == 0:
+        drawing_style = bpy.context.scene.DocProperties.drawing_styles.add()
+        drawing_style.name = "Blender Default"
+        drawing_style.render_type = "DEFAULT"
+        bpy.ops.bim.save_drawing_style(index="0")

-    if not bpy.context.preferences.addons["blenderbim"].preferences.should_setup_toolbar:
-        tool.Blender.unregister_toolbar()
-
-    if bpy.context.preferences.addons["blenderbim"].preferences.should_setup_workspace:
-        if "BIM" in bpy.data.workspaces:
-            bpy.context.window.workspace = bpy.data.workspaces["BIM"]
-        else:
-            bpy.ops.workspace.append_activate(idname="BIM", filepath=os.path.join(cwd, "data", "workspace.blend"))
-
-        # To improve usability for new users, we hijack the scene properties
-        # tab. We override default scene properties panels with our own poll
-        # to hide them unless the user has chosen to view Blender properties.
-        for panel in OVERRIDE_SCENE_PANELS:
-            if panel in blenderbim.bim.overridden_scene_panels:
-                continue
-            override_panel = get_override_scene_panel(panel)
-            original_panel = getattr(bpy.types, panel)
-            bpy.utils.register_class(override_panel)
-            bpy.utils.unregister_class(original_panel)
-            blenderbim.bim.overridden_scene_panels[panel] = (original_panel, override_panel)
-    tool.Blender.setup_tabs()
+        drawing_style = bpy.context.scene.DocProperties.drawing_styles.add()
+        drawing_style.name = "Technical"
+        drawing_style.render_type = "VIEWPORT"
+        drawing_style.raster_style = json.dumps(
+            {
+                RasterStyleProperty.WORLD_COLOR.value: (1, 1, 1),
+                RasterStyleProperty.RENDER_ENGINE.value: "BLENDER_WORKBENCH",
+                RasterStyleProperty.RENDER_TRANSPARENT.value: False,
+                RasterStyleProperty.SHADING_SHOW_OBJECT_OUTLINE.value: True,
+                RasterStyleProperty.SHADING_SHOW_CAVITY.value: False,
+                RasterStyleProperty.SHADING_CAVITY_TYPE.value: "BOTH",
+                RasterStyleProperty.SHADING_CURVATURE_RIDGE_FACTOR.value: 1,
+                RasterStyleProperty.SHADING_CURVATURE_VALLEY_FACTOR.value: 1,
+                RasterStyleProperty.VIEW_TRANSFORM.value: "Standard",
+                RasterStyleProperty.SHADING_LIGHT.value: "FLAT",
+                RasterStyleProperty.SHADING_COLOR_TYPE.value: "SINGLE",
+                RasterStyleProperty.SHADING_SINGLE_COLOR.value: (1, 1, 1),
+                RasterStyleProperty.SHADING_SHOW_SHADOWS.value: False,
+                RasterStyleProperty.SHADING_SHADOW_INTENSITY.value: 0.5,
+                RasterStyleProperty.DISPLAY_LIGHT_DIRECTION.value: (0.5, 0.5, 0.5),
+                RasterStyleProperty.VIEW_USE_CURVE_MAPPING.value: False,
+                RasterStyleProperty.OVERLAY_SHOW_WIREFRAMES.value: True,
+                RasterStyleProperty.OVERLAY_WIREFRAME_THRESHOLD.value: 0,
+                RasterStyleProperty.OVERLAY_SHOW_FLOOR.value: False,
+                RasterStyleProperty.OVERLAY_SHOW_AXIS_X.value: False,
+                RasterStyleProperty.OVERLAY_SHOW_AXIS_Y.value: False,
+                RasterStyleProperty.OVERLAY_SHOW_AXIS_Z.value: False,
+                RasterStyleProperty.OVERLAY_SHOW_OBJECT_ORIGINS.value: False,
+                RasterStyleProperty.OVERLAY_SHOW_RELATIONSHIP_LINES.value: False,
+            }
+        )
+        drawing_style = bpy.context.scene.DocProperties.drawing_styles.add()
+        drawing_style.name = "Shaded"
+        drawing_style.render_type = "VIEWPORT"
+        drawing_style.raster_style = json.dumps(
+            {
+                RasterStyleProperty.WORLD_COLOR.value: (1, 1, 1),
+                RasterStyleProperty.RENDER_ENGINE.value: "BLENDER_WORKBENCH",
+                RasterStyleProperty.RENDER_TRANSPARENT.value: False,
+                RasterStyleProperty.SHADING_SHOW_OBJECT_OUTLINE.value: True,
+                RasterStyleProperty.SHADING_SHOW_CAVITY.value: True,
+                RasterStyleProperty.SHADING_CAVITY_TYPE.value: "BOTH",
+                RasterStyleProperty.SHADING_CURVATURE_RIDGE_FACTOR.value: 1,
+                RasterStyleProperty.SHADING_CURVATURE_VALLEY_FACTOR.value: 1,
+                RasterStyleProperty.VIEW_TRANSFORM.value: "Standard",
+                RasterStyleProperty.SHADING_LIGHT.value: "STUDIO",
+                RasterStyleProperty.SHADING_COLOR_TYPE.value: "MATERIAL",
+                RasterStyleProperty.SHADING_SINGLE_COLOR.value: (1, 1, 1),
+                RasterStyleProperty.SHADING_SHOW_SHADOWS.value: True,
+                RasterStyleProperty.SHADING_SHADOW_INTENSITY.value: 0.5,
+                RasterStyleProperty.DISPLAY_LIGHT_DIRECTION.value: (0.5, 0.5, 0.5),
+                RasterStyleProperty.VIEW_USE_CURVE_MAPPING.value: False,
+                RasterStyleProperty.OVERLAY_SHOW_WIREFRAMES.value: False,
+                RasterStyleProperty.OVERLAY_WIREFRAME_THRESHOLD.value: 0,
+                RasterStyleProperty.OVERLAY_SHOW_FLOOR.value: False,
+                RasterStyleProperty.OVERLAY_SHOW_AXIS_X.value: False,
+                RasterStyleProperty.OVERLAY_SHOW_AXIS_Y.value: False,
+                RasterStyleProperty.OVERLAY_SHOW_AXIS_Z.value: False,
+                RasterStyleProperty.OVERLAY_SHOW_OBJECT_ORIGINS.value: False,
+                RasterStyleProperty.OVERLAY_SHOW_RELATIONSHIP_LINES.value: False,
+            }
+        )
+        AuthoringData.type_thumbnails = {}
@@ -87,15 +87,8 @@ def import_attributes(ifc_class, props, data, callback=None):

 # A more elegant attribute importer signature, intended to supersede import_attributes
 def import_attributes2(element, props, callback=None):
-    if isinstance(element, str):
-        attributes = tool.Ifc.schema().declaration_by_name(element).as_entity().all_attributes()
-        info = {a.name(): None for a in attributes}
-        info["type"] = element
-    else:
-        attributes = element.wrapped_data.declaration().as_entity().all_attributes()
-        info = element.get_info()
-    for attribute in attributes:
-        import_attribute(attribute, props, info, callback=callback)
+    for attribute in element.wrapped_data.declaration().as_entity().all_attributes():
+        import_attribute(attribute, props, element.get_info(), callback=callback)


 def import_attribute(attribute, props, data, callback=None):
@@ -245,9 +238,7 @@ def get_obj_ifc_definition_id(context, obj, obj_type):
        ].ifc_definition_id
    elif obj_type == "WorkSchedule":
        return context.scene.BIMWorkScheduleProperties.active_work_schedule_id
-    elif obj_type == "Group":
-        prop = context.scene.BIMGroupProperties
-        return prop.groups[prop.active_group_index].ifc_definition_id
+

 # hack to close popup
 # https://blender.stackexchange.com/a/202576/130742
@@ -269,7 +260,12 @@ def convert_property_group_from_si(property_group, skip_props=()):
    for prop_name in property_group.bl_rna.properties.keys():
        if prop_name in skip_props:
            continue
-        prop_value = tool.Blender.get_blender_prop_default_value(property_group, prop_name)
+        prop_bl_rna = property_group.bl_rna.properties[prop_name]
+        if prop_bl_rna.array_length > 0:
+            prop_value = prop_bl_rna.default_array
+        else:
+            prop_value = prop_bl_rna.default
+
        if type(prop_value) is float:
            prop_value = prop_value * conversion_k
        elif type(prop_value) is bpy.types.bpy_prop_array:
@@ -277,88 +273,6 @@ def convert_property_group_from_si(property_group, skip_props=()):
        setattr(property_group, prop_name, prop_value)


-def draw_filter(layout, filter_groups, data, module):
-    if not data.is_loaded:
-        data.load()
-
-    sprops = bpy.context.scene.BIMSearchProperties
-
-    if tool.Ifc.get():
-        row = layout.row(align=True)
-        row.label(text=f"{len(data.data['saved_searches'])} Saved Searches")
-
-        if data.data["saved_searches"]:
-            row.operator("bim.load_search", text="", icon="IMPORT").module = module
-        row.operator("bim.save_search", text="", icon="EXPORT").module = module
-
-    row = layout.row(align=True)
-    row.operator("bim.add_filter_group", text="Add Search Group", icon="ADD").module = module
-    row.operator("bim.edit_filter_query", text="", icon="FILTER").module = module
-
-    for i, filter_group in enumerate(filter_groups):
-        box = layout.box()
-
-        row = box.row(align=True)
-        row.prop(sprops, "facet", text="")
-        op = row.operator("bim.add_filter", text="Add Filter", icon="ADD")
-        op.type = sprops.facet
-        op.index = i
-        op.module = module
-
-        for j, ifc_filter in enumerate(filter_group.filters):
-            if ifc_filter.type == "entity":
-                row = box.row(align=True)
-                row.prop(ifc_filter, "value", text="", icon="FILE_3D")
-            elif ifc_filter.type == "attribute":
-                row = box.row(align=True)
-                row.prop(ifc_filter, "name", text="", icon="COPY_ID")
-                row.prop(ifc_filter, "value", text="")
-            elif ifc_filter.type == "type":
-                row = box.row(align=True)
-                row.prop(ifc_filter, "value", text="", icon="FILE_VOLUME")
-            elif ifc_filter.type == "material":
-                row = box.row(align=True)
-                row.prop(ifc_filter, "value", text="", icon="MATERIAL")
-            elif ifc_filter.type == "property":
-                row = box.row(align=True)
-                row.prop(ifc_filter, "pset", text="", icon="PROPERTIES")
-                row.prop(ifc_filter, "name", text="")
-                row.prop(ifc_filter, "comparison", text="")
-                row.prop(ifc_filter, "value", text="")
-            elif ifc_filter.type == "classification":
-                row = box.row(align=True)
-                row.prop(ifc_filter, "value", text="", icon="OUTLINER")
-            elif ifc_filter.type == "location":
-                row = box.row(align=True)
-                row.prop(ifc_filter, "value", text="", icon="PACKAGE")
-            elif ifc_filter.type == "group":
-                row = box.row(align=True)
-                row.prop(ifc_filter, "value", text="", icon="OUTLINER_COLLECTION")
-            elif ifc_filter.type == "query":
-                row = box.row(align=True)
-                row.prop(ifc_filter, "name", text="", icon="POINTCLOUD_DATA")
-                row.prop(ifc_filter, "value", text="")
-            elif ifc_filter.type == "instance":
-                row = box.row(align=True)
-                row.prop(ifc_filter, "value", text="", icon="GRIP")
-                op = row.operator("bim.select_filter_elements", text="", icon="EYEDROPPER")
-                op.group_index = i
-                op.index = j
-                op.module = module
-            op = row.operator("bim.remove_filter", text="", icon="X")
-            op.group_index = i
-            op.index = j
-            op.module = module
-
-        row = box.row()
-        op = row.operator("bim.remove_filter_group", icon="X")
-        op.index = i
-        op.module = module
-
-
-# TODO this should move into ifcopenshell.util
-
-
 class IfcHeaderExtractor:
    def __init__(self, filepath: str):
        self.filepath = filepath
@@ -370,8 +284,6 @@ class IfcHeaderExtractor:
                return self.extract_ifc_spf(ifc_file)
        elif extension.lower() == "ifczip":
            return self.extract_ifc_zip()
-        elif extension.lower() == "ifcsqlite":
-            return {}  # TODO

    def extract_ifc_spf(self, ifc_file):
        # https://www.steptools.com/stds/step/IS_final_p21e3.html#clause-8
@@ -26,7 +26,6 @@ import ifcopenshell
 import blenderbim.bim.handler
 import blenderbim.tool as tool
 from pathlib import Path
-from blenderbim.tool.brick import BrickStore


 class IfcStore:
@@ -44,6 +43,9 @@ class IfcStore:
    classification_file = None
    library_path = ""
    library_file = None
+    element_listeners = set()
+    undo_redo_stack_objects = set()
+    undo_redo_stack_object_names = {}
    current_transaction = ""
    last_transaction = ""
    history = []
@@ -118,8 +120,6 @@ class IfcStore:

    @staticmethod
    def load_file(path):
-        if not os.path.isfile(path):
-            return
        extension = path.split(".")[-1]
        if extension.lower() == "ifczip":
            with tempfile.TemporaryDirectory() as unzipped_path:
@@ -130,9 +130,7 @@ class IfcStore:
                    return
        elif extension.lower() == "ifcxml":
            IfcStore.file = ifcopenshell.file(ifcopenshell.ifcopenshell_wrapper.parse_ifcxml(path))
-        elif bpy.context.scene.BIMProjectProperties.should_stream:
-            IfcStore.file = ifcopenshell.open(path, should_stream=True)
-        else:
+        elif extension.lower() == "ifc":
            IfcStore.file = ifcopenshell.open(path)

    @staticmethod
@@ -158,17 +156,103 @@ class IfcStore:
            return
        return obj

+    @staticmethod
+    def add_element_listener(callback):
+        IfcStore.element_listeners.add(callback)
+
+    @staticmethod
+    def track_undo_redo_stack_object_map():
+        """Keeps track of currently mapped object names, typically during undo and redo
+
+        When any Blender object is stored outside a Blender PointerProperty, such as
+        in a regular Python list, there is the likely probability that the object
+        will be invalidated when undo or redo occurs. Object invalidation seems to
+        occur whenever an object is affected during an operation.
+
+        For example, if an operator deletes a modifier on o1, then o1 will be invalidated.
+        """
+        for key, value in IfcStore.id_map.items():
+            try:
+                IfcStore.undo_redo_stack_object_names[key] = value.name
+            except:
+                continue
+
+    @staticmethod
+    def track_undo_redo_stack_selected_objects():
+        """Keeps track of selected object names, typically during undo and redo
+
+        When any Blender object is stored outside a Blender PointerProperty, such as
+        in a regular Python list, there is the likely probability that the object
+        will be invalidated when undo or redo occurs. Object invalidation seems to
+        occur for selected objects either pre/post undo/redo event, including
+        selected objects for consecutive undo/redos, and all children. This is
+        important because selected objects are often deleted from the scene.
+
+        So if I first select o1, then o2, then o3, then press undo, o3 will be
+        invalidated. If instead I press undo twice, o3 and o2 will be invalidated.
+        """
+        if bpy.context.active_object:
+            objects = set([o.name for o in bpy.context.selected_objects + [bpy.context.active_object]])
+            objects.update([o.name for o in bpy.context.active_object.children])
+        else:
+            objects = set([o.name for o in bpy.context.selected_objects])
+        for obj in bpy.context.selected_objects:
+            objects.update([o.name for o in obj.children])
+        IfcStore.undo_redo_stack_objects |= objects
+
+    @staticmethod
+    def reload_undo_redo_stack_objects():
+        """Reloads any invalidated objects after undo or redo
+
+        After an undo or redo operation, objects may have been invalidated in
+        our id_map and guid_map. Invalidated objects are typically those that
+        have been manipulated or deleted. This checks the cache of mapped and
+        selected objects prior to the operation and ensures that if the object
+        is invalidated, they are reloaded based on the object name that was
+        tracked prior to the undo / redo.
+        """
+        file = IfcStore.get_file()
+        if not file:
+            return
+
+        # First, reload objects that were selected or active
+        for name in IfcStore.undo_redo_stack_objects:
+            obj = bpy.data.objects.get(name)
+            if not obj:
+                continue
+            if not obj.BIMObjectProperties.ifc_definition_id:
+                continue
+            element = file.by_id(obj.BIMObjectProperties.ifc_definition_id)
+            data = {"id": element.id(), "obj": obj.name}
+            if hasattr(element, "GlobalId"):
+                data["guid"] = element.GlobalId
+            IfcStore.commit_link_element(data)
+
+        # Scan for any straggling invalidated objects which were indirectly affected and reload them too.
+        for key, value in IfcStore.id_map.items():
+            try:
+                value.name
+            except:
+                # TODO not so sure about this obj_name check
+                obj_name = IfcStore.undo_redo_stack_object_names.get(key, None)
+                if not obj_name:
+                    continue
+                obj = bpy.data.objects.get(obj_name)
+                if not obj or not obj.BIMObjectProperties.ifc_definition_id:
+                    continue
+                element = file.by_id(obj.BIMObjectProperties.ifc_definition_id)
+                data = {"id": element.id(), "obj": obj.name}
+                if hasattr(element, "GlobalId"):
+                    data["guid"] = element.GlobalId
+                IfcStore.commit_link_element(data)
+
    @staticmethod
    def relink_all_objects():
        if not IfcStore.get_file():
            return
        for obj in bpy.data.objects:
-            if obj.library:
-                continue
            IfcStore.relink_object(obj)
        for obj in bpy.data.materials:
-            if obj.library:
-                continue
            IfcStore.relink_object(obj)

    @staticmethod
@@ -194,13 +278,6 @@ class IfcStore:

    @staticmethod
    def link_element(element, obj):
-        # Please use tool.Ifc.link() instead of this method. We want to
-        # refactor this class and deprecate usage of IfcStore in favour of
-        # tools.
-        if not isinstance(obj, (bpy.types.Object, bpy.types.Material)):
-            obj.BIMMeshProperties.ifc_definition_id = element.id()
-            return
-
        existing_obj = IfcStore.id_map.get(element.id(), None)
        if existing_obj == obj:
            return
@@ -224,9 +301,11 @@ class IfcStore:
        if isinstance(obj, bpy.types.Material):
            blenderbim.bim.handler.subscribe_to(obj, "diffuse_color", blenderbim.bim.handler.color_callback)
        elif isinstance(obj, bpy.types.Object):
-            blenderbim.bim.handler.subscribe_to(
-                obj, "active_material_index", blenderbim.bim.handler.active_material_index_callback
-            )
+            blenderbim.bim.handler.subscribe_to(obj, "mode", blenderbim.bim.handler.mode_callback)
+            blenderbim.bim.handler.subscribe_to(obj, "active_material_index", blenderbim.bim.handler.active_material_index_callback)
+
+        for listener in IfcStore.element_listeners:
+            listener(element, obj)

        if IfcStore.history:
            data = {"id": element.id(), "guid": getattr(element, "GlobalId", None), "obj": obj.name}
@@ -248,13 +327,10 @@ class IfcStore:
        IfcStore.id_map[data["id"]] = obj
        if "guid" in data:
            IfcStore.guid_map[data["guid"]] = obj
+        blenderbim.bim.handler.subscribe_to(obj, "mode", blenderbim.bim.handler.mode_callback)
        blenderbim.bim.handler.subscribe_to(obj, "name", blenderbim.bim.handler.name_callback)
        if isinstance(obj, bpy.types.Material):
            blenderbim.bim.handler.subscribe_to(obj, "diffuse_color", blenderbim.bim.handler.color_callback)
-        elif isinstance(obj, bpy.types.Object):
-            blenderbim.bim.handler.subscribe_to(
-                obj, "active_material_index", blenderbim.bim.handler.active_material_index_callback
-            )
        # TODO Listeners are not re-registered. Does this cause nasty problems to debug later on?
        # TODO We're handling id_map and guid_map, but what about edited_objs? This might cause big problems.

@@ -320,34 +396,24 @@ class IfcStore:
            )

    @staticmethod
-    def execute_ifc_operator(operator, context, is_invoke=False):
-        bpy.context.scene.BIMProperties.is_dirty = True
+    def execute_ifc_operator(operator, context):
        is_top_level_operator = not bool(IfcStore.current_transaction)

        if is_top_level_operator:
            IfcStore.begin_transaction(operator)
-            if tool.Ifc.get():
-                tool.Ifc.get().begin_transaction()
-            if BrickStore.graph is not None:  # `if BrickStore.graph` by itself takes ages.
-                BrickStore.begin_transaction()
+            IfcStore.get_file().begin_transaction()
            # This empty transaction ensures that each operator has at least one transaction
            IfcStore.add_transaction_operation(operator, rollback=lambda data: True, commit=lambda data: True)
        else:
            operator.transaction_key = IfcStore.current_transaction

-        if is_invoke:
-            result = getattr(operator, "_invoke")(context, None)
-        else:
-            result = getattr(operator, "_execute")(context)
+        result = getattr(operator, "_execute")(context)

        if is_top_level_operator:
-            if tool.Ifc.get():
-                tool.Ifc.get().end_transaction()
-                IfcStore.add_transaction_operation(
-                    operator, rollback=lambda d: tool.Ifc.get().undo(), commit=lambda d: tool.Ifc.get().redo()
-                )
-            if BrickStore.graph is not None:  # `if BrickStore.graph` by itself takes ages.
-                BrickStore.end_transaction()
+            IfcStore.get_file().end_transaction()
+            IfcStore.add_transaction_operation(
+                operator, rollback=lambda d: IfcStore.get_file().undo(), commit=lambda d: IfcStore.get_file().redo()
+            )
            IfcStore.end_transaction(operator)
            blenderbim.bim.handler.refresh_ui_data()

@@ -355,6 +421,8 @@ class IfcStore:

    @staticmethod
    def begin_transaction(operator):
+        IfcStore.undo_redo_stack_objects = set()
+        IfcStore.undo_redo_stack_object_names = {}
        IfcStore.current_transaction = str(uuid.uuid4())
        operator.transaction_key = IfcStore.current_transaction

@@ -380,35 +448,19 @@ class IfcStore:
        IfcStore.future = []

    @staticmethod
-    def undo(until_key=None):
-        BrickStore.undo()
+    def undo():
        if not IfcStore.history:
            return
-
-        while IfcStore.history:
-            if IfcStore.history[-1]["key"] == until_key:
-                return
-
-            event = IfcStore.history.pop()
-            for transaction in event["operations"][::-1]:
-                transaction["rollback"](transaction["data"])
-            IfcStore.future.append(event)
+        event = IfcStore.history.pop()
+        for transaction in event["operations"][::-1]:
+            transaction["rollback"](transaction["data"])
+        IfcStore.future.append(event)

    @staticmethod
-    def redo(until_key=None):
-        BrickStore.redo()
-
+    def redo():
        if not IfcStore.future:
            return
-
-        has_encountered_key = False
-        while IfcStore.future:
-            if has_encountered_key and IfcStore.future[-1]["key"] != until_key:
-                return
-            elif IfcStore.future[-1]["key"] == until_key:
-                has_encountered_key = True
-
-            event = IfcStore.future.pop()
-            for transaction in event["operations"]:
-                transaction["commit"](transaction["data"])
-            IfcStore.history.append(event)
+        event = IfcStore.future.pop()
+        for transaction in event["operations"]:
+            transaction["commit"](transaction["data"])
+        IfcStore.history.append(event)
@@ -20,14 +20,14 @@ import bpy
 from . import ui, prop, operator

 classes = (
-    operator.BIM_OT_add_aggregate,
-    operator.BIM_OT_add_part_to_object,
-    operator.BIM_OT_aggregate_assign_object,
-    operator.BIM_OT_disable_editing_aggregate,
+    operator.BIM_OT_assign_object,
+    operator.BIM_OT_unassign_object,
    operator.BIM_OT_enable_editing_aggregate,
-    operator.BIM_OT_select_aggregate,
+    operator.BIM_OT_disable_editing_aggregate,
+    operator.BIM_OT_add_aggregate,
    operator.BIM_OT_select_parts,
-    operator.BIM_OT_aggregate_unassign_object,
+    operator.BIM_OT_select_aggregate,
+    operator.BIM_OT_add_part_to_object,
    prop.BIMObjectAggregateProperties,
    ui.BIM_PT_aggregate,
 )
@@ -35,7 +35,7 @@ class AggregateData:
            "has_relating_object": cls.has_relating_object(),
            "relating_object_label": cls.get_relating_object_label(),
            "has_related_objects": cls.has_related_objects(),
-            "total_parts": cls.total_parts(),
+            "related_objects_amount": cls.get_related_objects_amount(),
            "ifc_class": cls.ifc_class(),
        }
        cls.is_loaded = True
@@ -59,7 +59,7 @@ class AggregateData:
        return ifcopenshell.util.element.get_parts(tool.Ifc.get_entity(bpy.context.active_object))

    @classmethod
-    def total_parts(cls):
+    def get_related_objects_amount(cls):
        parts = cls.get_related_objects()
        return len(parts) if parts else 0

@@ -33,45 +33,30 @@ class Operator:
        return {"FINISHED"}


-class BIM_OT_aggregate_assign_object(bpy.types.Operator, Operator):
+class BIM_OT_assign_object(bpy.types.Operator, Operator):
    """Create aggregation relationship between two ifc elements"""

-    bl_idname = "bim.aggregate_assign_object"
-    bl_label = "Assign Object To Aggregation"
+    bl_idname = "bim.assign_object"
+    bl_label = "Assign Object"
    bl_options = {"REGISTER", "UNDO"}
    relating_object: bpy.props.IntProperty()
+    related_object: bpy.props.IntProperty()

    def _execute(self, context):
-        relating_obj = None
-        if self.relating_object:
-            relating_obj = tool.Ifc.get_object(tool.Ifc.get().by_id(self.relating_object))
-        elif context.active_object:
-            relating_obj = context.active_object
-        if not relating_obj:
-            return
-
-        for obj in bpy.context.selected_objects:
-            if obj == relating_obj:
-                continue
-            element = tool.Ifc.get_entity(obj)
-            if not element:
-                continue
-            result = core.assign_object(
-                tool.Ifc,
-                tool.Aggregate,
-                tool.Collector,
-                relating_obj=relating_obj,
-                related_obj=obj,
-            )
-            if not result:
-                self.report({"ERROR"}, f" Cannot aggregate {obj.name} to {relating_obj.name}")
+        core.assign_object(
+            tool.Ifc,
+            tool.Aggregate,
+            tool.Collector,
+            relating_obj=tool.Ifc.get_object(tool.Ifc.get().by_id(self.relating_object)),
+            related_obj=tool.Ifc.get_object(tool.Ifc.get().by_id(self.related_object)),
+        )


-class BIM_OT_aggregate_unassign_object(bpy.types.Operator, Operator):
+class BIM_OT_unassign_object(bpy.types.Operator, Operator):
    """Remove aggregation relationship between two ifc elements"""

-    bl_idname = "bim.aggregate_unassign_object"
-    bl_label = "Unassign Object From Aggregation"
+    bl_idname = "bim.unassign_object"
+    bl_label = "Unassign Object"
    bl_options = {"REGISTER", "UNDO"}

    def _execute(self, context):
@@ -163,8 +148,10 @@ class BIM_OT_add_aggregate(bpy.types.Operator, tool.Ifc.Operator):
            core.assign_object(tool.Ifc, tool.Aggregate, tool.Collector, relating_obj=aggregate, related_obj=obj)

    def create_aggregate(self, context, ifc_class):
+        aggregate_collection = bpy.data.collections.new(f"{ifc_class}/Assembly")
+        context.scene.collection.children.link(aggregate_collection)
        aggregate = bpy.data.objects.new("Assembly", None)
-        aggregate.location = context.scene.cursor.location
+        aggregate_collection.objects.link(aggregate)
        bpy.ops.bim.assign_class(obj=aggregate.name, ifc_class=ifc_class)
        return aggregate

@@ -203,7 +190,6 @@ class BIM_OT_select_aggregate(bpy.types.Operator):
        aggregate_obj = tool.Ifc.get_object(aggregate)
        if aggregate_obj in context.selectable_objects:
            aggregate_obj.select_set(True)
-            bpy.context.view_layer.objects.active = aggregate_obj
        return {"FINISHED"}


@@ -22,13 +22,13 @@ from blenderbim.bim.ifc import IfcStore


 class BIM_PT_aggregate(Panel):
-    bl_label = "Aggregates"
+    bl_label = "IFC Aggregates"
    bl_idname = "BIM_PT_aggregate"
    bl_options = {"DEFAULT_CLOSED"}
    bl_space_type = "PROPERTIES"
    bl_region_type = "WINDOW"
    bl_context = "object"
-    bl_parent_id = "BIM_PT_tab_object_metadata"
+    bl_parent_id = "BIM_PT_object_metadata"

    @classmethod
    def poll(cls, context):
@@ -54,8 +54,9 @@ class BIM_PT_aggregate(Panel):
            row = layout.row(align=True)
            row.prop(props, "relating_object", text="")
            if props.relating_object:
-                op = row.operator("bim.aggregate_assign_object", icon="CHECKMARK", text="")
+                op = row.operator("bim.assign_object", icon="CHECKMARK", text="")
                op.relating_object = props.relating_object.BIMObjectProperties.ifc_definition_id
+                op.related_object = context.active_object.BIMObjectProperties.ifc_definition_id
            row.operator("bim.disable_editing_aggregate", icon="CANCEL", text="")
        else:
            row = layout.row(align=True)
@@ -65,21 +66,15 @@ class BIM_PT_aggregate(Panel):
                op.obj = context.active_object.name
                row.operator("bim.enable_editing_aggregate", icon="GREASEPENCIL", text="")
                row.operator("bim.add_aggregate", icon="ADD", text="")
-                op = row.operator("bim.aggregate_unassign_object", icon="X", text="")
+                op = row.operator("bim.unassign_object", icon="X", text="")
            else:
                row.label(text="No Aggregate", icon="TRIA_UP")
                row.operator("bim.enable_editing_aggregate", icon="GREASEPENCIL", text="")
                row.operator("bim.add_aggregate", icon="ADD", text="")

        row = layout.row(align=True)
-        total_parts = AggregateData.data["total_parts"]
-        if total_parts == 0:
-            row.label(text="No Parts", icon="TRIA_DOWN")
-        elif total_parts == 1:
-            row.label(text="1 Part", icon="TRIA_DOWN")
-        else:
-            row.label(text=f"{total_parts} Parts", icon="TRIA_DOWN")
-
+        parts = AggregateData.data["related_objects_amount"]
+        row.label(text=f"{parts or 'No'} Part{'s' if parts > 1 else ''}", icon="TRIA_DOWN")
        if AggregateData.data["has_related_objects"]:
            op = row.operator("bim.select_parts", icon="RESTRICT_SELECT_OFF", text="")
            op.obj = context.active_object.name
@@ -60,8 +60,6 @@ class EnableEditingAttributes(bpy.types.Operator):
                new.data_type = "string"
                new.ifc_class = data["type"]
                new.string_value = "" if new.is_null else json.dumps(data[name])
-                blenderbim.bim.helper.add_attribute_description(new)
-                new.description += " The degrees, minutes and seconds should follow this format : [12,34,56]"

        blenderbim.bim.helper.import_attributes2(
            tool.Ifc.get().by_id(oprops.ifc_definition_id), props.attributes, callback=callback
@@ -54,12 +54,12 @@ def draw_ui(context, layout, obj_type, attributes):


 class BIM_PT_object_attributes(Panel):
-    bl_label = "Attributes"
+    bl_label = "IFC Attributes"
    bl_idname = "BIM_PT_object_attributes"
    bl_space_type = "PROPERTIES"
    bl_region_type = "WINDOW"
    bl_context = "object"
-    bl_parent_id = "BIM_PT_tab_object_metadata"
+    bl_parent_id = "BIM_PT_object_metadata"

    @classmethod
    def poll(cls, context):
@@ -76,7 +76,7 @@ class BIM_PT_object_attributes(Panel):


 class BIM_PT_material_attributes(Panel):
-    bl_label = "Material Attributes"
+    bl_label = "IFC Material Attributes"
    bl_idname = "BIM_PT_material_attributes"
    bl_space_type = "PROPERTIES"
    bl_region_type = "WINDOW"
@@ -26,7 +26,7 @@ class BIM_PT_augin(bpy.types.Panel):
    bl_space_type = "PROPERTIES"
    bl_region_type = "WINDOW"
    bl_context = "scene"
-    bl_parent_id = "BIM_PT_tab_sandbox"
+    bl_parent_id = "BIM_PT_integrations"

    def draw(self, context):
        layout = self.layout
@@ -57,7 +57,6 @@ classes = (
    operator.SelectBcfBimSnippetReference,
    operator.SelectBcfDocumentReference,
    operator.SelectBcfHeaderFile,
-    operator.UnloadBcfProject,
    operator.ViewBcfTopic,
    prop.BcfReferenceLink,
    prop.BcfLabel,
@@ -16,8 +16,6 @@
 # You should have received a copy of the GNU General Public License
 # along with BlenderBIM Add-on.  If not, see <http://www.gnu.org/licenses/>.

-import os
-import bpy
 import bcf
 import bcf.v2.bcfxml

@@ -25,31 +23,12 @@ import bcf.v2.bcfxml
 class BcfStore:
    bcfxml = None

-    @classmethod
-    def get_bcfxml(cls):
-        if not cls.bcfxml:
-            bcf_filepath = bpy.context.scene.BCFProperties.bcf_file
-            if not os.path.isabs(bcf_filepath):
-                bcf_filepath = os.path.abspath(os.path.join(bpy.path.abspath("//"), bcf_filepath))
-            if bcf_filepath:
-                try:
-                    cls.bcfxml = bcf.bcfxml.load(bcf_filepath)
-                except:
-                    # there will be a plenty of "Permission denied" errors
-                    # as many poll() methods will try to access the bcfxml simultaneously
-                    # the first time it's loaded
-                    pass
-        return cls.bcfxml
+    @staticmethod
+    def get_bcfxml():
+        if not BcfStore.bcfxml:
+            BcfStore.bcfxml = bcf.v2.bcfxml.BcfXml()
+        return BcfStore.bcfxml

    @classmethod
-    def set(cls, bcfxml, filepath):
+    def set(cls, bcfxml):
        cls.bcfxml = bcfxml
-        bpy.context.scene.BCFProperties.bcf_file = filepath
-
-    @classmethod
-    def set_by_filepath(cls, filepath):
-        cls.set(None, filepath)
-
-    @classmethod
-    def unload_bcfxml(cls):
-        cls.set(None, "")
@@ -42,9 +42,11 @@ class NewBcfProject(bpy.types.Operator):
    bl_options = {"REGISTER", "UNDO"}

    def execute(self, context):
+        context.scene.BCFProperties.is_loaded = False
        bcfxml = bcf.v2.bcfxml.BcfXml.create_new("New Project")
-        bcfstore.BcfStore.set(bcfxml, "")
+        bcfstore.BcfStore.set(bcfxml)
        bpy.ops.bim.load_bcf_project()
+        context.scene.BCFProperties.is_loaded = True
        return {"FINISHED"}


@@ -56,11 +58,13 @@ class LoadBcfProject(bpy.types.Operator):
    filter_glob: bpy.props.StringProperty(default="*.bcf;*.bcfzip", options={"HIDDEN"})

    def execute(self, context):
+        context.scene.BCFProperties.is_loaded = False
        if self.filepath:
-            bcfstore.BcfStore.set_by_filepath(self.filepath)
+            bcfstore.BcfStore.bcfxml = bcf.bcfxml.load(self.filepath)
        bcfxml = bcfstore.BcfStore.get_bcfxml()
        context.scene.BCFProperties.name = bcfxml.project.name
        bpy.ops.bim.load_bcf_topics()
+        context.scene.BCFProperties.is_loaded = True
        return {"FINISHED"}

    def invoke(self, context, event):
@@ -68,16 +72,6 @@ class LoadBcfProject(bpy.types.Operator):
        return {"RUNNING_MODAL"}


-class UnloadBcfProject(bpy.types.Operator):
-    bl_idname = "bim.unload_bcf_project"
-    bl_label = "Unload BCF Project"
-    bl_options = {"REGISTER", "UNDO"}
-
-    def execute(self, context):
-        bcfstore.BcfStore.unload_bcfxml()
-        return {"FINISHED"}
-
-
 class LoadBcfTopics(bpy.types.Operator):
    bl_idname = "bim.load_bcf_topics"
    bl_label = "Load BCF Topics"
@@ -263,7 +257,6 @@ class SaveBcfProject(bpy.types.Operator):
    def execute(self, context):
        bcfxml = bcfstore.BcfStore.get_bcfxml()
        bcfxml.save(self.filepath)
-        bcfstore.BcfStore.set(bcfxml, self.filepath)
        return {"FINISHED"}

    def invoke(self, context, event):
@@ -961,8 +954,7 @@ class ActivateBcfViewpoint(bpy.types.Operator):
                context_override = {}
                context_override["object"] = context_override["active_object"] = objs[0]
                context_override["selected_objects"] = context_override["selected_editable_objects"] = objs
-                with context.temp_override(**context_override):
-                    bpy.ops.object.hide_view_set(unselected=True)
+                bpy.ops.object.hide_view_set(context_override, unselected=True)
                context.area.type = old

        if viewpoint.visualization_info.components.view_setup_hints:
@@ -976,16 +968,14 @@ class ActivateBcfViewpoint(bpy.types.Operator):
            self.hide_spaces(context)
            self.set_openings_visibility(False, context)

-        # set selection at the end not to conflict with .hide_spaces
        self.set_selection(viewpoint)
        self.set_colours(viewpoint)

    def hide_spaces(self, context):
        old = context.area.type
        context.area.type = "VIEW_3D"
-        bpy.ops.object.select_all(action="DESELECT")
        bpy.ops.object.select_pattern(pattern="IfcSpace/*")
-        bpy.ops.object.hide_view_set()
+        bpy.ops.object.hide_view_set({})
        context.area.type = old

    def set_openings_visibility(self, is_visible, context):
@@ -41,37 +41,37 @@ def purge():


 def updateBcfReferenceLink(self, context):
-    if bcfstore.BcfStore.get_bcfxml():
+    if context.scene.BCFProperties.is_loaded:
        bpy.ops.bim.edit_bcf_reference_links()


 def updateBcfLabel(self, context):
-    if bcfstore.BcfStore.get_bcfxml():
+    if context.scene.BCFProperties.is_loaded:
        bpy.ops.bim.edit_bcf_labels()


 def updateBcfProjectName(self, context):
-    if bcfstore.BcfStore.get_bcfxml():
+    if self.is_loaded:
        bpy.ops.bim.edit_bcf_project_name()


 def updateBcfAuthor(self, context):
-    if bcfstore.BcfStore.get_bcfxml():
+    if self.is_loaded:
        bpy.ops.bim.edit_bcf_author()


 def updateBcfTopicName(self, context):
-    if bcfstore.BcfStore.get_bcfxml():
+    if context.scene.BCFProperties.is_loaded:
        bpy.ops.bim.edit_bcf_topic_name()


 def updateBcfTopicIsEditable(self, context):
-    if bcfstore.BcfStore.get_bcfxml() and not self.is_editable:
+    if context.scene.BCFProperties.is_loaded and not self.is_editable:
        bpy.ops.bim.edit_bcf_topic()


 def updateBcfCommentIsEditable(self, context):
-    if bcfstore.BcfStore.get_bcfxml() and not self.is_editable:
+    if context.scene.BCFProperties.is_loaded and not self.is_editable:
        bpy.ops.bim.edit_bcf_comment(comment_guid=self.name)


@@ -151,7 +151,7 @@ class BcfTopic(PropertyGroup):


 class BCFProperties(PropertyGroup):
-    bcf_file: StringProperty(name="BCF File")
+    is_loaded: BoolProperty(name="Is Loaded", default=False)
    comment_text_width: IntProperty(name="Comment Text Width", default=40)
    name: StringProperty(default="", name="Project Name", update=updateBcfProjectName)
    author: StringProperty(default="john@doe.com", name="Author Email", update=updateBcfAuthor)
@@ -29,7 +29,7 @@ class BIM_PT_bcf(Panel):
    bl_space_type = "PROPERTIES"
    bl_region_type = "WINDOW"
    bl_context = "scene"
-    bl_parent_id = "BIM_PT_tab_collaboration"
+    bl_parent_id = "BIM_PT_collaboration"

    def draw(self, context):
        layout = self.layout
@@ -39,15 +39,14 @@ class BIM_PT_bcf(Panel):
        scene = context.scene
        props = scene.BCFProperties

-        if not bcfstore.BcfStore.get_bcfxml():
-            row = layout.row(align=True)
-            row.operator("bim.new_bcf_project", text="New Project")
-            row.operator("bim.load_bcf_project", text="Load Project")
+        row = layout.row(align=True)
+        row.operator("bim.new_bcf_project", text="New Project")
+        row.operator("bim.load_bcf_project", text="Load Project")
+
+        if not props.is_loaded:
            return

-        row = layout.row(align=True)
-        row.operator("bim.save_bcf_project", icon="EXPORT", text="Save Project")
-        row.operator("bim.unload_bcf_project", text="", icon="CANCEL")
+        row.operator("bim.save_bcf_project", text="Save Project")

        row = layout.row()
        row.prop(props, "name")
@@ -27,7 +27,7 @@ class BIM_PT_qa(Panel):
    bl_space_type = "PROPERTIES"
    bl_region_type = "WINDOW"
    bl_context = "scene"
-    bl_parent_id = "BIM_PT_tab_quality_control"
+    bl_parent_id = "BIM_PT_quality_control"

    def draw(self, context):
        self.layout.use_property_split = True
@@ -20,37 +20,28 @@ import bpy
 from . import ui, operator, prop

 classes = (
-    operator.AddBoundary,
    operator.ColourByRelatedBuildingElement,
    operator.DisableEditingBoundary,
-    operator.DisableEditingBoundaryGeometry,
    operator.EditBoundaryAttributes,
-    operator.EditBoundaryGeometry,
    operator.EnableEditingBoundary,
-    operator.EnableEditingBoundaryGeometry,
-    operator.HideBoundaries,
-    operator.LoadBoundary,
    operator.LoadProjectSpaceBoundaries,
    operator.LoadSpaceBoundaries,
-    operator.SelectProjectBoundaries,
+    operator.LoadBoundary,
    operator.SelectRelatedElementBoundaries,
+    operator.SelectProjectBoundaries,
    operator.SelectRelatedElementTypeBoundaries,
    operator.SelectSpaceBoundaries,
-    operator.ShowBoundaries,
    operator.UpdateBoundaryGeometry,
    ui.BIM_PT_Boundary,
    ui.BIM_PT_SceneBoundaries,
    ui.BIM_PT_SpaceBoundaries,
    prop.BIMBoundaryProperties,
-    prop.BIMObjectBoundaryProperties,
 )


 def register():
-    bpy.types.Scene.BIMBoundaryProperties = bpy.props.PointerProperty(type=prop.BIMBoundaryProperties)
-    bpy.types.Object.bim_boundary_properties = bpy.props.PointerProperty(type=prop.BIMObjectBoundaryProperties)
+    bpy.types.Object.bim_boundary_properties = bpy.props.PointerProperty(type=prop.BIMBoundaryProperties)


 def unregister():
-    del bpy.types.Scene.BIMBoundaryProperties
    del bpy.types.Object.bim_boundary_properties
@@ -1,112 +0,0 @@
-# BlenderBIM Add-on - OpenBIM Blender Add-on
-# Copyright (C) 2023 Dion Moult <dion@thinkmoult.com>
-#
-# This file is part of BlenderBIM Add-on.
-#
-# BlenderBIM Add-on is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# BlenderBIM Add-on is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with BlenderBIM Add-on.  If not, see <http://www.gnu.org/licenses/>.
-
-import gpu
-import bmesh
-import blenderbim.tool as tool
-from bpy.types import SpaceView3D
-from mathutils import Vector
-from gpu_extras.batch import batch_for_shader
-
-
-class BoundaryDecorator:
-    installed = None
-
-    @classmethod
-    def install(cls, context):
-        if cls.installed:
-            cls.uninstall()
-        handler = cls()
-        cls.installed = SpaceView3D.draw_handler_add(handler, (context,), "WINDOW", "POST_VIEW")
-
-    @classmethod
-    def uninstall(cls):
-        try:
-            SpaceView3D.draw_handler_remove(cls.installed, "WINDOW")
-        except ValueError:
-            pass
-        cls.installed = None
-
-    def draw_batch(self, shader_type, content_pos, color, indices=None):
-        shader = self.line_shader if shader_type == "LINES" else self.shader
-        batch = batch_for_shader(shader, shader_type, {"pos": content_pos}, indices=indices)
-        shader.uniform_float("color", color)
-        batch.draw(shader)
-
-    def __call__(self, context):
-        self.addon_prefs = context.preferences.addons["blenderbim"].preferences
-        selected_elements_color = self.addon_prefs.decorator_color_selected
-        unselected_elements_color = self.addon_prefs.decorator_color_unselected
-        special_elements_color = self.addon_prefs.decorator_color_special
-
-        def transparent_color(color, alpha=0.1):
-            color = [i for i in color]
-            color[3] = alpha
-            return color
-
-        gpu.state.point_size_set(6)
-        gpu.state.blend_set("ALPHA")
-
-        self.line_shader = gpu.shader.from_builtin("POLYLINE_UNIFORM_COLOR")
-        self.line_shader.bind()  # required to be able to change uniforms of the shader
-        # POLYLINE_UNIFORM_COLOR specific uniforms
-        self.line_shader.uniform_float("viewportSize", (context.region.width, context.region.height))
-        self.line_shader.uniform_float("lineWidth", 2.0)
-
-        # general shader
-        self.shader = gpu.shader.from_builtin("UNIFORM_COLOR")
-
-        selected_vertices = []
-        selected_edges = []
-        selected_tris = []
-        unselected_vertices = []
-        unselected_edges = []
-        unselected_tris = []
-
-        for boundary in context.scene.BIMBoundaryProperties.boundaries:
-            obj = boundary.obj
-            if not obj or not obj.data:  # A boundary may not have data if it has no connection geometry
-                continue
-
-            if obj.mode == "EDIT":
-                continue  # A profile decorator or something else is used here.
-            else:
-                bm = bmesh.new()
-                bm.from_mesh(obj.data)
-                obj.data.calc_loop_triangles()
-
-                if obj.select_get():
-                    offset = len(selected_vertices)
-                    selected_vertices.extend([tuple(obj.matrix_world @ v.co) for v in bm.verts])
-                    selected_edges.extend([tuple([v.index + offset for v in e.verts]) for e in bm.edges])
-                    selected_tris.extend([tuple([i + offset for i in t.vertices]) for t in obj.data.loop_triangles])
-                else:
-                    offset = len(unselected_vertices)
-                    unselected_vertices.extend([tuple(obj.matrix_world @ v.co) for v in bm.verts])
-                    unselected_edges.extend([tuple([v.index + offset for v in e.verts]) for e in bm.edges])
-                    unselected_tris.extend([tuple([i + offset for i in t.vertices]) for t in obj.data.loop_triangles])
-
-            if obj.mode != "EDIT":
-                bm.free()
-
-        if unselected_edges:
-            self.draw_batch("LINES", unselected_vertices, special_elements_color, unselected_edges)
-            self.draw_batch("TRIS", unselected_vertices, transparent_color(special_elements_color), unselected_tris)
-        if selected_edges:
-            self.draw_batch("LINES", selected_vertices, selected_elements_color, selected_edges)
-            self.draw_batch("TRIS", selected_vertices, transparent_color(selected_elements_color), selected_tris)
@@ -18,29 +18,18 @@

 import bpy
 import bmesh
-import logging
-import shapely
 import mathutils
-import numpy as np
-import multiprocessing
+import logging
 import ifcopenshell.api
-import ifcopenshell.util.unit
-import ifcopenshell.util.shape
-import ifcopenshell.util.element
 import ifcopenshell.util.placement
-import ifcopenshell.util.representation
+import ifcopenshell.util.unit
 import blenderbim.tool as tool
-import blenderbim.bim.import_ifc as import_ifc
-from math import pi, inf, degrees, acos, radians
-from mathutils import Vector, Matrix
 from blenderbim.bim.ifc import IfcStore
-from blenderbim.bim.module.model.decorator import ProfileDecorator
-from blenderbim.bim.module.boundary.decorator import BoundaryDecorator
-import blenderbim.core
+import blenderbim.bim.import_ifc as import_ifc


 def get_boundaries_collection(blender_space):
-    space_collection = blender_space.BIMObjectProperties.collection
+    space_collection = bpy.data.collections.get(blender_space.name, blender_space.users_collection[0])
    collection_name = f"Boundaries/{blender_space.BIMObjectProperties.ifc_definition_id}"
    boundaries_collection = space_collection.children.get(collection_name)
    if not boundaries_collection:
@@ -49,23 +38,8 @@ def get_boundaries_collection(blender_space):
    return boundaries_collection


-def disable_editing_boundary_geometry(context):
-    ProfileDecorator.uninstall()
-    bpy.ops.object.mode_set(mode="OBJECT")
-
-    obj = context.active_object
-    element = tool.Ifc.get_entity(obj)
-
-    old_mesh = obj.data
-    loader = Loader()
-    obj.data = loader.create_mesh(element)
-    tool.Geometry.delete_data(old_mesh)
-    return {"FINISHED"}
-
-
 class Loader:
-    def __init__(self, operator=None):
-        self.operator = operator
+    def __init__(self):
        self.ifc_file = None
        self.logger = None
        self.ifc_importer = None
@@ -87,33 +61,14 @@ class Loader:
            tool.Loader.link_mesh(shape, mesh)
        except RuntimeError:
            # Fallback solution for invalid geometry provided by Revit. (InnerBoundaries cuting OuterBoundary)
-            self.operator.report(
-                {"WARNING"},
-                (
-                    f"IfcRelSpaceBoundary {boundary.id()} mesh creation failed. Geometry might be invalid. Using fallback solution"
-                ),
-            )
-            try:
-                shape = ifcopenshell.geom.create_shape(self.fallback_settings, surface.OuterBoundary)
-            except RuntimeError:
-                self.operator.report(
-                    {"WARNING"},
-                    f"Skipping IfcRelSpaceBoundary {boundary.id()}. Fallback solution failed. Geometry might be invalid",
-                )
-                return None
+            print(f"Failed to create mesh from IfcRelSpaceBoundary with ID {boundary.id()}. Geometry might be invalid")
+            shape = ifcopenshell.geom.create_shape(self.fallback_settings, surface.OuterBoundary)
            mesh = bpy.data.meshes.new(str(surface.id()))
            bm = bmesh.new()
            verts = [bm.verts.new(shape.verts[i : i + 3]) for i in range(0, len(shape.verts), 3)]
            bm.faces.new(verts)
            for inner_boundary in surface.InnerBoundaries:
-                try:
-                    shape = ifcopenshell.geom.create_shape(self.fallback_settings, inner_boundary)
-                except RuntimeError:
-                    self.operator.report(
-                        {"WARNING"},
-                        f"Skipping an inner boundary for IfcRelSpaceBoundary with ID {boundary.id()}. Geometry might be invalid",
-                    )
-                    return None
+                shape = ifcopenshell.geom.create_shape(self.fallback_settings, inner_boundary)
                verts = [bm.verts.new(shape.verts[i : i + 3]) for i in range(0, len(shape.verts), 3)]
                for i in range(len(verts) - 1):
                    bm.edges.new(verts[i : i + 2])
@@ -125,7 +80,9 @@ class Loader:
            matrix = mathutils.Matrix(
                ifcopenshell.util.placement.get_axis2placement(surface.BasisSurface.Position).tolist()
            )
-            matrix.translation *= unit_scale
+            matrix[0][3] *= unit_scale
+            matrix[1][3] *= unit_scale
+            matrix[2][3] *= unit_scale
            mesh.transform(matrix)
        return mesh

@@ -147,15 +104,7 @@ class Loader:
        self.ifc_importer = import_ifc.IfcImporter(ifc_import_settings)
        self.ifc_importer.file = self.ifc_file

-    def load_boundary(self, boundary, blender_space=None):
-        if not blender_space:
-            if not boundary.RelatingSpace:
-                self.operator.report(
-                    {"WARNING"},
-                    f"Skipping IfcRelSpaceBoundary {boundary.id()} which have no relating space. Invalid boundary.",
-                )
-                return
-            blender_space = tool.Ifc.get_object(boundary.RelatingSpace)
+    def load_boundary(self, boundary, blender_space):
        obj = tool.Ifc.get_object(boundary)
        if obj:
            return obj
@@ -174,9 +123,9 @@ class LoadProjectSpaceBoundaries(bpy.types.Operator):
    bl_options = {"REGISTER", "UNDO"}

    def execute(self, context):
-        loader = Loader(self)
+        loader = Loader()
        for rel in tool.Ifc.get().by_type("IfcRelSpaceBoundary"):
-            loader.load_boundary(rel)
+            loader.load_boundary(rel, tool.Ifc.get_object(rel.RelatingSpace))
        return {"FINISHED"}


@@ -187,7 +136,7 @@ class LoadBoundary(bpy.types.Operator):
    boundary_id: bpy.props.IntProperty()

    def execute(self, context):
-        loader = Loader(self)
+        loader = Loader()
        for obj in context.visible_objects:
            obj.select_set(False)
        obj = loader.load_boundary(tool.Ifc.get().by_id(self.boundary_id), context.active_object)
@@ -202,7 +151,7 @@ class LoadSpaceBoundaries(bpy.types.Operator):
    bl_options = {"REGISTER", "UNDO"}

    def execute(self, context):
-        loader = Loader(self)
+        loader = Loader()
        element = tool.Ifc.get_entity(context.active_object)
        for rel in element.BoundedBy or []:
            loader.load_boundary(rel, context.active_object)
@@ -427,640 +376,3 @@ class UpdateBoundaryGeometry(bpy.types.Operator):
        settings = tool.Boundary.get_assign_connection_geometry_settings(context.active_object)
        ifcopenshell.api.run("boundary.assign_connection_geometry", tool.Ifc.get(), **settings)
        return {"FINISHED"}
-
-
-class EnableEditingBoundaryGeometry(bpy.types.Operator, tool.Ifc.Operator):
-    bl_idname = "bim.enable_editing_boundary_geometry"
-    bl_label = "Enable Editing Boundary Geometry"
-    bl_options = {"REGISTER", "UNDO"}
-
-    @classmethod
-    def poll(cls, context):
-        return context.selected_objects
-
-    def _execute(self, context):
-        self.unit_scale = ifcopenshell.util.unit.calculate_unit_scale(tool.Ifc.get())
-        obj = context.active_object
-        element = tool.Ifc.get_entity(obj)
-
-        if element.ConnectionGeometry.is_a("IfcConnectionSurfaceGeometry"):
-            surface = element.ConnectionGeometry.SurfaceOnRelatingElement
-            tool.Model.import_surface(surface, obj)
-
-        bpy.ops.object.mode_set(mode="EDIT")
-        ProfileDecorator.install(context, exit_edit_mode_callback=lambda: disable_editing_boundary_geometry(context))
-        if not bpy.app.background:
-            tool.Blender.set_viewport_tool("bim.cad_tool")
-        return {"FINISHED"}
-
-
-class EditBoundaryGeometry(bpy.types.Operator, tool.Ifc.Operator):
-    bl_idname = "bim.edit_boundary_geometry"
-    bl_label = "Edit Boundary Geometry"
-    bl_options = {"REGISTER", "UNDO"}
-
-    def _execute(self, context):
-        self.unit_scale = ifcopenshell.util.unit.calculate_unit_scale(tool.Ifc.get())
-        ProfileDecorator.uninstall()
-        bpy.ops.object.mode_set(mode="OBJECT")
-
-        obj = context.active_object
-        element = tool.Ifc.get_entity(obj)
-
-        if element.ConnectionGeometry.is_a("IfcConnectionSurfaceGeometry"):
-            surface = tool.Model.export_surface(obj)
-
-            if not surface:
-
-                def msg(self, context):
-                    self.layout.label(text="INVALID PROFILE")
-
-                bpy.context.window_manager.popup_menu(msg, title="Error", icon="ERROR")
-                ProfileDecorator.install(
-                    context, exit_edit_mode_callback=lambda: disable_editing_boundary_geometry(context)
-                )
-                bpy.ops.object.mode_set(mode="EDIT")
-                return
-
-            old_surface = element.ConnectionGeometry.SurfaceOnRelatingElement
-            for inverse in tool.Ifc.get().get_inverse(old_surface):
-                ifcopenshell.util.element.replace_attribute(inverse, old_surface, surface)
-            ifcopenshell.util.element.remove_deep2(tool.Ifc.get(), old_surface)
-
-            old_mesh = obj.data
-            loader = Loader(self)
-            obj.data = loader.create_mesh(element)
-            tool.Geometry.delete_data(old_mesh)
-
-
-class DisableEditingBoundaryGeometry(bpy.types.Operator, tool.Ifc.Operator):
-    bl_idname = "bim.disable_editing_boundary_geometry"
-    bl_label = "Disable Editing Boundary Geometry"
-    bl_options = {"REGISTER", "UNDO"}
-
-    @classmethod
-    def poll(cls, context):
-        return context.selected_objects
-
-    def _execute(self, context):
-        return disable_editing_boundary_geometry(context)
-
-
-class ShowBoundaries(bpy.types.Operator, tool.Ifc.Operator):
-    bl_idname = "bim.show_boundaries"
-    bl_label = "Show Boundaries"
-    bl_options = {"REGISTER", "UNDO"}
-
-    def _execute(self, context):
-        props = bpy.context.scene.BIMBoundaryProperties
-        loader = Loader(self)
-        for obj in context.selected_objects:
-            element = tool.Ifc.get_entity(obj)
-            if not element or not getattr(element, "BoundedBy", None):
-                continue
-            if tool.Ifc.is_moved(obj):
-                blenderbim.core.geometry.edit_object_placement(tool.Ifc, tool.Geometry, tool.Surveyor, obj=obj)
-            element = tool.Ifc.get_entity(obj)
-            for rel in element.BoundedBy or []:
-                boundary_obj = loader.load_boundary(rel, obj)
-                tool.Boundary.decorate_boundary(boundary_obj)
-        BoundaryDecorator.install(bpy.context)
-        return {"FINISHED"}
-
-
-class HideBoundaries(bpy.types.Operator, tool.Ifc.Operator):
-    bl_idname = "bim.hide_boundaries"
-    bl_label = "Hide Boundaries"
-    bl_options = {"REGISTER", "UNDO"}
-
-    def _execute(self, context):
-        to_delete = set()
-        spaces = set()
-        for obj in context.selected_objects:
-            element = tool.Ifc.get_entity(obj)
-            if not element:
-                continue
-            if element.is_a("IfcSpace"):
-                spaces.add(element)
-            elif element.is_a("IfcRelSpaceBoundary"):
-                spaces.add(element.RelatingSpace)
-
-        for element in spaces:
-            for boundary in element.BoundedBy or []:
-                boundary_obj = tool.Ifc.get_object(boundary)
-                if boundary_obj:
-                    to_delete.add(boundary_obj)
-        for boundary_obj in to_delete:
-            tool.Ifc.unlink(obj=boundary_obj)
-            bpy.data.objects.remove(boundary_obj)
-        context.scene.BIMBoundaryProperties.boundaries.clear()
-        return {"FINISHED"}
-
-
-class AddBoundary(bpy.types.Operator, tool.Ifc.Operator):
-    bl_idname = "bim.add_boundary"
-    bl_label = "Add Boundary"
-    bl_options = {"REGISTER", "UNDO"}
-
-    def _execute(self, context):
-        relating_space = None
-        related_building_element = None
-        relating_space_obj = None
-        related_building_element_obj = None
-        parent_boundaries = []
-
-        objs = context.selected_objects
-        if len(objs) == 2:
-            # The user may select two objects, a space and its related building element
-            for obj in objs:
-                element = tool.Ifc.get_entity(obj)
-                if not element:
-                    continue
-                if element.is_a("IfcSpace"):
-                    relating_space = element
-                    relating_space_obj = obj
-                else:
-                    related_building_element = element
-                    related_building_element_obj = obj
-            parent_boundary = self.create_element_boundary(
-                context, relating_space, relating_space_obj, related_building_element, related_building_element_obj
-            )
-            if parent_boundary:
-                parent_boundaries.append(parent_boundary)
-        elif len(objs) == 1:
-            # New prototype, old code not yet removed. Still testing.
-            space = tool.Ifc.get_entity(objs[0])
-            if space.is_a("IfcSpace"):
-                self.auto_generate_boundaries(space, objs[0])
-        elif len(objs) == 1:
-            # Optionally the user may select just the space, and the building element shall be auto-detected
-            # TODO : refactor to be able to generate all boundaries for selected space automatically or with an option
-
-            def msg(self, context):
-                self.layout.label(text="NO ACTIVE STOREY")
-
-            element = tool.Ifc.get_entity(objs[0])
-            if element.is_a("IfcSpace"):
-                relating_space = element
-                relating_space_obj = objs[0]
-
-            collection = context.view_layer.active_layer_collection.collection
-            collection_obj = bpy.data.objects.get(collection.name)
-            if not collection_obj:
-                bpy.context.window_manager.popup_menu(msg, title="Error", icon="ERROR")
-                return
-            spatial_element = tool.Ifc.get_entity(collection_obj)
-            if not spatial_element:
-                bpy.context.window_manager.popup_menu(msg, title="Error", icon="ERROR")
-                return
-
-            for subelement in ifcopenshell.util.element.get_decomposition(spatial_element):
-                if not (
-                    subelement.is_a("IfcWall") or subelement.is_a("IfcSlab") or subelement.is_a("IfcVirtualElement")
-                ):
-                    continue
-                obj = tool.Ifc.get_object(subelement)
-                if obj:
-                    related_building_element = subelement
-                    related_building_element_obj = obj
-                    parent_boundary = self.create_element_boundary(
-                        context,
-                        relating_space,
-                        relating_space_obj,
-                        related_building_element,
-                        related_building_element_obj,
-                    )
-                    if parent_boundary:
-                        parent_boundaries.append(parent_boundary)
-
-        bpy.ops.bim.show_boundaries()
-        for parent_boundary in parent_boundaries:
-            obj = tool.Ifc.get_object(parent_boundary)
-            obj.select_set(True)
-
-    def auto_generate_boundaries(self, space, space_obj):
-        # Identify all potential building elements
-        # TODO: don't select everything, use AABB culling in Blender
-        building_elements = (
-            tool.Ifc.get().by_type("IfcWall")
-            + tool.Ifc.get().by_type("IfcSlab")
-            + tool.Ifc.get().by_type("IfcVirtualElement")
-        )
-
-        # Don't generate boundaries of building elements that we've already got bounaries for.
-        for boundary in space.BoundedBy:
-            if boundary.RelatedBuildingElement in building_elements:
-                building_elements.remove(boundary.RelatedBuildingElement)
-
-        # Create tree of gross shapes of all potential related building elements
-        include = building_elements + [space]
-        tree = ifcopenshell.geom.tree()
-        shapes = {}
-        settings = ifcopenshell.geom.settings()
-        settings.set(settings.STRICT_TOLERANCE, True)
-        settings.set(settings.DISABLE_OPENING_SUBTRACTIONS, True)
-        iterator = ifcopenshell.geom.iterator(settings, tool.Ifc.get(), multiprocessing.cpu_count(), include=include)
-        if iterator.initialize():
-            while True:
-                tree.add_element(iterator.get_native())
-                shape = iterator.get()
-                shapes[shape.id] = shape
-                if not iterator.next():
-                    break
-
-        # Spatially query all potential boundary elements via a 100mm extension of the space
-        building_elements = [e for e in tree.select(space, extend=0.1) if e != space]
-
-        if not building_elements:
-            return
-
-        # Create a dissolved bmesh for the space
-        space_bm = bmesh.new()
-        space_bm.from_mesh(space_obj.data)
-        bmesh.ops.dissolve_limit(space_bm, angle_limit=pi * 2 / 360, verts=space_bm.verts, edges=space_bm.edges)
-
-        # Create dissolved bmeshes for all boundary elements
-        building_element_bms = {}
-        for building_element in building_elements:
-            bm = bmesh.new()
-            shape = shapes[building_element.id()]
-
-            verts = ifcopenshell.util.shape.get_vertices(shape.geometry)
-            for vert in verts:
-                bm.verts.new(Vector(vert))
-            bm.verts.ensure_lookup_table()
-
-            faces = ifcopenshell.util.shape.get_faces(shape.geometry)
-            for face in faces:
-                bm.faces.new([bm.verts[i] for i in face])
-            bm.verts.ensure_lookup_table()
-            bm.faces.ensure_lookup_table()
-            bm.normal_update()  # Needed so that dissolve_limit will work.
-            bmesh.ops.dissolve_limit(bm, angle_limit=radians(1), verts=bm.verts[:], edges=bm.edges[:])
-            bm.verts.ensure_lookup_table()
-            bm.faces.ensure_lookup_table()
-            building_element_bms[building_element.id()] = bm
-
-        # Compare space faces and building element faces to see if they relate to one another
-        for space_face in space_bm.faces:
-            space_face_normal = space_obj.matrix_world.to_3x3() @ space_face.normal
-            space_face_vert = space_obj.matrix_world @ space_face.verts[0].co
-            for building_element in building_elements:
-                for face in building_element_bms[building_element.id()].faces:
-                    building_obj = tool.Ifc.get_object(building_element)
-                    face_normal = building_obj.matrix_world.to_3x3() @ face.normal
-                    angle = degrees(acos(max(min(space_face_normal.dot(face_normal), 1), -1)))
-                    if tool.Cad.is_x(angle, 180, tolerance=2):
-                        pass  # Faces need to be parallel and have opposite normals to be related.
-                    elif building_element.is_a("IfcVirtualElement") and tool.Cad.is_x(angle, 0, tolerance=2):
-                        pass  # Virtual elements only need to be parallel to be related, since they are planes.
-                    else:
-                        continue
-
-                    # Both faces should be close to one another. Say within 50mm.
-                    space_vert = building_obj.matrix_world.inverted() @ space_face_vert
-                    dist = mathutils.geometry.distance_point_to_plane(space_vert, face.verts[0].co, face.normal)
-                    if abs(dist) > 0.05:
-                        continue
-
-                    # Project the building element face onto the space face
-                    space_face_verts = [v.co.copy() for v in space_face.verts]
-                    space_face_matrix = self.get_face_matrix(*[v.copy() for v in space_face_verts[0:3]])
-                    space_face_matrix_i = space_face_matrix.inverted()
-
-                    space_face_polygon = shapely.Polygon(
-                        [tuple((space_face_matrix_i @ v).xy) for v in space_face_verts]
-                    )
-
-                    space_matrix_world_i = space_obj.matrix_world.inverted()
-                    face_verts = [space_matrix_world_i @ building_obj.matrix_world @ v.co.copy() for v in face.verts]
-                    face_polygon = shapely.Polygon([tuple((space_face_matrix_i @ v).xy) for v in face_verts])
-
-                    gross_boundary_polygon = space_face_polygon.intersection(face_polygon)
-
-                    if type(gross_boundary_polygon) == shapely.GeometryCollection:
-                        for geom in gross_boundary_polygon.geoms:
-                            if type(geom) == shapely.Polygon:
-                                gross_boundary_polygon = geom
-                                break
-
-                    if (
-                        not (isinstance(gross_boundary_polygon, shapely.Polygon) and gross_boundary_polygon.is_valid)
-                        or gross_boundary_polygon.is_empty
-                    ):
-                        continue
-
-                    # The gross boundary polygon may not be a true gross boundary since it
-                    # may have openings already removed, such as in IFC4 Reference View. So
-                    # we cheat by using the exterior boundary to mean "gross".
-                    exterior_boundary_polygon = shapely.Polygon(gross_boundary_polygon.exterior.coords)
-
-                    parent_boundary = tool.Ifc.run(
-                        "root.create_entity", ifc_class=bpy.context.scene.BIMModelProperties.boundary_class
-                    )
-                    if building_element.is_a("IfcVirtualElement"):
-                        parent_boundary.PhysicalOrVirtualBoundary = "VIRTUAL"
-                    else:
-                        parent_boundary.PhysicalOrVirtualBoundary = "PHYSICAL"
-                    parent_boundary.InternalOrExternalBoundary = "NOTDEFINED"
-                    if building_element.is_a("IfcWall"):
-                        is_external = ifcopenshell.util.element.get_pset(
-                            building_element, "Pset_WallCommon", "IsExternal"
-                        )
-                        if is_external is True:
-                            parent_boundary.InternalOrExternalBoundary = "EXTERNAL"
-                        elif is_external is False:
-                            parent_boundary.InternalOrExternalBoundary = "INTERNAL"
-                    elif building_element.is_a("IfcSlab"):
-                        predefined_type = ifcopenshell.util.element.get_predefined_type(building_element)
-                        if predefined_type == "BASESLAB":
-                            parent_boundary.InternalOrExternalBoundary = "EXTERNAL_EARTH"
-                        else:
-                            is_external = ifcopenshell.util.element.get_pset(
-                                building_element, "Pset_SlabCommon", "IsExternal"
-                            )
-                            if is_external is True:
-                                parent_boundary.InternalOrExternalBoundary = "EXTERNAL"
-                            elif is_external is False:
-                                parent_boundary.InternalOrExternalBoundary = "INTERNAL"
-                    parent_boundary.RelatingSpace = space
-                    parent_boundary.RelatedBuildingElement = building_element
-                    parent_boundary.ConnectionGeometry = self.create_connection_geometry_from_polygon(
-                        exterior_boundary_polygon, space_face_matrix
-                    )
-                    self.set_boundary_name(parent_boundary)
-
-                    for rel in getattr(building_element, "HasOpenings", []):
-                        opening = rel.RelatedOpeningElement
-                        filling = opening.HasFillings[0].RelatedBuildingElement if opening.HasFillings else None
-
-                        # Create shape of opening as a dissolved BMesh
-                        settings = ifcopenshell.geom.settings()
-                        settings.set(settings.STRICT_TOLERANCE, True)
-                        shape = ifcopenshell.geom.create_shape(settings, opening)
-                        m = shape.transformation.matrix.data
-                        mat = Matrix(
-                            (
-                                [m[0], m[3], m[6], m[9]],
-                                [m[1], m[4], m[7], m[10]],
-                                [m[2], m[5], m[8], m[11]],
-                                [0, 0, 0, 1],
-                            )
-                        )
-                        opening_bm = bmesh.new()
-                        verts = ifcopenshell.util.shape.get_vertices(shape.geometry)
-                        for vert in verts:
-                            opening_bm.verts.new(Vector(vert))
-                        opening_bm.verts.ensure_lookup_table()
-                        faces = ifcopenshell.util.shape.get_faces(shape.geometry)
-                        for face in faces:
-                            opening_bm.faces.new([opening_bm.verts[i] for i in face])
-                        opening_bm.verts.ensure_lookup_table()
-                        opening_bm.faces.ensure_lookup_table()
-                        opening_bm.normal_update()  # Needed so that dissolve_limit will work.
-                        bmesh.ops.dissolve_limit(
-                            opening_bm, angle_limit=radians(1), verts=opening_bm.verts[:], edges=opening_bm.edges[:]
-                        )
-                        opening_bm.verts.ensure_lookup_table()
-                        opening_bm.faces.ensure_lookup_table()
-
-                        # Get relevant faces of BMesh that can turn into boundaries
-                        opening_polygons = []
-                        for opening_face in opening_bm.faces:
-                            opening_face_normal = mat.to_3x3() @ opening_face.normal
-                            angle = degrees(acos(max(min(opening_face_normal.dot(face_normal), 1), -1)))
-                            if not tool.Cad.is_x(angle, 180, tolerance=2):
-                                continue  # Any non-parallel faces are not relevant
-                            opening_face_verts = [space_matrix_world_i @ mat @ v.co.copy() for v in opening_face.verts]
-                            polygon = shapely.Polygon([tuple((space_face_matrix_i @ v).xy) for v in opening_face_verts])
-                            opening_polygons.append(polygon)
-
-                        # Merge them all into a single opening polygon for our boundary
-                        opening_polygon = shapely.ops.unary_union(opening_polygons)
-
-                        # Only openings that are projected onto our exterior boundary are relevant.
-                        if opening_polygon.intersection(exterior_boundary_polygon).area == 0:
-                            continue
-
-                        boundary = tool.Ifc.run(
-                            "root.create_entity", ifc_class=bpy.context.scene.BIMModelProperties.boundary_class
-                        )
-                        boundary.RelatingSpace = space
-                        boundary.RelatedBuildingElement = filling or opening
-                        boundary.ConnectionGeometry = self.create_connection_geometry_from_polygon(
-                            opening_polygon, space_face_matrix
-                        )
-                        if filling:
-                            boundary.PhysicalOrVirtualBoundary = "PHYSICAL"
-                        else:
-                            boundary.PhysicalOrVirtualBoundary = "VIRTUAL"
-                        boundary.InternalOrExternalBoundary = parent_boundary.InternalOrExternalBoundary
-                        if boundary.is_a() != "IfcRelSpaceBoundary":
-                            boundary.ParentBoundary = parent_boundary
-                        self.set_boundary_name(boundary)
-
-    def create_element_boundary(
-        self, context, relating_space, relating_space_obj, related_building_element, related_building_element_obj
-    ):
-        if not relating_space or not related_building_element:
-            return
-
-        # Find which face on space should be bounded to related building element
-        # TODO: Handle round wall where multiple faces need to be bound to the same related building element
-        bm = bmesh.new()
-        bm.from_mesh(relating_space_obj.data)
-        bmesh.ops.dissolve_limit(bm, angle_limit=pi * 2 / 360, verts=bm.verts, edges=bm.edges)
-
-        target_distance = inf
-        target_face = None
-        for face in bm.faces:
-            centroid = relating_space_obj.matrix_world @ face.calc_center_median()
-            raycast = related_building_element_obj.closest_point_on_mesh(
-                related_building_element_obj.matrix_world.inverted() @ centroid, distance=1
-            )
-            if raycast[0]:
-                distance = (related_building_element_obj.matrix_world @ raycast[1] - centroid).length
-                if distance < target_distance:
-                    target_face = face
-                    target_distance = distance
-
-        if not target_face:
-            return
-
-        # Is this right? Or should I use loop?
-        target_face_verts = [v.co.copy() for v in target_face.verts]
-        target_face_matrix = self.get_face_matrix(*[v.copy() for v in target_face_verts[0:3]])
-        target_face_matrix_i = target_face_matrix.inverted()
-
-        target_face_polygon = shapely.Polygon([tuple((target_face_matrix_i @ v).xy) for v in target_face_verts])
-
-        related_building_element_polygon = self.get_flattened_polygon(
-            related_building_element, relating_space_obj, target_face_matrix_i
-        )
-
-        gross_boundary_polygon = target_face_polygon.intersection(related_building_element_polygon)
-
-        if type(gross_boundary_polygon) == shapely.GeometryCollection:
-            for geom in gross_boundary_polygon.geoms:
-                if type(geom) == shapely.Polygon:
-                    gross_boundary_polygon = geom
-                    break
-
-        if (
-            not (isinstance(gross_boundary_polygon, shapely.Polygon) and gross_boundary_polygon.is_valid)
-            or gross_boundary_polygon.is_empty
-        ):
-            return
-
-        parent_boundary = tool.Ifc.run("root.create_entity", ifc_class=context.scene.BIMModelProperties.boundary_class)
-        parent_boundary.PhysicalOrVirtualBoundary = "PHYSICAL"
-        # Set to EXTERNAL by default and turn later to internal if there is a corresponding boundary relating to an
-        # internal space
-        parent_boundary.InternalOrExternalBoundary = "EXTERNAL"
-
-        # The gross boundary polygon may not be a true gross boundary since it
-        # may have openings already removed, such as in IFC4 Reference View. So
-        # we cheat by using the exterior boundary to mean "gross". Later, we
-        # can use this to check whether or not the opening is relevant to our
-        # space.
-        exterior_boundary_polygon = shapely.Polygon(gross_boundary_polygon.exterior.coords)
-
-        inner_boundaries = []
-
-        for rel in getattr(related_building_element, "HasOpenings", []):
-            opening = rel.RelatedOpeningElement
-            if not opening.HasFillings:
-                continue
-            # TODO: HasFilling is a zero to many relationship. How to handle many ?
-            filling = opening.HasFillings[0].RelatedBuildingElement
-
-            opening_polygon = self.get_flattened_polygon(opening, relating_space_obj, target_face_matrix_i)
-
-            # An inner boundary is supposed to overlap its parent boundary according to IFC4 documentation
-            # so we extend our exterior boundary with all opening which has a filling
-            # Also see Implementation aggreement SB 1.1 for IFC 2x3 TC1 Space Boundary Addon View
-            # https://standards.buildingsmart.org/MVD/RELEASE/IFC2x3/TC1/SB1_1/IFC%20Space%20Boundary%20Implementation%20Agreement%20Addendum%202010-03-22.pdf
-            unionised_object = exterior_boundary_polygon.union(opening_polygon)
-            if isinstance(unionised_object, shapely.Polygon):
-                exterior_boundary_polygon = unionised_object
-
-            # Only openings that are projected onto our exterior boundary are relevant.
-            if opening_polygon.intersection(exterior_boundary_polygon).area == 0:
-                continue
-
-            connection_geometry = self.create_connection_geometry_from_polygon(opening_polygon, target_face_matrix)
-            boundary = tool.Ifc.run("root.create_entity", ifc_class=context.scene.BIMModelProperties.boundary_class)
-            boundary.RelatingSpace = relating_space
-            boundary.RelatedBuildingElement = filling
-            boundary.ConnectionGeometry = connection_geometry
-            if related_building_element.is_a("IfcVirtualElement"):
-                boundary.PhysicalOrVirtualBoundary = "VIRTUAL"
-            else:
-                boundary.PhysicalOrVirtualBoundary = "PHYSICAL"
-            boundary.InternalOrExternalBoundary = parent_boundary.InternalOrExternalBoundary
-            self.set_boundary_name(boundary)
-            if boundary.is_a("IfcRelSpaceBoundary2ndLevel"):
-                boundary.ParentBoundary = parent_boundary
-
-        connection_geometry = self.create_connection_geometry_from_polygon(
-            exterior_boundary_polygon, target_face_matrix
-        )
-        parent_boundary.RelatingSpace = relating_space
-        parent_boundary.RelatedBuildingElement = related_building_element
-        parent_boundary.ConnectionGeometry = connection_geometry
-        self.set_boundary_name(parent_boundary)
-        return parent_boundary
-
-    def get_face_matrix(self, p1, p2, p3):
-        edge1 = p2 - p1
-        edge2 = p3 - p1
-        normal = edge1.cross(edge2)
-        z_axis = normal.normalized()
-        x_axis = p2 - p1
-        x_axis.normalize()
-        y_axis = z_axis.cross(x_axis)
-
-        mat = Matrix()
-        mat.col[0][:3] = x_axis
-        mat.col[1][:3] = y_axis
-        mat.col[2][:3] = z_axis
-        mat.translation = p1
-
-        return mat
-
-    def get_flattened_polygon(self, element, relating_space_obj, target_face_matrix_i):
-        obj = tool.Ifc.get_object(element)
-        if obj and tool.Ifc.is_moved(obj):
-            blenderbim.core.geometry.edit_object_placement(tool.Ifc, tool.Geometry, tool.Surveyor, obj=obj)
-
-        space_matrix_i = relating_space_obj.matrix_world.inverted()
-
-        settings = ifcopenshell.geom.settings()
-        if not element.is_a("IfcOpeningElement"):
-            settings.set(settings.DISABLE_OPENING_SUBTRACTIONS, True)
-        settings.set(settings.STRICT_TOLERANCE, True)
-        # geometry = ifcopenshell.geom.create_shape(settings, body)
-        shape = ifcopenshell.geom.create_shape(settings, element)
-        m = shape.transformation.matrix.data
-        mat = Matrix(([m[0], m[3], m[6], m[9]], [m[1], m[4], m[7], m[10]], [m[2], m[5], m[8], m[11]], [0, 0, 0, 1]))
-        verts = [space_matrix_i @ mat @ Vector(v) for v in ifcopenshell.util.shape.get_vertices(shape.geometry)]
-        faces = ifcopenshell.util.shape.get_faces(shape.geometry)
-        polygons = []
-        for face in faces:
-            polygon = shapely.Polygon([tuple((target_face_matrix_i @ verts[vi]).xy) for vi in face])
-            polygons.append(polygon)
-        return shapely.ops.unary_union(polygons)
-
-    def create_connection_geometry_from_polygon(self, polygon, target_face_matrix):
-        surface = self.export_surface(polygon, target_face_matrix)
-        return tool.Ifc.get().createIfcConnectionSurfaceGeometry(surface)
-
-    def export_surface(self, polygon, target_face_matrix):
-        x_axis = target_face_matrix.col[0][:3]
-        z_axis = target_face_matrix.col[2][:3]
-        p1 = target_face_matrix.translation
-
-        self.unit_scale = ifcopenshell.util.unit.calculate_unit_scale(tool.Ifc.get())
-        tool.Model.unit_scale = self.unit_scale
-
-        surface = tool.Ifc.get().createIfcCurveBoundedPlane()
-        surface.BasisSurface = tool.Ifc.get().createIfcPlane(
-            tool.Ifc.get().createIfcAxis2Placement3D(
-                tool.Ifc.get().createIfcCartesianPoint([o / self.unit_scale for o in p1]),
-                tool.Ifc.get().createIfcDirection([float(o) for o in z_axis]),
-                tool.Ifc.get().createIfcDirection([float(o) for o in x_axis]),
-            )
-        )
-
-        if tool.Ifc.get().schema != "IFC2X3":
-            points = [tool.Model.convert_si_to_unit(list(co)) for co in polygon.exterior.coords]
-            point_list = tool.Ifc.get().createIfcCartesianPointList2D(points)
-            outer_boundary = tool.Ifc.get().createIfcIndexedPolyCurve(point_list, None, False)
-
-            inner_boundaries = []
-            for interior in polygon.interiors:
-                points = [tool.Model.convert_si_to_unit(list(co)) for co in interior.coords]
-                point_list = tool.Ifc.get().createIfcCartesianPointList2D(points)
-                inner_boundaries.append(tool.Ifc.get().createIfcIndexedPolyCurve(point_list, None, False))
-        else:
-            pass  # TODO
-
-        surface.OuterBoundary = outer_boundary
-        surface.InnerBoundaries = inner_boundaries
-
-        return surface
-
-    def set_boundary_name(self, boundary):
-        """
-        By convention 1stLevel and 2ndLevel boundary have specific name and description
-        See https://ifc43-docs.standards.buildingsmart.org/IFC/RELEASE/IFC4x3/HTML/lexical/IfcRelSpaceBoundary.htm
-        Warning: IfcRelSpaceBoundary2ndLevel is a subclass of IfcRelSpaceBoundary1stLevel test order matter
-        """
-        if boundary.is_a("IfcRelSpaceBoundary2ndLevel"):
-            boundary.Name = "2ndLevel"
-            if boundary.CorrespondingBoundary:
-                boundary.Description = "2a"
-            else:
-                boundary.Description = "2b"
-        elif boundary.is_a("IfcRelSpaceBoundary1stLevel"):
-            boundary.Name = "1stLevel"
@@ -18,7 +18,6 @@

 import bpy
 from bpy.types import PropertyGroup
-from blenderbim.bim.prop import ObjProperty
 from bpy.props import (
    PointerProperty,
    StringProperty,
@@ -53,13 +52,9 @@ def element_filter(self, object):
    return False


-class BIMObjectBoundaryProperties(PropertyGroup):
+class BIMBoundaryProperties(PropertyGroup):
    is_editing: BoolProperty(name="Is Editing")
    relating_space: PointerProperty(name="RelatingSpace", type=bpy.types.Object, poll=space_filter)
    related_building_element: PointerProperty(name="RelatedBuildingElement", type=bpy.types.Object, poll=element_filter)
    parent_boundary: PointerProperty(name="ParentBoundary", type=bpy.types.Object, poll=boundary_filter)
    corresponding_boundary: PointerProperty(name="CorrespondingBoundary", type=bpy.types.Object, poll=boundary_filter)
-
-
-class BIMBoundaryProperties(PropertyGroup):
-    boundaries: bpy.props.CollectionProperty(type=ObjProperty)
@@ -25,13 +25,13 @@ from blenderbim.bim.module.boundary.data import SpaceBoundariesData


 class BIM_PT_SceneBoundaries(Panel):
-    bl_label = "Space Boundaries"
+    bl_label = "IFC Space Boundaries"
    bl_id_name = "BIM_PT_scene_boundaries"
    bl_options = {"DEFAULT_CLOSED"}
    bl_space_type = "PROPERTIES"
    bl_region_type = "WINDOW"
    bl_context = "scene"
-    bl_parent_id = "BIM_PT_tab_geometry"
+    bl_parent_id = "BIM_PT_geometry"

    @classmethod
    def poll(cls, context):
@@ -45,12 +45,12 @@ class BIM_PT_SceneBoundaries(Panel):


 class BIM_PT_Boundary(Panel):
-    bl_label = "Space Boundary"
+    bl_label = "IFC Space Boundary"
    bl_idname = "BIM_PT_Boundary"
    bl_space_type = "PROPERTIES"
    bl_region_type = "WINDOW"
    bl_context = "object"
-    bl_parent_id = "BIM_PT_tab_geometric_relationships"
+    bl_parent_id = "BIM_PT_geometry_object"

    @classmethod
    def poll(cls, context):
@@ -117,14 +117,14 @@ class BIM_PT_Boundary(Panel):


 class BIM_PT_SpaceBoundaries(Panel):
-    bl_label = "Space Boundaries"
+    bl_label = "IFC Space Boundaries"
    bl_idname = "BIM_PT_SpaceBoundaries"
    bl_options = {"DEFAULT_CLOSED"}
    bl_space_type = "PROPERTIES"
    bl_region_type = "WINDOW"
    bl_context = "object"
    bl_order = 1
-    bl_parent_id = "BIM_PT_tab_geometric_relationships"
+    bl_parent_id = "BIM_PT_geometry_object"

    @classmethod
    def poll(cls, context):
@@ -21,7 +21,7 @@ from . import ui, prop, operator

 classes = (
    operator.AddBrick,
-    operator.AddBrickRelation,
+    operator.AddBrickFeed,
    operator.AssignBrickReference,
    operator.CloseBrickProject,
    operator.ConvertBrickProject,
@@ -33,18 +33,11 @@ classes = (
    operator.RewindBrickClass,
    operator.ViewBrickClass,
    operator.ViewBrickItem,
-    operator.SerializeBrick,
-    operator.AddBrickNamespace,
-    operator.RemoveBrickRelation,
    prop.Brick,
    prop.BIMBrickProperties,
    ui.BIM_PT_brickschema,
-    ui.BIM_PT_brickschema_project_info,
-    ui.BIM_PT_brickschema_namespaces,
-    ui.BIM_PT_brickschema_create_entity,
-    ui.BIM_PT_brickschema_viewport,
-    ui.BIM_UL_bricks,
    ui.BIM_PT_ifc_brickschema_references,
+    ui.BIM_UL_bricks,
 )


@@ -41,15 +41,17 @@ class BrickschemaData:
        cls.is_loaded = True
        cls.data = {
            "is_loaded": cls.get_is_loaded(),
-            "active_relations": cls.active_relations(),
+            "attributes": cls.attributes(),
+            "namespaces": cls.namespaces(),
+            "brick_equipment_classes": cls.brick_equipment_classes(),
        }

    @classmethod
    def get_is_loaded(cls):
-        return BrickStore.graph is not None  # `if BrickStore.graph` by itself takes ages.
+        return BrickStore.graph is not None

    @classmethod
-    def active_relations(cls):
+    def attributes(cls):
        if BrickStore.graph is None:
            return []
        props = bpy.context.scene.BIMBrickProperties
@@ -57,73 +59,76 @@ class BrickschemaData:
            brick = props.bricks[props.active_brick_index]
        except:
            return []
+        results = []
        uri = brick.uri
-        namespace = str(uri.split("#")[0])
-        if namespace == "https://brickschema.org/schema/Brick":
+        query = BrickStore.graph.query(
+            """
+            PREFIX brick: <https://brickschema.org/schema/Brick#>
+            PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
+            PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+            SELECT DISTINCT ?name ?value ?sp ?sv WHERE {
+               <{uri}> ?name ?value .
+               OPTIONAL {
+               { ?name rdfs:range brick:TimeseriesReference . }
+                UNION
+               { ?name a brick:EntityProperty . }
+                ?value ?sp ?sv }
+            }
+        """.replace(
+                "{uri}", uri
+            )
+        )
+
+        for row in query:
+            name = row.get("name").toPython().split("#")[-1]
+            value = row.get("value")
+            results.append(
+                {
+                    "name": name,
+                    "value": value.toPython().split("#")[-1],
+                    "is_uri": isinstance(value, URIRef),
+                    "value_uri": value.toPython(),
+                    "is_globalid": name == "globalID",
+                }
+            )
+            if isinstance(row.get("value"), BNode):
+                for s, p, o in BrickStore.graph.triples((value, None, None)):
+                    results.append(
+                        {
+                            "name": name + ":" + p.toPython().split("#")[-1],
+                            "value": o.toPython().split("#")[-1],
+                            "is_uri": isinstance(o, URIRef),
+                            "value_uri": o.toPython(),
+                            "is_globalid": p.toPython().split("#")[-1] == "globalID",
+                        }
+                    )
+        return results
+
+    @classmethod
+    def namespaces(cls):
+        if BrickStore.graph is None:
+            return []
+        results = []
+        for alias, uri in BrickStore.graph.namespaces():
+            results.append((uri, f"{alias}: {uri}", ""))
+        return results
+
+    @classmethod
+    def brick_equipment_classes(cls):
+        if BrickStore.graph is None:
            return []
        results = []
        query = BrickStore.graph.query(
            """
            PREFIX brick: <https://brickschema.org/schema/Brick#>
            PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
-            PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
-            SELECT DISTINCT ?predicate ?object ?label ?sp ?sv  WHERE {
-                <{uri}> ?predicate ?object .
-                OPTIONAL {
-                    ?object rdfs:label ?label . 
-                }
-                OPTIONAL {
-                    { ?predicate rdfs:range brick:TimeseriesReference . }
-                    UNION
-                    { ?predicate a brick:EntityProperty . }
-                    ?object ?sp ?sv .
-                }
+            SELECT ?class WHERE {
+                ?class rdfs:subClassOf* brick:Equipment .
            }
-            GROUP BY ?object
-        """.replace(
-                "{uri}", uri
-            )
+        """
        )
-        for row in query:
-            predicate_uri = row.get("predicate")
-            predicate_name = predicate_uri.toPython().split("#")[-1]
-            object_uri = row.get("object")
-            object_name = row.get("label")
-            if not object_name:
-                if isinstance(object_uri, BNode):
-                    object_name = "[]"
-                else:
-                    try:
-                        object_name = object_uri.toPython().split("#")[-1]
-                    except:
-                        object_name = str(object_uri)
-            results.append(
-                {
-                    "predicate_uri": predicate_uri,
-                    "predicate_name": predicate_name,
-                    "object_uri": object_uri,
-                    "object_name": object_name,
-                    "is_uri": isinstance(object_uri, URIRef),
-                    "is_globalid": predicate_name == "ifcGlobalID",
-                }
-            )
-            if isinstance(object_uri, BNode):
-                for subject2, predicate2, object2 in BrickStore.graph.triples((object_uri, None, None)):
-                    predicate2_name = predicate2.toPython().split("#")[-1]
-                    try:
-                        object2_name = object2.toPython().split("#")[-1]
-                    except:
-                        object2_name = str(object2)
-                    results.append(
-                        {
-                            "predicate_uri": None,
-                            "predicate_name": predicate_name + ":" + predicate2_name,
-                            "object_uri": object2,
-                            "object_name": object2_name,
-                            "is_uri": isinstance(object2, URIRef),
-                            "is_globalid": predicate2_name == "ifcGlobalID",
-                        }
-                    )
+        for uri in sorted([x[0].toPython() for x in query]):
+            results.append((uri, uri.split("#")[-1], ""))
        return results


@@ -149,7 +154,7 @@ class BrickschemaReferencesData:
        for library in ifc.by_type("IfcLibraryInformation"):
            if tool.Ifc.get_schema() == "IFC2X3":
                results.append((str(library.id()), library.Name or "Unnamed", ""))
-            elif library.Location and ".ttl" in library.Location:
+            elif ".ttl" in library.Location:
                results.append((str(library.id()), library.Name or "Unnamed", ""))
        return results

@@ -16,19 +16,17 @@
 # You should have received a copy of the GNU General Public License
 # along with BlenderBIM Add-on.  If not, see <http://www.gnu.org/licenses/>.

-import os
 import bpy
 import ifcopenshell.api
 import blenderbim.tool as tool
 import blenderbim.core.brick as core
 import blenderbim.bim.handler
 from blenderbim.bim.ifc import IfcStore
-from blenderbim.tool.brick import BrickStore


 class Operator:
    def execute(self, context):
-        IfcStore.execute_ifc_operator(self, context)
+        self._execute(context)
        blenderbim.bim.handler.refresh_ui_data()
        return {"FINISHED"}

@@ -37,16 +35,11 @@ class LoadBrickProject(bpy.types.Operator, Operator):
    bl_idname = "bim.load_brick_project"
    bl_label = "Load Brickschema Project"
    bl_options = {"REGISTER", "UNDO"}
-    bl_description = "Load in a Brick project from a file"
    filepath: bpy.props.StringProperty(subtype="FILE_PATH")
    filter_glob: bpy.props.StringProperty(default="*.ttl", options={"HIDDEN"})

    def _execute(self, context):
-        if os.path.exists(self.filepath) and "ttl" in os.path.splitext(self.filepath)[1].lower():
-            root = context.scene.BIMBrickProperties.brick_list_root
-            core.load_brick_project(tool.Brick, filepath=self.filepath, brick_root=root)
-        else:
-            self.report({'ERROR'}, f'Failed to load {self.filepath}')
+        core.load_brick_project(tool.Brick, filepath=self.filepath)

    def invoke(self, context, event):
        context.window_manager.fileselect_add(self)
@@ -57,45 +50,35 @@ class ViewBrickClass(bpy.types.Operator, Operator):
    bl_idname = "bim.view_brick_class"
    bl_label = "View Brick Class"
    bl_options = {"REGISTER", "UNDO"}
-    bl_description = "Inspect the subclasses of this class"
    brick_class: bpy.props.StringProperty(name="Brick Class")
-    split_screen: bpy.props.BoolProperty(name="Split Screen", default=False, options={"HIDDEN"})

    def _execute(self, context):
-        core.view_brick_class(tool.Brick, brick_class=self.brick_class, split_screen=self.split_screen)
+        core.view_brick_class(tool.Brick, brick_class=self.brick_class)


 class ViewBrickItem(bpy.types.Operator, Operator):
    bl_idname = "bim.view_brick_item"
    bl_label = "View Brick Item"
    bl_options = {"REGISTER", "UNDO"}
-    bl_description = "Inspect this entity in the viewer"
    item: bpy.props.StringProperty(name="Brick Item")
-    split_screen: bpy.props.BoolProperty(name="Split Screen", default=False, options={"HIDDEN"})

    def _execute(self, context):
-        try:
-            core.view_brick_item(tool.Brick, item=self.item, split_screen=self.split_screen)
-        except:
-            self.report({'ERROR'}, f'Could not find {self.item}')
+        core.view_brick_item(tool.Brick, item=self.item)


 class RewindBrickClass(bpy.types.Operator, Operator):
    bl_idname = "bim.rewind_brick_class"
    bl_label = "Rewind Brick Class"
    bl_options = {"REGISTER", "UNDO"}
-    bl_description = "Go back to the previous list view"
-    split_screen: bpy.props.BoolProperty(name="Split Screen", default=False, options={"HIDDEN"})

    def _execute(self, context):
-        core.rewind_brick_class(tool.Brick, split_screen=self.split_screen)
+        core.rewind_brick_class(tool.Brick)


 class CloseBrickProject(bpy.types.Operator, Operator):
    bl_idname = "bim.close_brick_project"
    bl_label = "Close Brick Project"
    bl_options = {"REGISTER", "UNDO"}
-    bl_description = "Close the Brick project"

    def _execute(self, context):
        core.close_brick_project(tool.Brick)
@@ -105,7 +88,6 @@ class ConvertBrickProject(bpy.types.Operator, Operator):
    bl_idname = "bim.convert_brick_project"
    bl_label = "Convert Brick Project"
    bl_options = {"REGISTER", "UNDO"}
-    bl_description = "Create an Ifc library for this Brick project"

    def _execute(self, context):
        core.convert_brick_project(tool.Ifc, tool.Brick)
@@ -115,18 +97,9 @@ class AssignBrickReference(bpy.types.Operator, Operator):
    bl_idname = "bim.assign_brick_reference"
    bl_label = "Assign Brick Reference"
    bl_options = {"REGISTER", "UNDO"}
-    bl_description = "Assign the selected Ifc entity to the selected Brick entity"

    def _execute(self, context):
-        if not context.active_object:
-            self.report({'ERROR'}, f'No Ifc selected')
-            return
        props = context.scene.BIMBrickProperties
-        try:
-            props.bricks[props.active_brick_index]
-        except:
-            self.report({'ERROR'}, f'No Brick selected')
-            return
        core.assign_brick_reference(
            tool.Ifc,
            tool.Brick,
@@ -140,41 +113,35 @@ class AddBrick(bpy.types.Operator, Operator):
    bl_idname = "bim.add_brick"
    bl_label = "Add Brick"
    bl_options = {"REGISTER", "UNDO"}
-    bl_description = "Create the Brick entity"

    def _execute(self, context):
        props = context.scene.BIMBrickProperties
+        library = None
+        if props.libraries:
+            library = tool.Ifc.get().by_id(int(props.libraries))
        core.add_brick(
            tool.Ifc,
            tool.Brick,
            element=tool.Ifc.get_entity(context.active_object) if context.selected_objects else None,
            namespace=props.namespace,
-            brick_class=props.brick_entity_class,
-            library=tool.Ifc.get().by_id(int(props.libraries)) if props.libraries else None,
-            label=props.new_brick_label,
+            brick_class=props.brick_equipment_class,
+            library=library,
        )


-class AddBrickRelation(bpy.types.Operator, Operator):
-    bl_idname = "bim.add_brick_relation"
-    bl_label = "Add Brick Relation"
+class AddBrickFeed(bpy.types.Operator, Operator):
+    bl_idname = "bim.add_brick_feed"
+    bl_label = "Add Brick Feed"
    bl_options = {"REGISTER", "UNDO"}
-    bl_description = "Create the Brick relationship"

    def _execute(self, context):
-        props = context.scene.BIMBrickProperties
-        brick = props.bricks[props.active_brick_index]
-        if props.new_brick_relation_type == "http://www.w3.org/2000/01/rdf-schema#label":
-            object = props.new_brick_relation_object
-        elif props.split_screen_toggled:
-            object = props.split_screen_bricks[props.split_screen_active_brick_index].uri
-        else:
-            object = props.namespace + props.new_brick_relation_object
-        core.add_brick_relation(
+        source = tool.Ifc.get_entity([o for o in context.selected_objects if o != context.active_object][0])
+        destination = tool.Ifc.get_entity(context.active_object)
+        core.add_brick_feed(
+            tool.Ifc,
            tool.Brick,
-            brick_uri=brick.uri,
-            predicate=props.new_brick_relation_type,
-            object=object
+            source=source,
+            destination=destination,
        )


@@ -182,7 +149,6 @@ class ConvertIfcToBrick(bpy.types.Operator, Operator):
    bl_idname = "bim.convert_ifc_to_brick"
    bl_label = "Convert IFC To Brick"
    bl_options = {"REGISTER", "UNDO"}
-    bl_description = "Convert Ifc entities and relations to Brick entities and relations"

    def _execute(self, context):
        props = context.scene.BIMBrickProperties
@@ -192,44 +158,19 @@ class ConvertIfcToBrick(bpy.types.Operator, Operator):
        core.convert_ifc_to_brick(tool.Brick, namespace=props.namespace, library=library)


-class NewBrickFile(bpy.types.Operator):
+class NewBrickFile(bpy.types.Operator, Operator):
    bl_idname = "bim.new_brick_file"
    bl_label = "New Brick File"
    bl_options = {"REGISTER", "UNDO"}
-    bl_description = "Create a Brick project from scratch"
-
-    def execute(self, context):
-        IfcStore.begin_transaction(self)
-        IfcStore.add_transaction_operation(self, rollback=self.rollback, commit=lambda data: True)
-        self._execute(context)
-        self.transaction_data = {
-            "schema": BrickStore.schema,
-            "path": BrickStore.path,
-            "graph": BrickStore.graph,
-        }
-        IfcStore.add_transaction_operation(self, rollback=lambda data: True, commit=self.commit)
-        IfcStore.end_transaction(self)
-        blenderbim.bim.handler.refresh_ui_data()
-        return {"FINISHED"}

    def _execute(self, context):
-        root = context.scene.BIMBrickProperties.brick_list_root
-        core.new_brick_file(tool.Brick, brick_root=root)
-
-    def rollback(self, data):
-        BrickStore.purge()
-
-    def commit(self, data):
-        BrickStore.schema = data["schema"]
-        BrickStore.path = data["path"]
-        BrickStore.graph = data["graph"]
+        core.new_brick_file(tool.Brick)


 class RefreshBrickViewer(bpy.types.Operator, Operator):
    bl_idname = "bim.refresh_brick_viewer"
    bl_label = "Refresh Brick Viewer"
    bl_options = {"REGISTER", "UNDO"}
-    bl_description = "Refresh the list view"

    def _execute(self, context):
        core.refresh_brick_viewer(tool.Brick)
@@ -239,7 +180,6 @@ class RemoveBrick(bpy.types.Operator, Operator):
    bl_idname = "bim.remove_brick"
    bl_label = "Remove Brick"
    bl_options = {"REGISTER", "UNDO"}
-    bl_description = "Delete this entity"

    def _execute(self, context):
        props = context.scene.BIMBrickProperties
@@ -249,57 +189,3 @@ class RemoveBrick(bpy.types.Operator, Operator):
            library=tool.Ifc.get().by_id(int(props.libraries)) if props.libraries else None,
            brick_uri=props.bricks[props.active_brick_index].uri,
        )
-
-
-class SerializeBrick(bpy.types.Operator):
-    bl_idname = "bim.serialize_brick"
-    bl_label = "Serialize Brick"
-    filter_glob: bpy.props.StringProperty(default="*.ttl", options={"HIDDEN"})
-    filepath: bpy.props.StringProperty(subtype="FILE_PATH")
-    should_save_as: bpy.props.BoolProperty(name="Should Save As", default=False, options={"HIDDEN"})
-
-    def invoke(self, context, event):
-        if self.should_save_as or not BrickStore.path:
-            WindowManager = context.window_manager
-            WindowManager.fileselect_add(self)
-            return {"RUNNING_MODAL"}
-        else:
-            return self.execute(context)
-
-    def execute(self, context):
-        if self.should_save_as or not BrickStore.path:
-            BrickStore.path = self.filepath
-        core.serialize_brick(tool.Brick)
-        return {"FINISHED"}
-
-    @classmethod
-    def description(cls, context, properties):
-        if properties.should_save_as:
-            return "Save Brick project to a selected file"
-        return "Save the Brick project"
-
-
-class AddBrickNamespace(bpy.types.Operator, Operator):
-    bl_idname = "bim.add_brick_namespace"
-    bl_label = "Add Brick Namespace"
-    bl_description = "Bind a new namespace to the Brick project"
-
-    def _execute(self, context):
-        props = context.scene.BIMBrickProperties
-        alias = props.new_brick_namespace_alias
-        uri = props.new_brick_namespace_uri
-        core.add_brick_namespace(tool.Brick, alias=alias, uri=uri)
-
-
-class RemoveBrickRelation(bpy.types.Operator, Operator):
-    bl_idname = "bim.remove_brick_relation"
-    bl_label = "Remove Relation"
-    bl_options = {"REGISTER", "UNDO"}
-    bl_description = "Delete this relationship"
-    predicate: bpy.props.StringProperty(name="Relation")
-    object: bpy.props.StringProperty(name="Object")
-
-    def _execute(self, context):
-        props = context.scene.BIMBrickProperties
-        brick = props.bricks[props.active_brick_index]
-        core.remove_brick_relation(tool.Brick, brick_uri=brick.uri, predicate=self.predicate, object=self.object)
@@ -30,9 +30,7 @@ from bpy.props import (
    FloatVectorProperty,
    CollectionProperty,
 )
-import blenderbim.core.brick as core
-import blenderbim.tool.brick as tool
-from blenderbim.tool.brick import BrickStore
+

 def update_active_brick_index(self, context):
    BrickschemaData.is_loaded = False
@@ -45,35 +43,15 @@ def get_libraries(self, context):


 def get_namespaces(self, context):
-    return [(uri, f"{alias}: {uri}", "") for alias, uri in BrickStore.namespaces]
+    if not BrickschemaData.is_loaded:
+        BrickschemaData.load()
+    return BrickschemaData.data["namespaces"]


-def get_brick_entity_classes(self, context):
-    entity = self.brick_entity_create_type
-    return [(uri, uri.split("#")[-1], "") for uri in BrickStore.entity_classes[entity]]
-
-
-def get_brick_roots(self, context): 
-    return [(root, root, "") for root in BrickStore.root_classes]
-
-
-def get_brick_relations(self, context):
-    relations = [(uri, uri.split("#")[-1], "") for uri in BrickStore.relationships]
-    for relation in BrickschemaData.data["active_relations"]:
-        if relation["predicate_name"] == "label":
-            return relations
-    relations.append(("http://www.w3.org/2000/01/rdf-schema#label", "label", ""))
-    return relations
-    
-
-
-def update_view(self, context):
-    root = context.scene.BIMBrickProperties.brick_list_root
-    core.set_brick_list_root(tool.Brick, brick_root=root, split_screen=False)
-
-def split_screen_update_view(self, context):
-    root = context.scene.BIMBrickProperties.split_screen_brick_list_root
-    core.set_brick_list_root(tool.Brick, brick_root=root, split_screen=True)
+def get_brick_equipment_classes(self, context):
+    if not BrickschemaData.is_loaded:
+        BrickschemaData.load()
+    return BrickschemaData.data["brick_equipment_classes"]


 class Brick(PropertyGroup):
@@ -89,26 +67,5 @@ class BIMBrickProperties(PropertyGroup):
    bricks: CollectionProperty(name="Bricks", type=Brick)
    active_brick_index: IntProperty(name="Active Brick Index", update=update_active_brick_index)
    libraries: EnumProperty(name="Libraries", items=get_libraries)
-    set_list_root_toggled: BoolProperty(name="Set List Root Toggled", default=False)
-    brick_list_root: EnumProperty(name="Brick List Root", items=get_brick_roots, update=update_view)
-    # namespace manager
    namespace: EnumProperty(name="Namespace", items=get_namespaces)
-    new_brick_namespace_alias: StringProperty(name="New Brick Namespace Alias")
-    new_brick_namespace_uri: StringProperty(name="New Brick Namespace URI")
-    # create brick entity
-    new_brick_label: StringProperty(name="New Brick Label")
-    brick_entity_create_type: EnumProperty(name="Brick Entity Types", items=get_brick_roots)
-    brick_entity_class: EnumProperty(name="Brick Equipment Class", items=get_brick_entity_classes)
-    # create relations
-    brick_create_relations_toggled: BoolProperty(name="Brick Create Relations Toggled", default=False)
-    brick_edit_relations_toggled: BoolProperty(name="Brick Edit Relations Toggled", default=False)
-    new_brick_relation_type: EnumProperty(name="New Brick Relation Type", items=get_brick_relations)
-    new_brick_relation_object: StringProperty(name="New Brick Relation Object")
-    add_brick_relation_failed: BoolProperty(name="Add Relation Failed", default=False)
-    # create relations split screen
-    split_screen_toggled: BoolProperty(name="Split Screen Toggled", default=False)
-    split_screen_bricks: CollectionProperty(name="Split Screen Bricks", type=Brick)
-    split_screen_active_brick_index: IntProperty(name="Split Screen Active Brick Index", update=update_active_brick_index)
-    split_screen_active_brick_class: StringProperty(name="Split Screen Active Brick Class")
-    split_screen_brick_breadcrumbs: CollectionProperty(name="Split Screen Brick Breadcrumbs", type=StrProperty)
-    split_screen_brick_list_root: EnumProperty(name="Split Screen Brick List Root", items=get_brick_roots, update=split_screen_update_view)
+    brick_equipment_class: EnumProperty(name="Brick Equipment Class", items=get_brick_equipment_classes)
@@ -20,33 +20,21 @@ import blenderbim.tool as tool
 from bpy.types import Panel, UIList
 from blenderbim.bim.helper import prop_with_search
 from blenderbim.bim.module.brick.data import BrickschemaData, BrickschemaReferencesData
-from blenderbim.tool.brick import BrickStore


 class BIM_PT_brickschema(Panel):
    bl_label = "Brickschema Project"
    bl_idname = "BIM_PT_brickschema"
+    bl_options = {"DEFAULT_CLOSED"}
    bl_space_type = "PROPERTIES"
    bl_region_type = "WINDOW"
    bl_context = "scene"
-    bl_parent_id = "BIM_PT_tab_operations"

    def draw(self, context):
        if not BrickschemaData.is_loaded:
            BrickschemaData.load()
-
-
-class BIM_PT_brickschema_project_info(Panel):
-    bl_label = "Project Info"
-    bl_idname = "BIM_PT_brickschema_project_info"
-    bl_space_type = "PROPERTIES"
-    bl_region_type = "WINDOW"
-    bl_context = "scene"
-    bl_parent_id = "BIM_PT_brickschema"
-
-    def draw(self, context):
        self.props = context.scene.BIMBrickProperties
-        
+
        if not BrickschemaData.data["is_loaded"]:
            row = self.layout.row(align=True)
            row.operator("bim.new_brick_file", text="Create Project")
@@ -54,217 +42,38 @@ class BIM_PT_brickschema_project_info(Panel):
            return

        row = self.layout.row(align=True)
-        if BrickStore.path:
-            row.label(text=BrickStore.path, icon="FILEBROWSER")
-        else:
-            row.label(text="No file", icon="FILEBROWSER")
-        
-        row = self.layout.row(align=True)
-        if BrickStore.last_saved:
-            row.label(text=BrickStore.last_saved, icon="TIME")
-        else:
-            row.label(text="Not saved", icon="TIME")
-
-        row = self.layout.row(align=True)
-        op = row.operator("bim.serialize_brick", icon="EXPORT", text="Save")
-        op.should_save_as = False
-        op = row.operator("bim.serialize_brick", icon="FILE_TICK", text="Save As")
-        op.should_save_as = True
+        if len(self.props.brick_breadcrumbs):
+            row.operator("bim.rewind_brick_class", text="", icon="FRAME_PREV")
+        row.label(text=self.props.active_brick_class)
+        row.operator("bim.refresh_brick_viewer", text="", icon="FILE_REFRESH")
        row.operator("bim.close_brick_project", text="", icon="CANCEL")

-
-class BIM_PT_brickschema_namespaces(Panel):
-    bl_label = "Namespaces"
-    bl_idname = "BIM_PT_brickschema_namespaces"
-    bl_options = {"DEFAULT_CLOSED"}
-    bl_space_type = "PROPERTIES"
-    bl_region_type = "WINDOW"
-    bl_context = "scene"
-    bl_parent_id = "BIM_PT_brickschema"
-
-    @classmethod
-    def poll(cls, context):
-        return BrickStore.graph != None
-
-    def draw(self, context):
-        self.props = context.scene.BIMBrickProperties
-
-        row = self.layout.row(align=True)
-        row.label(text="Active Namespace:")
-
        row = self.layout.row(align=True)
        prop_with_search(row, self.props, "namespace", text="")
+        prop_with_search(row, self.props, "brick_equipment_class", text="")
+        row.operator("bim.add_brick", text="", icon="ADD")

        row = self.layout.row(align=True)
-        row.label(text="Bind New Namespace:")
+        row.alignment = "RIGHT"
+        row.operator("bim.add_brick_feed", text="", icon="PLUGIN")
+        row.operator("bim.remove_brick", text="", icon="X")

-        row = self.layout.row(align=True)
-        row.prop(data=self.props, property="new_brick_namespace_alias", text="")
-        col = row.column()
-        col.alignment = "CENTER"
-        col.scale_x = 1.1
-        col.label(text=":")
-        row.prop(data=self.props, property="new_brick_namespace_uri", text="")
-        row.operator("bim.add_brick_namespace", text="", icon="ADD")
+        self.layout.template_list("BIM_UL_bricks", "", self.props, "bricks", self.props, "active_brick_index")

-
-class BIM_PT_brickschema_create_entity(Panel):
-    bl_label = "Create Entity"
-    bl_idname = "BIM_PT_brickschema_create_entity"
-    bl_options = {"DEFAULT_CLOSED"}
-    bl_space_type = "PROPERTIES"
-    bl_region_type = "WINDOW"
-    bl_context = "scene"
-    bl_parent_id = "BIM_PT_brickschema"
-
-    @classmethod
-    def poll(cls, context):
-        return BrickStore.graph != None
-
-    def draw(self, context):
-        self.props = context.scene.BIMBrickProperties
-        # TO DO: hide this if selected entity already has a reference, or something similar
-
-        row = self.layout.row(align=True)
-        row.prop(data=self.props, property="brick_entity_create_type", text="Class")
-
-        row = self.layout.row(align=True)
-        prop_with_search(row, self.props, "brick_entity_class", text="Type")
-        
-        row = self.layout.row(align=True)
-        active = tool.Ifc.get_entity(context.active_object)
-        if active and context.selected_objects:
-            row.label(text="Label:")
-            row.label(text=active.Name if active.Name else "Unnamed")
-        else:
-            row.prop(data=self.props, property="new_brick_label", text="Label")
-
-        row = self.layout.row(align=True)
-        row.operator("bim.add_brick", text="Create Entity")
-     
-
-class BIM_PT_brickschema_viewport(Panel):
-    bl_label = "Viewport"
-    bl_idname = "BIM_PT_brickschema_viewport"
-    bl_space_type = "PROPERTIES"
-    bl_region_type = "WINDOW"
-    bl_context = "scene"
-    bl_parent_id = "BIM_PT_brickschema"
-
-    @classmethod
-    def poll(cls, context):
-        return BrickStore.graph != None
-
-    def draw(self, context):
-        self.props = context.scene.BIMBrickProperties
-
-        row = self.layout.row(align=True)
-        row.column().alignment = "RIGHT"
-        row.prop(data=self.props, property="set_list_root_toggled", text="", icon="OUTLINER")
-        row.prop(data=self.props, property="split_screen_toggled", text="", icon="WINDOW")
-        row.operator("bim.refresh_brick_viewer", text="", icon="FILE_REFRESH")
-
-        grid = self.layout.grid_flow(even_columns=True)
-        grid_left = grid.column(align=True)
-        row = grid_left.row(align=True)
-        if len(self.props.brick_breadcrumbs):
-            op = row.operator("bim.rewind_brick_class", text="", icon="FRAME_PREV")
-            op.split_screen = False
-        row.label(text=self.props.active_brick_class)
-
-        if self.props.set_list_root_toggled:
-            row = grid_left.row(align=True)
-            row.prop(data=self.props, property="brick_list_root", text="")
-
-        row = grid_left.row()
-        BIM_UL_bricks.split_screen = False
-        row.template_list("BIM_UL_bricks", "", self.props, "bricks", self.props, "active_brick_index")
-
-        if self.props.split_screen_toggled:
-            grid_right = grid.column(align=True)
-            row = grid_right.row(align=True)
-            if len(self.props.split_screen_brick_breadcrumbs):
-                op = row.operator("bim.rewind_brick_class", text="", icon="FRAME_PREV")
-                op.split_screen = True
-            row.label(text=self.props.split_screen_active_brick_class)
-
-            if self.props.set_list_root_toggled:
-                row = grid_right.row(align=True)
-                row.prop(data=self.props, property="split_screen_brick_list_root", text="")
-
-            row = grid_right.row()
-            BIM_UL_bricks.split_screen = True
-            row.template_list("BIM_UL_bricks", "", self.props, "split_screen_bricks", self.props, "split_screen_active_brick_index")
-
-        if BrickschemaData.data["active_relations"]:
+        for attribute in BrickschemaData.data["attributes"]:
            row = self.layout.row(align=True)
-            row.column().alignment = "RIGHT"
-            row.prop(data=self.props, property="brick_create_relations_toggled", text="", icon="PLUGIN")
-            row.prop(data=self.props, property="brick_edit_relations_toggled", text="", icon="TOOL_SETTINGS")
-            row.operator("bim.remove_brick", text="", icon="X")
-
-            if self.props.brick_create_relations_toggled and self.props.split_screen_toggled:
-                row = self.layout.row(align=True)
-                try:
-                    split_screen_selection = self.props.split_screen_bricks[self.props.split_screen_active_brick_index]
-                except:
-                    split_screen_selection = None
-                if not split_screen_selection or split_screen_selection.total_items:
-                    row.label(text="No selection", icon="INFO")
-                else:
-                    prop_with_search(row, self.props, "new_brick_relation_type", text="")
-                    row.label(text=split_screen_selection.label if split_screen_selection.label else split_screen_selection.name)
-                    row.operator("bim.add_brick_relation", text="", icon="ADD")
-
-            elif self.props.brick_create_relations_toggled:
-                row = self.layout.row(align=True)
-                prop_with_search(row, self.props, "new_brick_relation_type", text="")
-                row.prop(data=self.props, property="new_brick_relation_object", text="")
-                row.operator("bim.add_brick_relation", text="", icon="ADD")
-
-            if self.props.brick_create_relations_toggled and self.props.add_brick_relation_failed:
-                row = self.layout.row(align=True)
-                row.label(text="Failed to find this entity!", icon="ERROR")
-
-        for relation in BrickschemaData.data["active_relations"]:
-            split = self.layout.split(factor=0.85, align=True)
-            row = split.row(align=True)
-            row.label(text=relation["predicate_name"])
-            row.separator()
-            row.label(text=relation["object_name"])
-            row = split.row(align=True)
-            row.column().alignment = "RIGHT"
-            if self.props.brick_edit_relations_toggled and relation["predicate_uri"] and relation["predicate_name"] != "type":
-                op = row.operator("bim.remove_brick_relation", text="", icon="UNLINKED")
-                op.predicate = relation["predicate_uri"]
-                op.object = relation["object_uri"]
-            if relation["is_uri"] and relation["object_uri"].toPython().split("#")[-1] != self.props.active_brick_class:
+            row.label(text=attribute["name"])
+            row.label(text=attribute["value"])
+            if attribute["is_uri"]:
                op = row.operator("bim.view_brick_item", text="", icon="DISCLOSURE_TRI_RIGHT")
-                op.item = relation["object_uri"]
-            if relation["is_globalid"]:
+                op.item = attribute["value_uri"]
+            if attribute["is_globalid"]:
                op = row.operator("bim.select_global_id", icon="RESTRICT_SELECT_OFF", text="")
-                op.global_id = relation["object_name"]
+                op.global_id = attribute["value"]


-class BIM_UL_bricks(UIList):
-    split_screen = False
-
-    def draw_item(self, context, layout, data, item, icon, active_data, active_propname):
-        if item:
-            split = layout.split(factor=0.85, align=True)
-            row = split.row()
-            label = item.label if item.label else item.name
-            if item.total_items:
-                op = row.operator("bim.view_brick_class", text="", icon="DISCLOSURE_TRI_RIGHT", emboss=False)
-                op.brick_class = item.name
-                op.split_screen = self.split_screen
-            row.label(text=label)
-            if item.total_items:
-                row = split.row()
-                row.label(text=str(item.total_items))
-
 class BIM_PT_ifc_brickschema_references(Panel):
-    bl_label = "Brickschema References"
+    bl_label = "IFC Brickschema References"
    bl_idname = "BIM_PT_ifc_brickschema_references"
    bl_options = {"DEFAULT_CLOSED"}
    bl_space_type = "PROPERTIES"
@@ -286,24 +95,15 @@ class BIM_PT_ifc_brickschema_references(Panel):
            row.label(text="No Brickschema Project Loaded")
            return

-        if not BrickschemaReferencesData.data["libraries"] and BrickStore.path:
+        if not BrickschemaReferencesData.data["libraries"]:
            row = self.layout.row(align=True)
            row.label(text="No IFC Libraries")
            row.operator("bim.convert_brick_project", text="", icon="ADD")
            return
-        
-        elif not BrickschemaReferencesData.data["libraries"]:
-            row = self.layout.row(align=True)
-            row.label(text="No IFC Libraries: save the Brick project to create a new library", icon="ERROR")
-
-            row = self.layout.row(align=True)
-            row.label(text="Libraries must have location pointing to a \".ttl\" file", icon="INFO")
-            return

        row = self.layout.row(align=True)
        prop_with_search(row, self.props, "libraries")
-        if BrickStore.path:
-            row.operator("bim.convert_brick_project", text="", icon="ADD")
+        row.operator("bim.convert_brick_project", text="", icon="ADD")

        row = self.layout.row(align=True)
        row.operator("bim.assign_brick_reference", icon="ADD")
@@ -318,4 +118,16 @@ class BIM_PT_ifc_brickschema_references(Panel):
            row.label(text=reference["identification"], icon="ASSET_MANAGER")
            row.label(text=reference["name"])
            row.operator("bim.unassign_library_reference", text="", icon="X").reference = reference["id"]
-            row.operator("bim.view_brick_item", text="", icon="DISCLOSURE_TRI_RIGHT").item = reference["identification"]
+            row.operator("bim.view_brick_item", text="", icon="DISCLOSURE_TRI_RIGHT").item = reference["identification"]
+
+
+class BIM_UL_bricks(UIList):
+    def draw_item(self, context, layout, data, item, icon, active_data, active_propname):
+        if item:
+            row = layout.row(align=True)
+            if item.total_items:
+                op = row.operator("bim.view_brick_class", text="", icon="DISCLOSURE_TRI_RIGHT", emboss=False)
+                op.brick_class = item.name
+            row.label(text=item.label if item.label else item.name)
+            if item.total_items:
+                row.label(text=str(item.total_items))
@@ -1,42 +0,0 @@
-# BlenderBIM Add-on - OpenBIM Blender Add-on
-# Copyright (C) 2023 Dion Moult <dion@thinkmoult.com>
-#
-# This file is part of BlenderBIM Add-on.
-#
-# BlenderBIM Add-on is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# BlenderBIM Add-on is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with BlenderBIM Add-on.  If not, see <http://www.gnu.org/licenses/>.
-
-import bpy
-from . import ui, prop, operator
-
-classes = (
-    operator.GetBSDDClassificationProperties,
-    operator.LoadBSDDDomains,
-    operator.SearchBSDDClass,
-    operator.SetActiveBSDDDictionary,
-    prop.BSDDDomain,
-    prop.BSDDClassification,
-    prop.BSDDPset,
-    prop.BIMBSDDProperties,
-    ui.BIM_UL_bsdd_domains,
-    ui.BIM_UL_bsdd_classifications,
-    ui.BIM_PT_bsdd,
-)
-
-
-def register():
-    bpy.types.Scene.BIMBSDDProperties = bpy.props.PointerProperty(type=prop.BIMBSDDProperties)
-
-
-def unregister():
-    del bpy.types.Scene.BIMBSDDProperties
@@ -1,65 +0,0 @@
-# BlenderBIM Add-on - OpenBIM Blender Add-on
-# Copyright (C) 2023 Dion Moult <dion@thinkmoult.com>
-#
-# This file is part of BlenderBIM Add-on.
-#
-# BlenderBIM Add-on is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# BlenderBIM Add-on is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with BlenderBIM Add-on.  If not, see <http://www.gnu.org/licenses/>.
-
-import bpy
-import bsdd
-import blenderbim.tool as tool
-from blenderbim.core import bsdd as core
-
-
-class LoadBSDDDomains(bpy.types.Operator):
-    bl_idname = "bim.load_bsdd_domains"
-    bl_label = "Load bSDD Dictionaries"
-    bl_options = {"REGISTER", "UNDO"}
-
-    def execute(self, context):
-        core.load_bsdd(bsdd.Client(), tool.Bsdd)
-        return {"FINISHED"}
-
-
-class SetActiveBSDDDictionary(bpy.types.Operator):
-    bl_idname = "bim.set_active_bsdd_domain"
-    bl_label = "Load bSDD Dictionary"
-    bl_options = {"REGISTER", "UNDO"}
-    name: bpy.props.StringProperty()
-    uri: bpy.props.StringProperty()
-
-    def execute(self, context):
-        core.set_active_bsdd_dictionary(self.name, self.uri, tool.Bsdd)
-        return {"FINISHED"}
-
-
-class SearchBSDDClass(bpy.types.Operator):
-    bl_idname = "bim.search_bsdd_classifications"
-    bl_label = "Search bSDD Class"
-    bl_options = {"REGISTER", "UNDO"}
-
-    def execute(self, context):
-        keyword = context.scene.BIMBSDDProperties.keyword
-        core.search_class(keyword, bsdd.Client(), tool.Bsdd)
-        return {"FINISHED"}
-
-
-class GetBSDDClassificationProperties(bpy.types.Operator):
-    bl_idname = "bim.get_bsdd_classification_properties"
-    bl_label = "Search bSDD Classifications"
-    bl_options = {"REGISTER", "UNDO"}
-
-    def execute(self, context):
-        core.get_class_properties(bsdd.Client(), tool.Bsdd)
-        return {"FINISHED"}
@@ -1,67 +0,0 @@
-# BlenderBIM Add-on - OpenBIM Blender Add-on
-# Copyright (C) 2023 Dion Moult <dion@thinkmoult.com>
-#
-# This file is part of BlenderBIM Add-on.
-#
-# BlenderBIM Add-on is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# BlenderBIM Add-on is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with BlenderBIM Add-on.  If not, see <http://www.gnu.org/licenses/>.
-
-import bpy
-from bpy.types import PropertyGroup
-from blenderbim.bim.prop import Attribute, StrProperty
-from bpy.props import (
-    PointerProperty,
-    StringProperty,
-    EnumProperty,
-    BoolProperty,
-    IntProperty,
-    FloatProperty,
-    FloatVectorProperty,
-    CollectionProperty,
-)
-
-
-class BSDDDomain(PropertyGroup):
-    name: StringProperty(name="Name")
-    uri: StringProperty(name="URI")
-    default_language_code: StringProperty(name="Language")
-    organization_name_owner: StringProperty(name="Organization")
-    status: StringProperty(name="Status")
-    version: StringProperty(name="Version")
-
-
-class BSDDClassification(PropertyGroup):
-    name: StringProperty(name="Name")
-    reference_code: StringProperty(name="Reference Code")
-    description: StringProperty(name="Description")
-    uri: StringProperty(name="Namespace URI")
-    domain_name: StringProperty(name="Domain Name")
-    domain_namespace_uri: StringProperty(name="Domain Namespace URI")
-
-
-class BSDDPset(PropertyGroup):
-    name: StringProperty(name="Name")
-    properties: CollectionProperty(name="Properties", type=Attribute)
-
-
-class BIMBSDDProperties(PropertyGroup):
-    active_domain: StringProperty(name="Active Domain")
-    active_uri: StringProperty(name="Active URI")
-    domains: CollectionProperty(name="Domains", type=BSDDDomain)
-    active_domain_index: IntProperty(name="Active Domain Index")
-    classifications: CollectionProperty(name="Classifications", type=BSDDClassification)
-    active_classification_index: IntProperty(name="Active Classification Index")
-    keyword: StringProperty(name="Keyword")
-    should_filter_ifc_class: BoolProperty(name="Filter Active IFC Class", default=True)
-    load_preview_domains: BoolProperty(name="Load Preview Domains", default=False)
-    classification_psets: CollectionProperty(name="Classification Psets", type=BSDDPset)
@@ -1,79 +0,0 @@
-# BlenderBIM Add-on - OpenBIM Blender Add-on
-# Copyright (C) 2023 Dion Moult <dion@thinkmoult.com>
-#
-# This file is part of BlenderBIM Add-on.
-#
-# BlenderBIM Add-on is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# BlenderBIM Add-on is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with BlenderBIM Add-on.  If not, see <http://www.gnu.org/licenses/>.
-
-import blenderbim.tool as tool
-from bpy.types import Panel, UIList
-from blenderbim.bim.ifc import IfcStore
-
-
-class BIM_PT_bsdd(Panel):
-    bl_label = "buildingSMART Data Dictionary"
-    bl_idname = "BIM_PT_bsdd"
-    bl_options = {"DEFAULT_CLOSED"}
-    bl_space_type = "PROPERTIES"
-    bl_region_type = "WINDOW"
-    bl_context = "scene"
-    bl_parent_id = "BIM_PT_tab_project_setup"
-
-    def draw(self, context):
-        props = context.scene.BIMBSDDProperties
-        row = self.layout.row(align=True)
-        row.prop(props, "load_preview_domains")
-        if len(props.domains):
-            row.operator("bim.load_bsdd_domains", text="", icon="FILE_REFRESH")
-
-        if props.active_domain:
-            row = self.layout.row()
-            row.label(text="Active: " + props.active_domain, icon="URL")
-        else:
-            row = self.layout.row()
-            row.label(text="No Active bSDD Domain", icon="ERROR")
-
-        if len(props.domains):
-            self.layout.template_list(
-                "BIM_UL_bsdd_domains",
-                "",
-                props,
-                "domains",
-                props,
-                "active_domain_index",
-            )
-        else:
-            row = self.layout.row()
-            row.operator("bim.load_bsdd_domains")
-
-
-class BIM_UL_bsdd_domains(UIList):
-    def draw_item(self, context, layout, data, item, icon, active_data, active_propname):
-        if item:
-            row = layout.row(align=True)
-            if item.status != "Active":
-                row.label(text=f"{item.name} ({item.organization_name_owner}) - {item.status}", icon="ERROR")
-            else:
-                row.label(text=f"{item.name} ({item.organization_name_owner})")
-            op = row.operator("bim.set_active_bsdd_domain", text="", icon="RESTRICT_SELECT_OFF")
-            op.name = item.name
-            op.uri = item.uri
-
-
-class BIM_UL_bsdd_classifications(UIList):
-    def draw_item(self, context, layout, data, item, icon, active_data, active_propname):
-        if item:
-            row = layout.row(align=True)
-            row.label(text=item.reference_code)
-            row.label(text=item.name)
@@ -24,8 +24,6 @@ import bpy_extras
 import blenderbim.tool as tool
 from mathutils import Vector, Matrix
 from math import pi, radians, sin, cos, sqrt
-import ifcopenshell.util.unit
-

 messages = {
    "SHARED_VERTEX": "Shared Vertex, no intersection possible",
@@ -142,9 +140,6 @@ class CadFillet(bpy.types.Operator):
            layout.prop(self, prop)

    def execute(self, context):
-        si_conversion = ifcopenshell.util.unit.calculate_unit_scale(tool.Ifc.get())
-        self.radius = self.radius * si_conversion
-        
        bpy.ops.object.mode_set(mode="OBJECT")
        bpy.ops.object.mode_set(mode="EDIT")

@@ -366,10 +361,6 @@ class CadOffset(bpy.types.Operator):
        # dialog that Mesh Tools has. Sverchok is 2D based, but has a weird side
        # effect of converting an unclosed loop into a closed loop which is also
        # not what users expect.
-
-        si_conversion = ifcopenshell.util.unit.calculate_unit_scale(tool.Ifc.get())
-        self.distance = self.distance * si_conversion
-        
        bpy.ops.object.mode_set(mode="OBJECT")
        bpy.ops.object.mode_set(mode="EDIT")

@@ -507,8 +498,6 @@ class CadOffset(bpy.types.Operator):
                    local_direction = (rotation_i @ direction).normalized()
                    normals.append(local_direction)

-
-
                if len(normals) == 2:
                    # https://stackoverflow.com/a/54042831/9627415
                    new_normal = (normals[0].lerp(normals[1], 0.5)).normalized()
@@ -542,7 +531,7 @@ class CadOffset(bpy.types.Operator):
 class AddIfcCircle(bpy.types.Operator):
    bl_idname = "bim.add_ifccircle"
    bl_label = "Add IfcCircle"
-    radius: bpy.props.FloatProperty(name="Radius", default=0.5)
+    radius: bpy.props.FloatProperty(name="Radius", default=0.1)

    @classmethod
    def poll(cls, context):
@@ -550,9 +539,6 @@ class AddIfcCircle(bpy.types.Operator):
        return bool(obj) and obj.type == "MESH"

    def execute(self, context):
-        si_conversion = ifcopenshell.util.unit.calculate_unit_scale(tool.Ifc.get())
-        self.radius = self.radius * si_conversion
-
        if self.has_selected_existing_circle(context):
            self.change_radius(context)
        else:
@@ -636,9 +622,6 @@ class AddIfcArcIndexFillet(bpy.types.Operator):
            layout.prop(self, prop)

    def execute(self, context):
-        si_conversion = ifcopenshell.util.unit.calculate_unit_scale(tool.Ifc.get())
-        self.radius = self.radius * si_conversion
-        
        if self.has_selected_existing_arc(context):
            self.change_radius(context)
        else:
@@ -803,8 +786,8 @@ class AlignViewToProfile(bpy.types.Operator):
 class AddRectangle(bpy.types.Operator):
    bl_idname = "bim.add_rectangle"
    bl_label = "Add Rectangle"
-    x: bpy.props.FloatProperty(name="X", default=1)
-    y: bpy.props.FloatProperty(name="Y", default=1)
+    x: bpy.props.FloatProperty(name="X", default=0.1)
+    y: bpy.props.FloatProperty(name="Y", default=0.1)

    @classmethod
    def poll(cls, context):
@@ -812,10 +795,6 @@ class AddRectangle(bpy.types.Operator):
        return bool(obj) and obj.type == "MESH"

    def execute(self, context):
-        si_conversion = ifcopenshell.util.unit.calculate_unit_scale(tool.Ifc.get())
-        self.x = self.x * si_conversion
-        self.y = self.y * si_conversion        
-        
        obj = context.active_object
        bm = bmesh.from_edit_mesh(obj.data)
        cursor = obj.matrix_world.inverted() @ context.scene.cursor.location
@@ -33,6 +33,7 @@ class CadTool(WorkSpaceTool):
    bl_description = "Gives you CAD authoring related superpowers"
    bl_icon = os.path.join(os.path.dirname(__file__), "ops.authoring.cad")
    bl_widget = None
+    # https://docs.blender.org/api/current/bpy.types.KeyMapItems.html
    bl_keymap = tool.Blender.get_default_selection_keypmap() + (
        ("bim.cad_hotkey", {"type": "C", "value": "PRESS", "shift": True}, {"properties": [("hotkey", "S_C")]}),
        ("bim.cad_hotkey", {"type": "E", "value": "PRESS", "shift": True}, {"properties": [("hotkey", "S_E")]}),
@@ -45,7 +46,7 @@ class CadTool(WorkSpaceTool):
        ("bim.cad_hotkey", {"type": "X", "value": "PRESS", "shift": True}, {"properties": [("hotkey", "S_X")]}),
    )

-    def draw_settings(context, layout, workspace_tool):
+    def draw_settings(context, layout, tool):
        obj = context.active_object
        if not obj or not obj.data:
            return
@@ -53,19 +54,14 @@ class CadTool(WorkSpaceTool):
            row = layout.row(align=True)
            row.label(text="", icon="EVENT_SHIFT")
            row.label(text="", icon="EVENT_Q")
-            element = tool.Ifc.get_entity(obj)
-            if element:
-                if element.is_a("IfcProfileDef"):
-                    row.operator("bim.edit_arbitrary_profile", text="Save Profile")
-                    row.operator("bim.align_view_to_profile", text="", icon="AXIS_FRONT")
-                    row.operator("bim.disable_editing_arbitrary_profile", text="", icon="CANCEL")
-                elif element.is_a("IfcRelSpaceBoundary"):
-                    row.operator("bim.edit_boundary_geometry", text="Save Profile")
-                    row.operator("bim.disable_editing_boundary_geometry", text="", icon="CANCEL")
-                else:
-                    row.operator("bim.edit_extrusion_profile", text="Save Profile")
-                    row.operator("bim.align_view_to_profile", text="", icon="AXIS_FRONT")
-                    row.operator("bim.disable_editing_extrusion_profile", text="", icon="CANCEL")
+            if obj.BIMObjectProperties.ifc_definition_id:
+                row.operator("bim.edit_extrusion_profile", text="Save Profile")
+                row.operator("bim.align_view_to_profile", text="", icon="AXIS_FRONT")
+                row.operator("bim.disable_editing_extrusion_profile", text="", icon="CANCEL")
+            else:
+                row.operator("bim.edit_arbitrary_profile", text="Save Profile")
+                row.operator("bim.align_view_to_profile", text="", icon="AXIS_FRONT")
+                row.operator("bim.disable_editing_arbitrary_profile", text="", icon="CANCEL")

            row = layout.row(align=True)
            row.label(text="", icon="EVENT_SHIFT")
@@ -137,22 +133,24 @@ class CadTool(WorkSpaceTool):
        else:
            if (
                (RailingData.is_loaded or not RailingData.load())
-                and RailingData.data["pset_data"]
+                and RailingData.data["parameters"]
                and context.active_object.BIMRailingProperties.is_editing_path
            ):
                row = layout.row(align=True)
-                row.label(text="", icon=f"EVENT_TAB")
-                row.operator("bim.finish_editing_railing_path")
+                row.label(text="", icon="EVENT_SHIFT")
+                row.label(text="", icon="EVENT_Q")
+                row.operator("bim.cad_hotkey", text="Apply Railing Path").hotkey = "S_Q"
                row.operator("bim.cancel_editing_railing_path", icon="CANCEL", text="")

            elif (
                (RoofData.is_loaded or not RoofData.load())
-                and RoofData.data["pset_data"]
+                and RoofData.data["parameters"]
                and context.active_object.BIMRoofProperties.is_editing_path
            ):
                row = layout.row(align=True)
-                row.label(text="", icon=f"EVENT_TAB")
-                row.operator("bim.finish_editing_roof_path")
+                row.label(text="", icon="EVENT_SHIFT")
+                row.label(text="", icon="EVENT_Q")
+                row.operator("bim.cad_hotkey", text="Apply Roof Path").hotkey = "S_Q"
                row.operator("bim.cancel_editing_roof_path", icon="CANCEL", text="")

                row = layout.row(align=True)
@@ -227,7 +225,7 @@ class CadHotkey(bpy.types.Operator):
                row.prop(props, "y")
            elif (
                (RoofData.is_loaded or not RoofData.load())
-                and RoofData.data["pset_data"]
+                and RoofData.data["parameters"]
                and bpy.context.active_object.BIMRoofProperties.is_editing_path
            ):
                self.layout.row().prop(props, "gable_roof_edge_angle")
@@ -257,23 +255,35 @@ class CadHotkey(bpy.types.Operator):
        bpy.ops.bim.cad_offset(distance=self.props.distance)

    def hotkey_S_Q(self):
-        element = tool.Ifc.get_entity(bpy.context.active_object)
-        if bpy.context.active_object.data.BIMMeshProperties.subshape_type == "PROFILE":
-            if element.is_a("IfcProfileDef"):
-                bpy.ops.bim.edit_arbitrary_profile()
-            elif element.is_a("IfcRelSpaceBoundary"):
-                bpy.ops.bim.edit_boundary_geometry()
-            else:
+        if tool.Ifc.get_entity(bpy.context.active_object):
+            if bpy.context.active_object.data.BIMMeshProperties.subshape_type == "PROFILE":
                bpy.ops.bim.edit_extrusion_profile()
-        elif bpy.context.active_object.data.BIMMeshProperties.subshape_type == "AXIS":
-            bpy.ops.bim.edit_extrusion_axis()
+            elif bpy.context.active_object.data.BIMMeshProperties.subshape_type == "AXIS":
+                bpy.ops.bim.edit_extrusion_axis()
+
+            elif (
+                (RailingData.is_loaded or not RailingData.load())
+                and RailingData.data["parameters"]
+                and bpy.context.active_object.BIMRailingProperties.is_editing_path
+            ):
+                bpy.ops.bim.finish_editing_railing_path()
+
+            elif (
+                (RoofData.is_loaded or not RoofData.load())
+                and RoofData.data["parameters"]
+                and bpy.context.active_object.BIMRoofProperties.is_editing_path
+            ):
+                bpy.ops.bim.finish_editing_roof_path()
+
+        else:
+            bpy.ops.bim.edit_arbitrary_profile()

    def hotkey_S_R(self):
        if self.is_profile():
            bpy.ops.bim.add_rectangle(x=self.props.x, y=self.props.y)
        elif (
            (RoofData.is_loaded or not RoofData.load())
-            and RoofData.data["pset_data"]
+            and RoofData.data["parameters"]
            and bpy.context.active_object.BIMRoofProperties.is_editing_path
        ):
            bpy.ops.bim.set_gable_roof_edge_angle(
@@ -20,33 +20,26 @@ import bpy
 from . import ui, prop, operator

 classes = (
-    operator.AddClashSet,
-    operator.AddClashSource,
-    operator.ExecuteIfcClash,
    operator.ExportClashSets,
    operator.ImportClashSets,
-    operator.LoadIfcClashes,
-    operator.SaveIfcClashes,
-    operator.LoadSmartGroupsForActiveClashSet,
+    operator.AddClashSet,
    operator.RemoveClashSet,
+    operator.AddClashSource,
    operator.RemoveClashSource,
-    operator.SelectClash,
-    operator.SelectClashResults,
    operator.SelectClashSource,
+    operator.ExecuteIfcClash,
    operator.SelectIfcClashResults,
-    operator.SelectSmartGroup,
+    operator.SelectClashResults,
    operator.SelectSmartGroupedClashesPath,
    operator.SmartClashGroup,
-    prop.Clash,
+    operator.SelectSmartGroup,
+    operator.LoadSmartGroupsForActiveClashSet,
    prop.ClashSource,
    prop.ClashSet,
    prop.SmartClashGroup,
    prop.BIMClashProperties,
    ui.BIM_PT_ifcclash,
    ui.BIM_PT_clash_manager,
-    ui.BIM_PT_dumb_clash_manager,
-    ui.BIM_PT_smart_clash_manager,
-    ui.BIM_UL_clashes,
    ui.BIM_UL_clash_sets,
    ui.BIM_UL_smart_groups,
 )
@@ -23,10 +23,9 @@ import bmesh
 import logging
 import numpy as np
 import ifcopenshell
-from mathutils import Matrix, Vector
+from mathutils import Matrix
 from math import radians
 from blenderbim.bim.ifc import IfcStore
-import blenderbim.tool as tool


 class ExportClashSets(bpy.types.Operator):
@@ -223,7 +222,6 @@ class ExecuteIfcClash(bpy.types.Operator):
        _, extension = os.path.splitext(self.filepath)
        if extension != ".json":
            self.filepath = bpy.path.ensure_ext(self.filepath, ".bcf")
-
        settings = ifcclash.ClashSettings()
        settings.output = self.filepath
        settings.logger = logging.getLogger("Clash")
@@ -232,30 +230,12 @@ class ExecuteIfcClash(bpy.types.Operator):

        if context.scene.BIMClashProperties.should_create_clash_snapshots:

-            def get_viewpoint_snapshot(viewpoint):
+            def get_viewpoint_snapshot(viewpoint, mat):
                camera = bpy.data.objects.get("IFC Clash Camera")
                if not camera:
                    camera = bpy.data.objects.new("IFC Clash Camera", bpy.data.cameras.new("IFC Clash Camera"))
                    context.scene.collection.objects.link(camera)
-
-                bcf_camera = viewpoint.visualization_info.perspective_camera
-                p = bcf_camera.camera_view_point
-                z = bcf_camera.camera_direction
-                z = Vector([z.x, z.y, z.z]) * -1
-                y = bcf_camera.camera_up_vector
-                y = Vector([y.x, y.y, y.z])
-                x = y.cross(z)
-
-                mat = Matrix(
-                    [
-                        [x[0], y[0], z[0], p.x],
-                        [x[1], y[1], z[1], p.y],
-                        [x[2], y[2], z[2], p.z],
-                        [0, 0, 0, 0],
-                    ]
-                )
-
-                camera.matrix_world = mat
+                camera.matrix_world = Matrix(mat)
                context.scene.camera = camera
                camera.data.angle = radians(60)
                area = next(area for area in context.screen.areas if area.type == "VIEW_3D")
@@ -266,8 +246,7 @@ class ExecuteIfcClash(bpy.types.Operator):
                context.scene.render.image_settings.file_format = "PNG"
                context.scene.render.filepath = os.path.join(context.scene.BIMProperties.data_dir, "snapshot.png")
                bpy.ops.render.opengl(write_still=True)
-                with open(context.scene.render.filepath, "rb") as f:
-                    return ("snapshot.png", f.read())
+                return context.scene.render.filepath

            clasher.get_viewpoint_snapshot = get_viewpoint_snapshot

@@ -339,132 +318,12 @@ class SelectIfcClashResults(bpy.types.Operator):
            else:
                element_file = self.file

-            try:
-                element = element_file.by_id(obj.BIMObjectProperties.ifc_definition_id)
-            except:
-                continue
-
-            global_id = getattr(element, "GlobalId", None)
-            if not global_id:
-                continue
-            if global_id in global_ids:
+            element = element_file.by_id(obj.BIMObjectProperties.ifc_definition_id)
+            if element.GlobalId in global_ids:
                obj.select_set(True)
        return {"FINISHED"}


-class LoadIfcClashes(bpy.types.Operator):
-    bl_idname = "bim.load_ifc_clashes"
-    bl_label = "Load IFC Clashes"
-    bl_options = {"REGISTER", "UNDO"}
-    bl_description = "Load the clashing IFC geometry stored in a file"
-    filename_ext = ".json"
-    filepath: bpy.props.StringProperty(subtype="FILE_PATH")
-
-    def invoke(self, context, event):
-        self.filepath = bpy.path.ensure_ext(bpy.data.filepath, ".json")
-        WindowManager = context.window_manager
-        WindowManager.fileselect_add(self)
-        return {"RUNNING_MODAL"}
-
-    def execute(self, context):
-        self.file = IfcStore.get_file()
-        self.filepath = bpy.path.ensure_ext(self.filepath, ".json")
-        with open(self.filepath) as f:
-            clash_sets_json = json.load(f)
-        active_clash_set = context.scene.BIMClashProperties.active_clash_set
-
-        for clash_set in clash_sets_json:
-            if not "clashes" in clash_set.keys():
-                self.report({"WARNING"}, "No clashes found for the selected Clash Set.")
-                return {"CANCELLED"}
-            active_clash_set.clashes.clear()
-            for clash in clash_set["clashes"].values():
-                blender_clash = active_clash_set.clashes.add()
-                blender_clash.a_global_id = clash["a_global_id"]
-                blender_clash.b_global_id = clash["b_global_id"]
-                blender_clash.a_name = "{}/{}".format(clash["a_ifc_class"], clash["a_name"])
-                blender_clash.b_name = "{}/{}".format(clash["b_ifc_class"], clash["b_name"])
-                blender_clash.status = False if not "status" in clash.keys() else clash["status"]
-        return {"FINISHED"}
-
-
-class SaveIfcClashes(bpy.types.Operator):
-    bl_idname = "bim.save_ifc_clashes"
-    bl_label = "Save IFC Clashes"
-    bl_options = {"REGISTER", "UNDO"}
-    bl_description = "Save the clashing IFC geometry stored in a file"
-    filename_ext = ".json"
-    filepath: bpy.props.StringProperty(subtype="FILE_PATH")
-
-    def invoke(self, context, event):
-        self.filepath = bpy.path.ensure_ext(bpy.data.filepath, ".json")
-        WindowManager = context.window_manager
-        WindowManager.fileselect_add(self)
-        return {"RUNNING_MODAL"}
-
-    def execute(self, context):
-        self.file = IfcStore.get_file()
-        self.filepath = bpy.path.ensure_ext(self.filepath, ".json")
-        clash_sets_json = self.load_json()
-        active_clash_set = context.scene.BIMClashProperties.active_clash_set
-        self.update_clash_sets(clash_sets_json, active_clash_set)
-        self.save_json(clash_sets_json)
-        return {"FINISHED"}
-
-    def load_json(self):
-        with open(self.filepath) as f:
-            return json.load(f)
-
-    def update_clash_sets(self, clash_sets_json, active_clash_set):
-        for clash_set in clash_sets_json:
-            if clash_set["name"] != active_clash_set.name or "clashes" not in clash_set.keys():
-                continue
-            for clash in active_clash_set.clashes:
-                clash_key = clash.a_global_id + "-" + clash.b_global_id
-                if clash_set.get("clashes", {}).get(clash_key, None) is not None:
-                    clash_set["clashes"][clash_key]["status"] = clash.status
-
-    def save_json(self, clash_sets_json):
-        with open(self.filepath, "w") as destination:
-            json.dump(clash_sets_json, destination, indent=4)
-
-
-class SelectClash(bpy.types.Operator):
-    bl_idname = "bim.select_clash"
-    bl_label = "Select Clash"
-    bl_options = {"REGISTER", "UNDO"}
-    bl_description = "Select the clashing IFC geometry stored in a file"
-    index: bpy.props.IntProperty()
-
-    def execute(self, context):
-        clash = context.scene.BIMClashProperties.active_clash
-
-        products = []
-        linked_objects = []
-        try:
-            products.append(tool.Ifc.get().by_guid(clash.a_global_id))
-        except:
-            linked_objects.append(clash.a_name)
-        try:
-            products.append(tool.Ifc.get().by_guid(clash.b_global_id))
-        except:
-            linked_objects.append(clash.b_name)
-
-        tool.Spatial.select_products(products, unhide=True)
-        print(linked_objects)
-        for obj_name in linked_objects:
-            obj = bpy.data.objects.get(obj_name)
-            if obj:
-                obj.select_set(True)
-            else:
-                print("Object not found:", obj_name)
-        if context.scene.BIMClashProperties.sould_focus_on_clash:
-            context_override = tool.Blender.get_viewport_context()
-            with bpy.context.temp_override(**context_override):
-                bpy.ops.view3d.view_selected()
-        return {"FINISHED"}
-
-
 class SmartClashGroup(bpy.types.Operator):
    bl_idname = "bim.smart_clash_group"
    bl_label = "Smart Group Clashes"
@@ -549,9 +408,9 @@ class LoadSmartGroupsForActiveClashSet(bpy.types.Operator):
                    new_group = context.scene.BIMClashProperties.smart_clash_groups.add()
                    new_group.number = f"{smart_group}"
                    for pair in global_id_pairs:
-                        for guid in pair:
+                        for id in pair:
                            new_global_id = new_group.global_ids.add()
-                            new_global_id.guid = guid
+                            new_global_id.name = id

        return {"FINISHED"}

@@ -566,16 +425,20 @@ class SelectSmartGroup(bpy.types.Operator):
        return IfcStore.get_file() and context.visible_objects and context.scene.BIMClashProperties.active_smart_group

    def execute(self, context):
+        self.file = IfcStore.get_file()
+        # Select smart group in view
        selected_smart_group = context.scene.BIMClashProperties.active_smart_group
-        products = []
-        for global_id in selected_smart_group.global_ids:
-            try:
-                products.append(tool.Ifc.get().by_guid(global_id.guid))
-            except:
-                continue
-        tool.Spatial.select_products(products, unhide=True)
-        context_override = tool.Blender.get_viewport_context()
-        with bpy.context.temp_override(**context_override):
-            bpy.ops.view3d.view_selected()
-        return {"FINISHED"}
+        # print(selected_smart_group.number)

+        for obj in context.visible_objects:
+            if not obj.BIMObjectProperties.ifc_definition_id:
+                continue
+            element = self.file.by_id(obj.BIMObjectProperties.ifc_definition_id)
+            for id in selected_smart_group.global_ids:
+                # print("Id: ", id)
+                # print("Global id: ", element.GlobalId)
+                if element.GlobalId in id.name:
+                    # print("object match: ", global_id)
+                    obj.select_set(True)
+
+        return {"FINISHED"}
@@ -43,20 +43,11 @@ class ClashSource(PropertyGroup):
    )


-class Clash(PropertyGroup):
-    a_global_id: StringProperty(name="A")
-    b_global_id: StringProperty(name="B")
-    a_name: StringProperty(name="A Name")
-    b_name: StringProperty(name="B Name")
-    status: BoolProperty(name="Status", default=False)
-
-
 class ClashSet(PropertyGroup):
    name: StringProperty(name="Name")
    tolerance: FloatProperty(name="Tolerance")
    a: CollectionProperty(name="Group A", type=ClashSource)
    b: CollectionProperty(name="Group B", type=ClashSource)
-    clashes: CollectionProperty(name="Clashes", type=Clash)


 class SmartClashGroup(PropertyGroup):
@@ -72,13 +63,11 @@ class BIMClashProperties(PropertyGroup):
    clash_results_path: StringProperty(name="Clash Results Path")
    smart_grouped_clashes_path: StringProperty(name="Smart Grouped Clashes Path")
    active_clash_set_index: IntProperty(name="Active Clash Set Index")
-    active_clash_index: IntProperty(name="Active Clash Index")
    smart_clash_groups: CollectionProperty(name="Smart Clash Groups", type=SmartClashGroup)
    active_smart_group_index: IntProperty(name="Active Smart Group Index")
    smart_clash_grouping_max_distance: IntProperty(
        name="Smart Clash Grouping Max Distance", default=3, soft_min=1, soft_max=10
    )
-    sould_focus_on_clash: BoolProperty(name="Show Focus Clash", default=False)

    @property
    def active_clash_set(self):
@@ -91,9 +80,3 @@ class BIMClashProperties(PropertyGroup):
        if not self.smart_clash_groups:
            return None
        return self.smart_clash_groups[self.active_smart_group_index]
-
-    @property
-    def active_clash(self):
-        if not self.active_clash_set:
-            return None
-        return self.active_clash_set.clashes[self.active_clash_index]
@@ -21,13 +21,13 @@ from bpy.types import Panel


 class BIM_PT_ifcclash(Panel):
-    bl_label = "Clash Sets"
+    bl_label = "IFC Clash Sets"
    bl_idname = "BIM_PT_ifcclash"
    bl_options = {"DEFAULT_CLOSED"}
    bl_space_type = "PROPERTIES"
    bl_region_type = "WINDOW"
    bl_context = "scene"
-    bl_parent_id = "BIM_PT_tab_clash_detection"
+    bl_parent_id = "BIM_PT_quality_control"

    def draw(self, context):
        layout = self.layout
@@ -102,46 +102,9 @@ class BIM_PT_clash_manager(Panel):
    bl_idname = "BIM_PT_clash_manager"
    bl_label = "Clash Manager"
    bl_options = {"DEFAULT_CLOSED"}
-    bl_space_type = "PROPERTIES"
-    bl_region_type = "WINDOW"
-    bl_context = "scene"
-    bl_parent_id = "BIM_PT_tab_clash_detection"
-
-    def draw(self, context):
-        pass
-
-
-class BIM_PT_dumb_clash_manager(Panel):
-    bl_idname = "BIM_PT_dumb_clash_manager"
-    bl_label = "Dumb Manager"
-    bl_options = {"DEFAULT_CLOSED"}
-    bl_space_type = "PROPERTIES"
-    bl_region_type = "WINDOW"
-    bl_context = "scene"
-    bl_parent_id = "BIM_PT_clash_manager"
-
-    def draw(self, context):
-        layout = self.layout
-        props = context.scene.BIMClashProperties
-
-        row = layout.row(align=True)
-        row.operator("bim.load_ifc_clashes", text="LOAD IFC CLASHES", icon="IMPORT")
-        row.operator("bim.save_ifc_clashes", text="SAVE CLASH RESULTS", icon="EXPORT")
-        layout.template_list("BIM_UL_clashes", "", props.active_clash_set, "clashes", props, "active_clash_index")
-        # bim.select_clash
-        row = layout.row(align=True)
-        row.operator("bim.select_clash", text="SELECT CLASH", icon="IMPORT")
-        row.prop(props, "sould_focus_on_clash", icon="RESTRICT_VIEW_OFF")
-
-
-class BIM_PT_smart_clash_manager(Panel):
-    bl_idname = "BIM_PT_smart_clash_manager"
-    bl_label = "Smart Clash Manager"
-    bl_options = {"DEFAULT_CLOSED"}
-    bl_space_type = "PROPERTIES"
-    bl_region_type = "WINDOW"
-    bl_context = "scene"
-    bl_parent_id = "BIM_PT_clash_manager"
+    bl_space_type = "VIEW_3D"
+    bl_region_type = "UI"
+    bl_category = "BlenderBIM"

    def draw(self, context):
        layout = self.layout
@@ -192,14 +155,3 @@ class BIM_UL_smart_groups(bpy.types.UIList):
            layout.label(text=str(item.number), translate=False, icon="NONE", icon_value=0)
        else:
            layout.label(text="", translate=False)
-
-
-class BIM_UL_clashes(bpy.types.UIList):
-    def draw_item(self, context, layout, data, item, icon, active_data, active_propname):
-        if item:
-            row = layout.row(align=True)
-            row.label(text=str(item.a_name), translate=False, icon="NONE", icon_value=0)
-            row.label(text=str(item.b_name), translate=False, icon="NONE", icon_value=0)
-            row.prop(item, "status", text="")
-        else:
-            layout.label(text="", translate=False)
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Jesusbill	07745aa6bc	Fix #2998	2023-04-27 13:26:47 +02:00
Jesusbill	45afaba63e	Add face creation when adding representation for surface structural items #2999	2023-04-27 09:54:51 +02:00