Procedurally generating list of props for shading styles to cover more props

If it will be too much we still have option to exclude some of them
Remove the cryptic (and slightly annoying) console warning logs when trying to display the type manager when there is no element type in the file
2026-08-21 12:36:00 +00:00 · 2023-05-25 14:50:45 +05:00 · 2023-05-24 16:54:57 +02:00 · 2023-05-24 16:06:33 +02:00 · 2023-05-24 18:02:53 +05:00 · 2023-05-24 17:41:10 +05:00
1682 changed files with 68756 additions and 1295175 deletions
@@ -1,24 +0,0 @@
-# We'll use defaults from the LLVM style with modifications
-BasedOnStyle: LLVM
-ColumnLimit: 0 # we do not enforce column lenght, please format responsibly
-IndentWidth: 4
---
-Language: Cpp
-AllowShortEnumsOnASingleLine: false
-AlwaysBreakTemplateDeclarations: Yes
-BinPackArguments: false
-BinPackParameters: false
-BraceWrapping:
-    SplitEmptyFunction: false
-    SplitEmptyRecord: false
-    SplitEmptyNamespace: false
-IncludeBlocks: Regroup
-InsertBraces: true
-InsertNewlineAtEOF: true
-PackConstructorInitializers: CurrentLine
-PointerAlignment: Left
-ReflowComments: false # keep licenze comment blocks
-SortIncludes: CaseInsensitive
-SpacesInLineCommentPrefix:
-    Maximum: 1
-TabWidth: 4
@@ -1,5 +0,0 @@
-Checks:          'bugprone-*,cert-*,clang-analyzer-*,readability-*'
-WarningsAsErrors: ''
-HeaderFilterRegex: ''
-AnalyzeTemporaryDtors: false
-FormatStyle: none
@@ -16,7 +16,7 @@ jobs:
    - run: echo ok go

  build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
    needs: activate
    steps:
    - uses: actions/checkout@v2
@@ -29,7 +29,7 @@ jobs:
        sudo apt-get install --no-install-recommends \
        git cmake gcc g++ libboost-all-dev python3-all-dev swig libpcre3-dev libxml2-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 nlohmann-json3-dev libeigen3-dev
+        libhdf5-dev libcgal-dev nlohmann-json3-dev

    -
      name: ccache
@@ -50,8 +50,8 @@ jobs:
         -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.10 \
-         -DPYTHON_LIBRARY:FILEPATH=/usr/lib/x86_64-linux-gnu/libpython3.10.so \
+         -DPYTHON_INCLUDE_DIR:PATH=/usr/include/python3.8 \
+         -DPYTHON_LIBRARY:FILEPATH=/usr/lib/x86_64-linux-gnu/libpython3.8.so \
         -DCOLLADA_SUPPORT=Off \
         -DLIBXML2_INCLUDE_DIR=/usr/include/libxml2 \
         -DLIBXML2_LIBRARIES=/usr/lib/x86_64-linux-gnu/libxml2.so \
@@ -63,7 +63,6 @@ jobs:
         -DHDF5_INCLUDE_DIR=/usr/include/hdf5/serial \
         -DGLTF_SUPPORT=On \
         -DJSON_INCLUDE_DIR=/usr/include \
-         -DEIGEN_DIR=/usr/include/eigen3 \
         ../cmake
        make -j $(nproc)
        make install
@@ -81,7 +80,7 @@ jobs:
        path: build/assets/Ifc*

  deliver:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
    needs: build
    name: Docker Build, Tag, Push

@@ -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,48 +0,0 @@
-name: ci-bsdd-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 * *"
-  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
-    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.11' # Version range or exact version of a Python version to use, using SemVer's version range syntax
-      - name: Compile
-        run: |
-          pip install build
-          cd src/bsdd &&
-          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/bsdd/dist
@@ -1,48 +0,0 @@
-name: ci-ifcclash-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 * *"
-  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
-    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.11' # Version range or exact version of a Python version to use, using SemVer's version range syntax
-      - name: Compile
-        run: |
-          pip install build
-          cd src/ifcclash &&
-          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/ifcclash/dist
@@ -1,48 +0,0 @@
-name: ci-ifccsv-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 * *"
-  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
-    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.11' # Version range or exact version of a Python version to use, using SemVer's version range syntax
-      - name: Compile
-        run: |
-          pip install build
-          cd src/ifccsv &&
-          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/ifccsv/dist
@@ -1,10 +1,18 @@
-name: ci-ifcopenshell-conda-daily-v0.8.0
+name: ci-ifcopenshell-conda-daily

 on:
-  workflow_dispatch:
  push:
-    branches:
-      - v0.8.0
+      paths:
+        - .github/workflows/ci-ifcopenshell-conda-daily.yml
+        - conda/**
+  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: "49 23 * * *" # 11min before utc midnight every day

 jobs:
  activate:
@@ -26,20 +34,19 @@ 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: win, distver: windows-latest, pkg_dir: 'win-64' },
-          { name: linux, distver: ubuntu-latest, pkg_dir: 'linux-64' },
-          { name: macOS, distver: macos-latest, pkg_dir: 'osx-64' }
+          { name: Windows, distver: windows-2022, upload: 'true' },
+          { name: Linux, distver: ubuntu-22.04,  upload: 'true' },
+          { name: macOS, distver: macos-12, upload: 'true' }
        ]
    steps:
      - uses: actions/checkout@v3
        with:
          submodules: recursive
-
-      - name: Download and extract MacOSX SDK
+      - name: Download MacOSX SDK
        if: ${{ matrix.platform.name == 'macOS' }}
        run: |
          curl -o MacOSX10.13.sdk.tar.xz -L https://github.com/phracker/MacOSX-SDKs/releases/download/11.3/MacOSX10.13.sdk.tar.xz && \
@@ -47,28 +54,20 @@ jobs:
          sudo mv -v MacOSX10.13.sdk /opt/ && \
          ls /opt/
      - uses: seanmiddleditch/gha-setup-ninja@master
-      - uses: mamba-org/setup-micromamba@v1 # https://github.com/mamba-org/setup-micromamba
+      - uses: mamba-org/provision-with-micromamba@main # https://github.com/mamba-org/provision-with-micromamba
        with:
-          environment-file: conda/environment.build.yml
-          create-args: >-
+          channels: conda-forge
+          channel-priority: strict
+          environment-file: conda/environment.yml
+          extra-specs: |
            python=${{ matrix.pyver.distver }}
-            anaconda-client
-
-      - name: create conda package dist dir
+      - name: build, test and upload ifcopenshell
+        if: ${{ matrix.platform.upload == 'true' }}
        run: |
-          mkdir -p ${{ github.workspace }}/dist
-
-      - name: build & test ifcopenshell
-        run: |
-          boa build . --python ${{ matrix.pyver.distver }} --no-remove-work-dir --output-folder '${{ github.workspace }}/dist'
+          conda-build . --python ${{ matrix.pyver.distver }} -c conda-forge --token ${{ secrets.ANACONDA_TOKEN }} --user ifcopenshell
        working-directory: ./conda
-
-      - name: upload to anaconda
-        if: ${{ matrix.platform.name == 'win' }}
+      - name: build & test ifcopenshell
+        if: ${{ matrix.platform.upload == 'false' }}
        run: |
-          anaconda -t ${{ secrets.ANACONDA_TOKEN }} upload --force --user ifcopenshell '${{ github.workspace }}/dist/${{ matrix.platform.pkg_dir }}/*.tar.bz2'
-
-      - name: upload to anaconda
-        if: ${{ matrix.platform.name != 'win' }}
-        run: |
-          anaconda -t ${{ secrets.ANACONDA_TOKEN }} upload --force --user ifcopenshell ${{ github.workspace }}/dist/${{ matrix.platform.pkg_dir }}/*.tar.bz2
+          conda-build . --python ${{ matrix.pyver.distver }} -c conda-forge
+        working-directory: ./conda
@@ -1,7 +1,6 @@
 name: ci-ifcopenshell-pypi

 on:
-  workflow_dispatch:
  schedule:
    #         ┌───────────── minute (0 - 59)
    #         │  ┌───────────── hour (0 - 23)
@@ -36,7 +35,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        pyver: [py39, py310, py311, py312]
+        pyver: [py36, py37, py38, py39, py310, py311]
        config:
          - {
            name: "Windows Build",
@@ -58,7 +57,7 @@ jobs:
      - uses: actions/checkout@v2
      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
        with:
-          python-version: '3.11' # Version range or exact version of a Python version to use, using SemVer's version range syntax
+          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
@@ -1,48 +0,0 @@
-name: ci-ifcpatch-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 * *"
-  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
-    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.11' # Version range or exact version of a Python version to use, using SemVer's version range syntax
-      - name: Compile
-        run: |
-          pip install build
-          cd src/ifcpatch &&
-          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/ifcpatch/dist
@@ -9,7 +9,10 @@ on:
    #         │  │ │ │ ┌───────────── day of the week (0 - 6 or SUN-SAT)
    #         *  * * * *
    - cron: "0 0 18 * *"
-  workflow_dispatch:
+  push:
+    paths:
+      - '.github/workflows/ci-ifctester-pypi.yml'
+

 env:
  major: 0
@@ -27,6 +30,7 @@ jobs:

  build:
    needs: activate
+    name: ${{ matrix.config.name }}-${{ matrix.pyver }}
    runs-on: ubuntu-latest
    strategy:
      fail-fast: false
@@ -34,7 +38,12 @@ jobs:
      - uses: actions/checkout@v2
      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
        with:
-          python-version: '3.11' # Version range or exact version of a Python version to use, using SemVer's version range syntax
+          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
@@ -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,10 +49,11 @@ 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 \
-          libhdf5-dev libcgal-dev libeigen3-dev
+          libhdf5-dev libcgal-dev
          
      - name: ccache
        uses: hendrikmuhs/ccache-action@v1
@@ -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,11 +71,11 @@ 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_add2" \
+               "-DSCHEMA_VERSIONS=2x3;4;4x3_add1" \
               -DGLTF_SUPPORT=On \
               -DJSON_INCLUDE_DIR=/usr/include \
               -DCGAL_INCLUDE_DIR=/usr/include \
@@ -99,7 +84,6 @@ jobs:
               -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 \
-               -DEIGEN_DIR=/usr/include/eigen3 \
             ../cmake
          sudo make -j $(nproc)
          sudo make install
@@ -118,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
@@ -76,28 +84,11 @@ src/ifcopenshell-python/test/build
 # blenderbim libs
 src/blenderbim/blenderbim/libs

-# blenderbim i18n
-src/blenderbim/blenderbim/translations.py
-
 # blenderbim test temp files
 src/blenderbim/test/files/temp
-src/blenderbim/test/files/basic.ifc.cache.blend
-src/blenderbim/test/files/basic.ifc.cache.sqlite
-
 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,10 +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 "src/ifcconvert/cityjson"]
-	path = src/ifcconvert/cityjson
-	url = https://github.com/IfcOpenShell/ifc-to-cityjson
-[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,38 +2,34 @@
 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:

 * [IfcOpenShell Website](http://ifcopenshell.org)
-* [IfcOpenShell Documentation](https://docs.ifcopenshell.org)
-  * [IfcOpenShell C++ Installation](https://docs.ifcopenshell.org/ifcopenshell/installation.html)
-  * [IfcOpenShell Python Installation](https://docs.ifcopenshell.org/ifcopenshell-python/installation.html)
-  * [IfcOpenShell Python Hello World Tutorial](https://docs.ifcopenshell.org/ifcopenshell-python/hello_world.html)
+* [IfcOpenShell Documentation](http://blenderbim.org/docs-python)
+  * [IfcOpenShell C++ Installation](https://blenderbim.org/docs-python/ifcopenshell/installation.html)
+  * [IfcOpenShell Python Installation](https://blenderbim.org/docs-python/ifcopenshell-python/installation.html)
+  * [IfcOpenShell Python Hello World Tutorial](https://blenderbim.org/docs-python/ifcopenshell-python/hello_world.html)
 * [BlenderBIM Add-on Website](https://blenderbim.org)
-* [BlenderBIM Add-on Documentation](https://docs.blenderbim.org/index.html)
-  * [Add-on Installation](https://docs.blenderbim.org/users/installation.html)
-  * [Exploring an IFC model](https://docs.blenderbim.org/users/exploring_an_ifc_model.html)
+* [BlenderBIM Add-on Documentation](http://blenderbim.org/docs)
+  * [Add-on Installation](https://blenderbim.org/docs/users/installation.html)
+  * [Exploring an IFC model](https://blenderbim.org/docs/users/exploring_an_ifc_model.html)

 | Service                                         | Status                                                                                                                                       |
 | ----------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------- |
 | 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()
@@ -1,124 +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/>.         #
-#                                                                              #
-################################################################################
-
-# Create a cache entry if absent for environment variables
-macro(UNIFY_ENVVARS_AND_CACHE VAR)
-    if((NOT DEFINED ${VAR}) AND(NOT "$ENV{${VAR}}" STREQUAL ""))
-        set(${VAR} "$ENV{${VAR}}" CACHE STRING "${VAR}" FORCE)
-    endif()
-endmacro()
-
-# Set INSTALL_RPATH for target with given paths
-macro(SET_INSTALL_RPATHS _target _paths)
-    set(${_target}_rpaths "")
-
-    foreach(_path ${_paths})
-        list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${_path}" isSystemDir)
-
-        if("${isSystemDir}" STREQUAL "-1")
-            list(APPEND ${_target}_rpaths ${_path})
-        endif()
-    endforeach()
-
-    message(STATUS "Set INSTALL_RPATH for ${_target}: ${${_target}_rpaths}")
-    set_target_properties(${_target} PROPERTIES INSTALL_RPATH "${${_target}_rpaths}")
-endmacro()
-
-# Get a list of all OPTION flags from the CMakeLists.txt and store in an output LIST
-function(get_all_option_flags output_list)
-    # Read the contents of the CMakeLists.txt
-    file(READ "${CMAKE_SOURCE_DIR}/CMakeLists.txt" cmake_contents)
-
-    # Find all OPTION flags using a regular expression
-    string(REGEX MATCHALL "[oO][pP][tT][iI][oO][nN]\\s*\\(\\s*([A-Za-z0-9_]+)" matches "${cmake_contents}")
-
-    # Extract the variable names from the matches
-    set(option_flags)
-    foreach(match IN LISTS matches)
-        string(REGEX REPLACE "[oO][pP][tT][iI][oO][nN]\\s*\\(\\s*([A-Za-z0-9_]+)" "\\1" option_flag "${match}")
-        list(APPEND option_flags "${option_flag}")
-    endforeach()
-
-    # Return the list of OPTION flags
-    set(${output_list} "${option_flags}" PARENT_SCOPE)
-endfunction()
-
-# Loop through a LIST of OPTION flags and convert to corresponding environment variables
-function(convert_env_var_to_bool var_name)
-    if(DEFINED ENV{${var_name}})
-        string(TOUPPER "$ENV{${var_name}}" bool_value)
-        if(bool_value STREQUAL "ON" OR bool_value STREQUAL "TRUE" OR bool_value STREQUAL "1")
-            set(${var_name} ON CACHE BOOL "${var_name} as boolean" FORCE)
-        elseif(bool_value STREQUAL "OFF" OR bool_value STREQUAL "FALSE" OR bool_value STREQUAL "0")
-            set(${var_name} OFF CACHE BOOL "${var_name} as boolean" FORCE)
-        else()
-            # Not a bool, leave it as a string
-        endif()
-    else()
-        # Not defined, leave it as a string
-    endif()
-endfunction()
-
-# Usage:
-# set(SOME_LIRARIES foo bar)
-# add_debug_variants(SOME_LIRARIES "${SOME_LIRARIES}" d)
-# "foo bar" -> "optimized foo debug food optimized bar debug bard"
-# or
-# set(SOME_LIRARIES path/foo.lib)
-# add_debug_variants(SOME_LIRARIES "${SOME_LIRARIES}" "d")
-# "path/foo.lib" -> "optimized path/foo.lib debug path/food.lib"
-# TODO Could be refined: take the library file extension as a parameter and
-# make sure the lib variable ends with not just contains it.
-function(add_debug_variants NAME LIBRARIES POSTFIX)
-    set(LIBRARIES_STR "${LIBRARIES}")
-    set(LIBRARIES "")
-
-    # the result, "optimized <lib> debug <lib>", needs to be a list instead of a string
-    foreach(lib ${LIBRARIES_STR})
-        list(APPEND LIBRARIES optimized)
-
-        if("${lib}" MATCHES ".lib")
-            string(REPLACE ".lib" "" lib ${lib})
-            list(APPEND LIBRARIES ${lib}.lib)
-        else()
-            list(APPEND LIBRARIES ${lib})
-        endif()
-
-        list(APPEND LIBRARIES debug)
-
-        if("${lib}" MATCHES ".lib")
-            string(REPLACE ".lib" "" lib ${lib})
-            list(APPEND LIBRARIES ${lib}${POSTFIX}.lib)
-        else()
-            list(APPEND LIBRARIES ${lib}${POSTFIX})
-        endif()
-    endforeach()
-
-    set(${NAME} ${LIBRARIES} PARENT_SCOPE)
-endfunction()
-
-function(files_for_ifc_version IFC_VERSION RESULT_NAME)
-    set(IFC_PARSE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../src/ifcparse)
-    set(${RESULT_NAME}
-        ${IFC_PARSE_DIR}/Ifc${IFC_VERSION}.h
-        ${IFC_PARSE_DIR}/Ifc${IFC_VERSION}enum.h
-        ${IFC_PARSE_DIR}/Ifc${IFC_VERSION}.cpp
-        PARENT_SCOPE
-    )
-endfunction()
@@ -1 +0,0 @@
-.env
@@ -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
@@ -1,10 +1,9 @@
 mkdir build && cd build

 set MY_PY_VER=%PY_VER:.=%
-rem set LIBXML2="%LIBRARY_PREFIX%/lib/libxml2.lib"
+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%" ^
@@ -12,9 +11,6 @@ cmake -G "Ninja" ^
 -D OCC_INCLUDE_DIR:FILEPATH="%LIBRARY_PREFIX%\include\opencascade" ^
 -D OCC_LIBRARY_DIR:FILEPATH="%LIBRARY_PREFIX%\lib" ^
 -D CGAL_INCLUDE_DIR:FILEPATH="%LIBRARY_PREFIX%\include" ^
- -D EIGEN_DIR:FILEPATH="%LIBRARY_PREFIX%\include\eigen3" ^
- -D LIBXML2_INCLUDE_DIR=%LIBRARY_PREFIX%/include/libxml2 ^
- -D LIBXML2_LIBRARIES=%LIBRARY_PREFIX%/lib/libxml2.lib ^
 -D GMP_INCLUDE_DIR:FILEPATH="%LIBRARY_PREFIX%\include" ^
 -D GMP_LIBRARY_DIR:FILEPATH="%LIBRARY_PREFIX%\lib" ^
 -D MPFR_LIBRARY_DIR:FILEPATH="%LIBRARY_PREFIX%\lib" ^
@@ -35,10 +31,9 @@ cmake -G "Ninja" ^
 -D BUILD_CONVERT:BOOL=ON ^
 -D BUILD_IFCMAX:BOOL=OFF ^
 -D IFCXML_SUPPORT:BOOL=ON ^
- -D Boost_LIBRARY_DIR:FILEPATH="%LIBRARY_PREFIX%\lib" ^
- -D Boost_INCLUDE_DIR:FILEPATH="%LIBRARY_PREFIX%\include" ^
+ -D Boost_LIBRARYDIR:FILEPATH="%LIBRARY_PREFIX%\lib" ^
+ -D Boost_INCLUDEDIR:FILEPATH="%LIBRARY_PREFIX%\include" ^
 -D Boost_USE_STATIC_LIBS:BOOL=OFF ^
- -D CITYJSON_SUPPORT:BOOL=OFF ^
 %SRC_DIR%/cmake

 if errorlevel 1 exit 1
@@ -1,21 +1,18 @@
 #!/bin/bash

-# IF osx use file lib suffix .dylib
-# IF linux use file lib suffix .so
-# IF windows use file lib suffix .dll
+declare -a CMAKE_PLATFORM_FLAGS

-if [ "$(uname)" == "Darwin" ]; then
-    export FSUFFIX=dylib
-    export CFLAGS="$CFLAGS -Wl,-flat_namespace,-undefined,suppress"
-    export CXXFLAGS="$CXXFLAGS -Wl,-flat_namespace,-undefined,suppress"
-    export LDFLAGS="$LDFLAGS -Wl,-flat_namespace,-undefined,suppress"
-elif [ "$(expr substr $(uname -s) 1 5)" == "Linux" ]; then
-    export FSUFFIX=so
+if [[ ${HOST} =~ .*linux.* ]]; then
+    CMAKE_PLATFORM_FLAGS+=(-DCMAKE_TOOLCHAIN_FILE=$RECIPE_DIR/cross-linux.cmake)
 fi

+if [ `uname` == Darwin ]; then
+  export CFLAGS="$CFLAGS   -Wl,-flat_namespace,-undefined,suppress"
+  export CXXFLAGS="$CXXFLAGS -Wl,-flat_namespace,-undefined,suppress"
+  export LDFLAGS="$LDFLAGS  -Wl,-flat_namespace,-undefined,suppress"
+fi

 cmake -G Ninja \
- -DSCHEMA_VERSIONS="2x3;4;4x1;4x3;4x3_add1" \
 -DCMAKE_BUILD_TYPE=Release \
 -DCMAKE_INSTALL_PREFIX=$PREFIX \
  ${CMAKE_PLATFORM_FLAGS[@]} \
@@ -31,10 +28,7 @@ cmake -G Ninja \
 -DHDF5_LIBRARY_DIR=$PREFIX/lib \
 -DJSON_INCLUDE_DIR=$PREFIX/include \
 -DCGAL_INCLUDE_DIR=$PREFIX/include \
- -DLIBXML2_INCLUDE_DIR=$PREFIX/include/libxml2 \
- -DLIBXML2_LIBRARIES=$PREFIX/lib/libxml2.$FSUFFIX \
- -DEIGEN_DIR:FILEPATH=$PREFIX/include/eigen3 \
- -DCOLLADA_SUPPORT:BOOL=OFF \
+ -DCOLLADA_SUPPORT=0 \
 -DBUILD_EXAMPLES:BOOL=OFF \
 -DIFCXML_SUPPORT:BOOL=ON \
 -DGLTF_SUPPORT:BOOL=ON \
@@ -43,9 +37,8 @@ cmake -G Ninja \
 -DBUILD_IFCGEOM:BOOL=ON \
 -DBUILD_GEOMSERVER:BOOL=OFF \
 -DBOOST_USE_STATIC_LIBS:BOOL=OFF \
- -DCITYJSON_SUPPORT:BOOL=OFF \
 ./cmake

 ninja

-ninja install -j 1
+ninja install -j 2
@@ -1,11 +1,2 @@
-CONDA_BUILD_SYSROOT: # used for github actions conda daily build
-  - /Users/runner/work/MacOSX10.13.sdk       # [osx]
-
-occt:
-  - 7.7.1
-
-c_compiler:
-  - vs2022  # [win]
-
-cxx_compiler:
-  - vs2022  # [win]
+CONDA_BUILD_SYSROOT:
+  - /opt/MacOSX10.13.sdk       # [osx]
@@ -0,0 +1,16 @@
+# this one is important
+set(CMAKE_SYSTEM_NAME Linux)
+set(CMAKE_PLATFORM Linux)
+
+# specify the cross compiler
+set(CMAKE_C_COMPILER $ENV{CC})
+set(CMAKE_CXX_COMPILER $ENV{CXX})
+
+# where is the target environment
+set(CMAKE_FIND_ROOT_PATH $ENV{PREFIX} $ENV{BUILD_PREFIX}/$ENV{HOST}/sysroot)
+
+# search for programs in the build host directories
+set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+# for libraries and headers in the target directories
+set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
@@ -1,58 +0,0 @@
-@echo off
-
-:: This is a batch file to set the environment variables for the project
-:: It is not necessary for conda compilation, but it provides you with type hints when working with the c++ libraries
-:: OpenCascade, CGAL, Eigen, etc distributed using conda-forge in your IDE.
-::
-:: mamba env update -f environment.build.yml --prune
-:: mamba activate ifcopenshell-build
-::
-:: Note!
-:: You have to add a .env file next to this env.bat file where you set PREFIX=<path to your conda env>
-set CONDA_BUILD=1
-set MY_PY_VER=311
-
-:: set this file's parent directory as a variable
-set THIS_DIR=%~dp0
-
-:: read the .env file located in THIS_DIR and set the environment variables.
-:: the .env file should contain a line like this:
-:: PREFIX=C:\Users\your_user_name\mambaforge3\envs\ifcopenshell-build
-for /f "tokens=*" %%i in (%THIS_DIR%.env) do set %%i
-
-set LIBRARY_PREFIX=%PREFIX%/Library
-set CMAKE_PREFIX_PATH=%PREFIX%;%LIBRARY_PREFIX%/include;%LIBRARY_PREFIX%/lib;%LIBRARY_PREFIX%/bin
-
-set OCC_LIBRARY_DIR=%LIBRARY_PREFIX%/lib
-set OCC_INCLUDE_DIR=%LIBRARY_PREFIX%/include/opencascade
-
-set CGAL_DIR=%LIBRARY_PREFIX%/lib/cmake/CGAL
-set CGAL_INCLUDE_DIR=%LIBRARY_PREFIX%/include
-set EIGEN_DIR=%LIBRARY_PREFIX%/include/eigen3
-set LIBXML2_INCLUDE_DIR=%LIBRARY_PREFIX%/include/libxml2
-set LIBXML2_LIBRARIES=%LIBRARY_PREFIX%/lib/libxml2.lib
-set Boost_LIBRARY_DIR=%LIBRARY_PREFIX%/lib
-set Boost_INCLUDE_DIR=%LIBRARY_PREFIX%/include
-set Boost_USE_STATIC_LIBS=OFF
-
-set GMP_INCLUDE_DIR=%LIBRARY_PREFIX%/include
-set GMP_LIBRARY_DIR=%LIBRARY_PREFIX%/lib
-set MPFR_LIBRARY_DIR=%LIBRARY_PREFIX%/lib
-
-set HDF5_INCLUDE_DIR=%LIBRARY_PREFIX%/include
-set HDF5_LIBRARY_DIR=%LIBRARY_PREFIX%/lib
-set JSON_INCLUDE_DIR=%LIBRARY_PREFIX%/include
-
-set HDF5_SUPPORT=ON
-set BUILD_IFCPYTHON=ON
-set BUILD_IFCGEOM=ON
-set COLLADA_SUPPORT=OFF
-set BUILD_EXAMPLES=OFF
-set BUILD_GEOMSERVER=OFF
-set GLTF_SUPPORT=ON
-set BUILD_CONVERT=ON
-set BUILD_IFCMAX=OFF
-set IFCXML_SUPPORT=ON
-
-set PYTHON_EXECUTABLE=%PREFIX%/python.exe
-set PYTHON_LIBRARY=%PREFIX%/libs/python%MY_PY_VER%.lib
@@ -1,17 +0,0 @@
-name: ifcopenshell-build
-channels:
-  - conda-forge
-dependencies:
-  - boa
-  - boost-cpp
-  - occt
-  - libxml2
-  - cgal-cpp
-  - hdf5
-  - mpfr
-  - nlohmann_json
-  - swig
-  - zlib
-  # These needs to be installed per platform
-  #- sel(unix): gmp
-  #- sel(win): mpir
@@ -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,24 +1,25 @@
-context:
-  name: ifcopenshell
-  version: 0.8.0alpha1
+{% set name = "ifcopenshell" %}
+{% set version = "0.7.0" %}
+

 package:
-  name: '{{ name|lower }}'
-  version: '{{ version }}'
+  name: {{ name }}
+  version: {{ version }}

 source:
  path: ..

 build:
+  binary_relocation: false [osx]
  number: 1

 requirements:
  build:
-    - "{{ compiler('c') }}"
-    - "{{ compiler('cxx') }}"
+    - {{ compiler('c') }}
+    - {{ compiler('cxx') }}
    - ninja >=1.10.2
    - cmake
-    - swig 4.1.1
+    - swig >=4.0.2

  host:
    - python
@@ -27,24 +28,22 @@ requirements:
    - libxml2
    - cgal-cpp
    - hdf5
-    - eigen
    - mpfr
-    - sel(unix): gmp
-    - sel(win): mpir
+    - gmp  # [unix]
+    - mpir  # [win]
    - nlohmann_json
    - zlib

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

@@ -53,12 +52,12 @@ test:
    - 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://blenderbim.org/docs-python/
+  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,10 +76,10 @@ PROJECT_NAME = "IfcOpenShell"
 USE_CURRENT_PYTHON_VERSION = os.getenv("USE_CURRENT_PYTHON_VERSION")
 ADD_COMMIT_SHA = os.getenv("ADD_COMMIT_SHA")

-PYTHON_VERSIONS = ["3.9.11", "3.10.3", "3.11.8", "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.7.1"
+OCCT_VERSION = "7.5.3"
 BOOST_VERSION = "1.80.0"
 PCRE_VERSION = "8.41"
 LIBXML2_VERSION = "2.9.11"
@@ -186,7 +186,7 @@ cecho(""" - How many compiler processes may be run in parallel.

 dependency_tree = {
    'IfcParse': ('boost', 'libxml2', 'hdf5'),
-    'IfcGeom': ('IfcParse', 'occ', 'json', 'cgal', 'eigen'),
+    'IfcGeom': ('IfcParse', 'occ', 'json', 'cgal'),
    'IfcConvert': ('IfcGeom',),
    'OpenCOLLADA': ('libxml2', 'pcre'),
    'IfcGeomServer': ('IfcGeom',),
@@ -200,7 +200,6 @@ dependency_tree = {
    'json': (),
    'hdf5': (),
    'cgal': (),
-    'eigen': (),
    'freetype': (),
 }

@@ -255,11 +254,6 @@ if not os.path.exists(LOG_FILE):
    open(LOG_FILE, "w").close()
 logger.info(f"using command log file '{LOG_FILE}'")

-# Causing havoc in python 3.11 build
-try:
-    del os.environ['__PYVENV_LAUNCHER__']
-except: pass
-
 def run(cmds, cwd=None, can_fail=False):

    """
@@ -290,9 +284,8 @@ if platform.system() == "Darwin":
        # Apparently not supported
        PYTHON_VERSIONS = [pv for pv in PYTHON_VERSIONS if tuple(map(int, pv.split("."))) >= (3, 7)]
    if run(["sw_vers", "-productVersion"]) < "10.16":
-        # This is now solved with the '__PYVENV_LAUNCHER__' hack
-        # PYTHON_VERSIONS = [pv for pv in PYTHON_VERSIONS if tuple(map(int, pv.split("."))) < (3, 11)]
-        pass
+        # Apparently not supported
+        PYTHON_VERSIONS = [pv for pv in PYTHON_VERSIONS if tuple(map(int, pv.split("."))) < (3, 11)]

 BOOST_VERSION_UNDERSCORE = BOOST_VERSION.replace(".", "_")

@@ -521,9 +514,6 @@ if "json" in targets:
        os.makedirs(os.path.dirname(json_install_path))
    if not os.path.exists(json_install_path):
        urlretrieve(json_url, json_install_path)
-        
-if "eigen" in targets:
-    git_clone_or_pull_repository("https://gitlab.com/libeigen/eigen.git", f"{DEPS_DIR}/install/eigen-3.3.9", revision="3.3.9")

 if "pcre" in targets:
    build_dependency(
@@ -563,9 +553,6 @@ if USE_OCCT and "occ" in targets:
    patches = []
    if OCCT_VERSION < "7.4":
        patches.append("./patches/occt/enable-exception-handling.patch")
-        
-    if OCCT_VERSION == "7.7.1":
-        patches.append("./patches/occt/no_ExpToCasExe.patch")
    
    if "wasm" in flags:
        patches.append("./patches/occt/no_em_js.patch")
@@ -580,7 +567,7 @@ if USE_OCCT and "occ" in targets:
            "-DBUILD_RELEASE_DISABLE_EXCEPTIONS=Off",
            f"-D3RDPARTY_FREETYPE_DIR={DEPS_DIR}/install/freetype"
        ],
-        download_url = "https://git.dev.opencascade.org/repos/occt.git",
+        download_url = "https://github.com/Open-Cascade-SAS/OCCT",
        download_name = "occt",
        download_tool=download_tool_git,
        patch=patches,
@@ -774,7 +761,6 @@ cmake_args = [
    "-DBOOST_ROOT="                    f"{DEPS_DIR}/install/boost-{BOOST_VERSION}",
    "-DGLTF_SUPPORT="                  "ON",
    "-DJSON_INCLUDE_DIR="              f"{DEPS_DIR}/install/json",
-    "-DEIGEN_DIR="                     f"{DEPS_DIR}/install/eigen-3.3.9",
    "-DBoost_NO_BOOST_CMAKE="          "On",
    "-DADD_COMMIT_SHA="              +("On" if ADD_COMMIT_SHA else "Off")
 ]
@@ -906,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,13 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index fd17283f77..6cecf9dad3 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -826,6 +826,8 @@ if (EMSCRIPTEN)
-   list (REMOVE_ITEM BUILD_TOOLKITS ExpToCasExe)
- endif()
- 
-+list (REMOVE_ITEM BUILD_TOOLKITS ExpToCasExe)
-+
- # bison
- if (BUILD_YACCLEX)
-   OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/bison")
@@ -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,88 +36,141 @@ 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/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/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
+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/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
-endif
-ifeq ($(PYVERSION), py311)
-LXML_ARCH:=macosx_11_0_universal2
+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
+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/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/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
+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
-
-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
+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)
-LXML_URL:=https://anaconda.org/conda-forge/lxml/4.9.1/download/osx-arm64/lxml-4.9.1-py310h02f21da_0.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)
-LXML_URL:=https://anaconda.org/conda-forge/lxml/4.9.1/download/osx-arm64/lxml-4.9.1-py311h246f609_1.tar.bz2
+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
-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:
@@ -137,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-f7c03db-$(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/

@@ -153,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/
@@ -167,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
@@ -351,23 +404,107 @@ 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
-	# Pandas ships with very heavy tests
-	cd dist/working/site-packages/pandas && rm -rf tests
-	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]==0.7.6a2" --target=./site-packages
-	# Required for SVG to DXF conversion
-	cd dist/working && . env/bin/activate && $(PIP) install "ezdxf" --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 && 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/
+endif
+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), 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/
+endif
+	rm -rf dist/working
+
+	# Required by hpp-fcl
+	mkdir dist/working
+	cd dist/working && wget $(ASSIMP_URL)
+	cd dist/working && tar -xf assimp*
+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), 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 $(EIGENPY_URL)
+	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), 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 $(OCTOMAP_URL)
+	cd dist/working && tar -xf octomap*
+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), win)
+	# Uh, do nothing, apparently? No DLLs are shipped.
+endif
+	rm -rf dist/working
+
+	# Required by hpp-fcl
+	mkdir dist/working
+	cd dist/working && wget $(BOOST_URL)
+	cd dist/working && tar -xf boost*
+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), 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 $(ZLIB_URL)
+	cd dist/working && tar -xf zlib*
+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), win)
+	cp -r dist/working/Library/bin/*.dll dist/blenderbim/libs/site/packages/hppfcl/
+endif
+	rm -rf dist/working
+
 	# Required by BIMTester
 	mkdir dist/working
 	cd dist/working && wget https://files.pythonhosted.org/packages/c8/4b/d0a8c23b6c8985e5544ea96d27105a273ea22051317f850c2cdbf2029fe4/behave-1.2.6.tar.gz
@@ -415,6 +552,56 @@ 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
+	cd dist/working && tar -xzvf boto3*
+	cd dist/working/boto3-1.17.17/ && cp -r boto3 ../../blenderbim/libs/site/packages/
+	rm -rf dist/working
+
+	# Required by boto3
+	mkdir dist/working
+	cd dist/working && wget https://files.pythonhosted.org/packages/7f/2e/e02fdfd0f0377c4e44e61de27b05d5cfe93575770661ef9ded80ed90fa88/botocore-1.20.17.tar.gz
+	cd dist/working && tar -xzvf botocore*
+	cd dist/working/botocore-1.20.17/ && cp -r botocore ../../blenderbim/libs/site/packages/
+	rm -rf dist/working
+
+	# Required by boto3
+	mkdir dist/working
+	cd dist/working && wget https://files.pythonhosted.org/packages/3c/56/3f325b1eef9791759784aa5046a8f6a1aff8f7c898a2e34506771d3b99d8/jmespath-0.10.0.tar.gz
+	cd dist/working && tar -xzvf jmespath*
+	cd dist/working/jmespath-0.10.0/ && cp -r jmespath ../../blenderbim/libs/site/packages/
+	rm -rf dist/working
+
+	# Required by boto3
+	mkdir dist/working
+	cd dist/working && wget https://files.pythonhosted.org/packages/08/e1/3ee2096ebaeeb8c186d20ed16c8faf4a503913e5c9a0e14cd6b8ffc405a3/s3transfer-0.3.4.tar.gz
+	cd dist/working && tar -xzvf s3transfer*
+	cd dist/working/s3transfer-0.3.4/ && cp -r s3transfer ../../blenderbim/libs/site/packages/
+	rm -rf dist/working
+
 	# Provides IFCJSON functionality
 	mkdir dist/working
 	cd dist/working && wget https://github.com/IFCJSON-Team/IFC2JSON_python/archive/master.zip
@@ -422,17 +609,50 @@ 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
-	cd dist/working && wget https://github.com/IfcOpenShell/IfcOpenShell/raw/v0.7.0/src/blenderbim/scripts/pkg_resources.tar.gz
+	cd dist/working && wget https://blenderbim.org/builds/pkg_resources.tar.gz
 	cd dist/working && tar -xzvf pkg_resources*
 	cd dist/working/ && cp -r pkg_resources ../blenderbim/libs/site/packages/
 	rm -rf dist/working
@@ -447,18 +667,11 @@ endif
 	# 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 && $(SED) "s/999999/$(VERSION)/" blender_manifest.toml
-	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,14 +22,13 @@ 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://docs.blenderbim.org/",
+    "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):
@@ -16,26 +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
-from typing import Callable, Union
-
-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,
@@ -49,9 +38,8 @@ modules = {
    "spatial": None,
    "void": None,
    "aggregate": None,
-    "nest": None,
    "geometry": None,
-    "fm": None,
+    "cobie": None,
    "resource": None,
    "cost": None,
    "sequence": None,
@@ -73,6 +61,7 @@ modules = {
    "document": None,
    "pset_template": None,
    "clash": None,
+    "lca": None,
    "csv": None,
    "tester": None,
    "bimtester": None,
@@ -83,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,
@@ -97,127 +85,79 @@ for name in modules.keys():
 classes = [
    operator.AddIfcFile,
    operator.BIM_OT_add_section_plane,
-    operator.BIM_OT_delete_object,
-    operator.BIM_OT_open_webbrowser,
    operator.BIM_OT_remove_section_plane,
-    operator.BIM_OT_select_object,
-    operator.BIM_OT_show_description,
-    operator.ClippingPlaneCutWithCappings,
-    operator.EditBlenderCollection,
-    operator.FileAssociate,
-    operator.FileUnassociate,
+    operator.ConfigureVisibility,
    operator.OpenUpstream,
    operator.OpenUri,
    operator.ReloadIfcFile,
    operator.RemoveIfcFile,
-    operator.RevertClippingPlaneCut,
    operator.SelectDataDir,
    operator.SelectIfcFile,
+    operator.ReloadSelectedIfcFile,
    operator.SelectSchemaDir,
+    operator.FileAssociate,
+    operator.FileUnassociate,
    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_UL_clipping_plane,
+    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,
-    ui.BIM_PT_section_with_cappings,
+    # 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"
-original_scene_panels_polls: dict[bpy.types.Panel, Union[Callable, None]] = 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)
@@ -225,59 +165,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
@@ -285,24 +191,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()
-
-    import blenderbim.tool as tool
-
-    # use tuple() as method will be removing keys from dict
-    for panel in tuple(original_scene_panels_polls.keys()):
-        tool.Blender.remove_scene_panel_override(panel)
-
-    bpy.app.translations.unregister("blenderbim")
@@ -10,7 +10,7 @@
 * (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
+ * 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.
 *
@@ -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;" />
@@ -10,7 +10,7 @@
 * (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
+ * 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.
 *
@@ -389,7 +389,7 @@
            "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.type": "SOLID",
            "scene.display.shading.use_compositor": "DISABLED",
            "scene.display.shading.use_dof": false,
            "scene.display.shading.use_scene_lights": false,
@@ -640,7 +640,7 @@
            "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.type": "SOLID",
            "scene.display.shading.use_compositor": "DISABLED",
            "scene.display.shading.use_dof": false,
            "scene.display.shading.use_scene_lights": false,
@@ -752,4 +752,4 @@
            "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>
@@ -51,5 +51,5 @@ var json_data = `{{{json_data}}}`;
 <script>
 var data = `{{{data}}}`;
 setupPage(data);
-create_gantt_chart(atob(json_data))
-</script>
+create_gantt_chart(json_data)
+</script>
@@ -5,28 +5,26 @@ 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,#23));
+#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));
 #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.);
-#23=IFCSIMPLEPROPERTYTEMPLATE('28mJ$GDxb7kBbKFH_rACMQ',$,'AngleDecimalPlaces','',.P_SINGLEVALUE.,'IfcInteger',$,$,$,$,$,.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.);
+#20=IFCSIMPLEPROPERTYTEMPLATE('0nYMT3OSj5gArVniCWZRtv',$,'ShadingStyles','',.P_SINGLEVALUE.,'IfcURIReference',$,$,$,$,$,.READWRITE.);
+#21=IFCSIMPLEPROPERTYTEMPLATE('3VWG22eZXBdQwdKlzMeVQH',$,'CurrentShadingStyle','',.P_SINGLEVALUE.,'IfcLabel',$,$,$,$,$,.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;
@@ -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
@@ -27,7 +27,6 @@ import addon_utils
 import ifcopenshell
 import ifcopenshell.api
 import ifcopenshell.util.placement
-import ifcopenshell.util.unit
 import blenderbim.tool as tool
 import blenderbim.core.geometry
 import blenderbim.core.aggregate
@@ -35,7 +34,6 @@ import blenderbim.core.spatial
 import blenderbim.core.style
 from blenderbim.bim.ifc import IfcStore
 from mathutils import Vector
-from typing import Union


 class IfcExporter:
@@ -46,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:
@@ -84,34 +83,30 @@ 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, skip_unlinking=False) -> list[ifcopenshell.entity_instance]:
-        results: list[ifcopenshell.entity_instance] = []
+    def sync_all_objects(self):
+        results = []
        self.unit_scale = ifcopenshell.util.unit.calculate_unit_scale(self.file)
        for ifc_definition_id in list(IfcStore.id_map.keys()):
            obj = IfcStore.id_map[ifc_definition_id]
            try:
                if isinstance(obj, bpy.types.Material):
                    continue
-                if obj.library:
-                    continue
-                tool.Collector.sync(obj, skip_unlinking)
+                tool.Collector.sync(obj)
                result = self.sync_object_placement(obj)
                if result:
                    results.append(result)
                result = self.sync_object_material(obj)
-                # TODO: sync_object_material always returns None
-                # so it's never really appended
                if result:
                    results.append(result)
            except ReferenceError:
                pass  # The object is likely deleted
        return results

-    def sync_edited_objects(self) -> list[ifcopenshell.entity_instance]:
-        results: list[ifcopenshell.entity_instance] = []
+    def sync_edited_objects(self):
+        results = []
        for obj in IfcStore.edited_objs.copy():
            if not obj:
                continue
@@ -129,7 +124,7 @@ class IfcExporter:
        IfcStore.edited_objs.clear()
        return results

-    def sync_object_material(self, obj: bpy.types.Object) -> None:
+    def sync_object_material(self, obj):
        if not obj.data or not isinstance(obj.data, bpy.types.Mesh):
            return
        if not self.has_changed_materials(obj):
@@ -140,10 +135,11 @@ class IfcExporter:
        checksum = obj.data.BIMMeshProperties.material_checksum
        return checksum != str([s.id() for s in tool.Geometry.get_styles(obj) if s])

-    def sync_object_placement(self, obj: bpy.types.Object) -> Union[ifcopenshell.entity_instance, None]:
+    def sync_object_placement(self, obj):
        element = self.file.by_id(obj.BIMObjectProperties.ifc_definition_id)
        if not tool.Ifc.is_moved(obj):
            return
+        blender_matrix = np.array(obj.matrix_world)
        if (obj.scale - Vector((1.0, 1.0, 1.0))).length > 1e-4:
            bpy.ops.bim.update_representation(obj=obj.name)
            return element
@@ -154,7 +150,7 @@ class IfcExporter:
        blenderbim.core.geometry.edit_object_placement(tool.Ifc, tool.Geometry, tool.Surveyor, obj=obj)
        return element

-    def sync_grid_axis_object_placement(self, obj: bpy.types.Object, element: ifcopenshell.entity_instance) -> None:
+    def sync_grid_axis_object_placement(self, obj, element):
        grid = (element.PartOfU or element.PartOfV or element.PartOfW)[0]
        grid_obj = tool.Ifc.get_object(grid)
        if grid_obj:
@@ -167,7 +163,7 @@ class IfcExporter:
        return "BlenderBIM"

    def get_application_version(self):
-        version = ".".join(
+        return ".".join(
            [
                str(x)
                for x in [
@@ -177,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,35 +16,48 @@
 # 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 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
-from typing import Union


-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:
@@ -58,31 +71,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()


@@ -104,8 +111,8 @@ def update_bim_tool_props():
    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:
+    current_tool = bpy.context.workspace.tools.from_space_view3d_mode(mode).idname
+    if current_tool != "bim.bim_tool":
        return
    element = tool.Ifc.get_entity(obj)
    if not element:
@@ -113,16 +120,6 @@ def update_bim_tool_props():
    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
@@ -133,6 +130,7 @@ def update_bim_tool_props():
        return x_angle

    si_conversion = ifcopenshell.util.unit.calculate_unit_scale(tool.Ifc.get())
+    props = bpy.context.scene.BIMModelProperties
    if not AuthoringData.is_loaded:
        AuthoringData.load()

@@ -183,44 +181,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()
-
-    bpy.context.scene.DocProperties.should_draw_decorations = bpy.context.scene.DocProperties.should_draw_decorations
-

@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):
@@ -251,52 +272,13 @@ 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"
-
-
@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 = {}
-
-    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 tool.Blender.get_scene_panels_list():
-        if panel in blenderbim.bim.original_scene_panels_polls:
-            continue
-        tool.Blender.override_scene_panel(panel)
-    tool.Blender.setup_tabs()
@@ -29,7 +29,6 @@ from mathutils import geometry
 from mathutils import Vector
 import blenderbim.tool as tool
 from blenderbim.bim.ifc import IfcStore
-from typing import Optional, Callable, Any


 def draw_attributes(props, layout, copy_operator=None, popup_active_attribute=None):
@@ -76,10 +75,6 @@ def draw_attribute(attribute, layout, copy_operator=None):
        op.data_path = attribute.path_from_id("string_value")
    if attribute.is_optional:
        layout.prop(attribute, "is_null", icon="RADIOBUT_OFF" if attribute.is_null else "RADIOBUT_ON", text="")
-
-    if attribute.name == "GlobalId":
-        layout.operator("bim.generate_global_id", icon="FILE_REFRESH", text="")
-
    if copy_operator:
        op = layout.operator(f"{copy_operator}", text="", icon="COPYDOWN")
        op.name = attribute.name
@@ -92,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):
@@ -121,7 +109,7 @@ def import_attribute(attribute, props, data, callback=None):
    elif is_handled_by_callback is False:
        props.remove(len(props) - 1)
    elif data_type == "string":
-        new.string_value = "" if new.is_null else str(data[attribute.name()]).replace("\n", "\\n")
+        new.string_value = "" if new.is_null else str(data[attribute.name()])
        if attribute.type_of_attribute().declared_type().name() == "IfcURIReference":
            new.is_uri = True
    elif data_type == "boolean":
@@ -183,7 +171,7 @@ def add_attribute_description(attribute_blender, attribute_ifc=None):
        attribute_blender.description = description


-def export_attributes(props, callback: Optional[Callable] = None) -> dict[str, Any]:
+def export_attributes(props, callback=None):
    attributes = {}
    for prop in props:
        is_handled_by_callback = callback(attributes, prop) if callback else False
@@ -221,6 +209,37 @@ def get_enum_items(data, prop_name, context=None):
    return items


+def get_obj_ifc_definition_id(context, obj, obj_type):
+    if obj_type == "Object":
+        return bpy.data.objects.get(obj).BIMObjectProperties.ifc_definition_id
+    elif obj_type == "Material":
+        return bpy.data.materials.get(obj).BIMObjectProperties.ifc_definition_id
+    elif obj_type == "MaterialSet":
+        return ifcopenshell.util.element.get_material(
+            tool.Ifc.get_entity(bpy.data.objects.get(obj)), should_skip_usage=True
+        ).id()
+    elif obj_type == "MaterialSetItem":
+        return bpy.data.objects.get(obj).BIMObjectMaterialProperties.active_material_set_item_id
+    elif obj_type == "Task":
+        return context.scene.BIMTaskTreeProperties.tasks[
+            context.scene.BIMWorkScheduleProperties.active_task_index
+        ].ifc_definition_id
+    elif obj_type == "Cost":
+        return context.scene.BIMCostProperties.cost_items[
+            context.scene.BIMCostProperties.active_cost_item_index
+        ].ifc_definition_id
+    elif obj_type == "Resource":
+        return context.scene.BIMResourceTreeProperties.resources[
+            context.scene.BIMResourceProperties.active_resource_index
+        ].ifc_definition_id
+    elif obj_type == "Profile":
+        return context.scene.BIMProfileProperties.profiles[
+            context.scene.BIMProfileProperties.active_profile_index
+        ].ifc_definition_id
+    elif obj_type == "WorkSchedule":
+        return context.scene.BIMWorkScheduleProperties.active_work_schedule_id
+
+
 # hack to close popup
 # https://blender.stackexchange.com/a/202576/130742
 def close_operator_panel(event):
@@ -241,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:
@@ -249,86 +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
-        op = row.operator("bim.remove_filter_group", text="", icon="X")
-        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
-
-
-# TODO this should move into ifcopenshell.util
-
-
 class IfcHeaderExtractor:
    def __init__(self, filepath: str):
        self.filepath = filepath
@@ -340,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
@@ -23,39 +23,35 @@ import hashlib
 import zipfile
 import tempfile
 import ifcopenshell
-import ifcopenshell.geom
-import ifcopenshell.ifcopenshell_wrapper
 import blenderbim.bim.handler
 import blenderbim.tool as tool
 from pathlib import Path
-from blenderbim.tool.brick import BrickStore
-from typing import Set, Union, Optional
-
-
-IFC_CONNECTED_TYPE = Union[bpy.types.Material, bpy.types.Object]


 class IfcStore:
-    path: str = ""
-    file: ifcopenshell.file = None
-    schema: ifcopenshell.ifcopenshell_wrapper.schema_definition = None
-    cache: ifcopenshell.ifcopenshell_wrapper.HdfSerializer = None
-    cache_path: str = None
-    id_map: dict[int, IFC_CONNECTED_TYPE] = {}
-    guid_map: dict[str, IFC_CONNECTED_TYPE] = {}
-    edited_objs: Set[bpy.types.Object] = set()
-    pset_template_path: str = ""
-    pset_template_file: ifcopenshell.file = None
-    classification_path: str = ""
-    classification_file: ifcopenshell.file = None
-    library_path: str = ""
-    library_file: ifcopenshell.file = None
+    path = ""
+    file = None
+    schema = None
+    cache = None
+    cache_path = None
+    id_map = {}
+    guid_map = {}
+    edited_objs = set()
+    pset_template_path = ""
+    pset_template_file = None
+    classification_path = ""
+    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 = []
    future = []
    schema_identifiers = ["IFC4", "IFC2X3", "IFC4X3"]
-    session_files: dict[str, ifcopenshell.file] = {}
+    session_files = {}

    @staticmethod
    def purge():
@@ -86,8 +82,8 @@ class IfcStore:
            if IfcStore.path:
                try:
                    IfcStore.load_file(IfcStore.path)
-                except Exception as e:
-                    print(f"Failed to load file {IfcStore.path}. Error details: {e}")
+                except:
+                    pass
        return IfcStore.file

    @staticmethod
@@ -123,9 +119,7 @@ class IfcStore:
        IfcStore.get_cache()

    @staticmethod
-    def load_file(path) -> None:
-        if not os.path.isfile(path):
-            return
+    def load_file(path):
        extension = path.split(".")[-1]
        if extension.lower() == "ifczip":
            with tempfile.TemporaryDirectory() as unzipped_path:
@@ -136,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
@@ -152,7 +144,7 @@ class IfcStore:
        return IfcStore.schema

    @staticmethod
-    def get_element(id_or_guid: Union[int, str]) -> IFC_CONNECTED_TYPE:
+    def get_element(id_or_guid):
        if isinstance(id_or_guid, int):
            map_object = IfcStore.id_map
        else:
@@ -165,20 +157,106 @@ class IfcStore:
        return obj

    @staticmethod
-    def relink_all_objects() -> None:
+    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
-    def relink_object(obj: IFC_CONNECTED_TYPE) -> None:
+    def relink_object(obj):
        if not obj:
            return
        if obj.BIMObjectProperties.ifc_definition_id:
@@ -199,14 +277,7 @@ class IfcStore:
            IfcStore.commit_link_element(data)

    @staticmethod
-    def link_element(element: ifcopenshell.entity_instance, obj: IFC_CONNECTED_TYPE) -> None:
-        # 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
-
+    def link_element(element, obj):
        existing_obj = IfcStore.id_map.get(element.id(), None)
        if existing_obj == obj:
            return
@@ -230,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}
@@ -254,18 +327,15 @@ 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.

    @staticmethod
-    def rollback_unlink_element(data) -> None:
+    def rollback_unlink_element(data):
        if "id" not in data or "obj" not in data:
            return
        obj = bpy.data.objects.get(data["obj"])
@@ -274,15 +344,13 @@ class IfcStore:
            IfcStore.guid_map[data["guid"]] = obj

    @staticmethod
-    def commit_unlink_element(data) -> None:
+    def commit_unlink_element(data):
        del IfcStore.id_map[data["id"]]
        if data["guid"]:
            del IfcStore.guid_map[data["guid"]]

    @staticmethod
-    def unlink_element(
-        element: Optional[ifcopenshell.entity_instance] = None, obj: Optional[IFC_CONNECTED_TYPE] = None
-    ) -> None:
+    def unlink_element(element=None, obj=None):
        if element is None:
            try:
                element = tool.Ifc.get_entity(obj)
@@ -328,51 +396,43 @@ class IfcStore:
            )

    @staticmethod
-    def execute_ifc_operator(operator: bpy.types.Operator, context: bpy.types.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()

        return result

    @staticmethod
-    def begin_transaction(operator: bpy.types.Operator) -> None:
+    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

    @staticmethod
-    def end_transaction(operator: bpy.types.Operator) -> None:
+    def end_transaction(operator):
        IfcStore.current_transaction = ""
        operator.transaction_key = ""

    @staticmethod
-    def add_transaction_operation(operator: bpy.types.Operator, rollback=None, commit=None) -> None:
+    def add_transaction_operation(operator, rollback=None, commit=None):
        key = getattr(operator, "transaction_key", None)
        data = getattr(operator, "transaction_data", None)
        bpy.context.scene.BIMProperties.last_transaction = key
@@ -388,35 +448,19 @@ class IfcStore:
        IfcStore.future = []

    @staticmethod
-    def undo(until_key=None) -> 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) -> 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,19 +20,16 @@ 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_break_link_to_other_aggregates,
-    operator.BIM_OT_select_linked_aggregates,
+    operator.BIM_OT_select_aggregate,
+    operator.BIM_OT_add_part_to_object,
    prop.BIMObjectAggregateProperties,
    ui.BIM_PT_aggregate,
-    ui.BIM_PT_linked_aggregate,
 )


@@ -35,9 +35,8 @@ 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(),
-            "total_linked_aggregate": cls.total_linked_aggregate(),
        }
        cls.is_loaded = True

@@ -60,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

@@ -73,26 +72,3 @@ class AggregateData:
        element = tool.Ifc.get_entity(bpy.context.active_object)
        if element:
            return element.is_a()
-
-    @classmethod
-    def total_linked_aggregate(cls):
-        element = tool.Ifc.get_entity(bpy.context.active_object)
-        aggregate = ifcopenshell.util.element.get_aggregate(element)
-        if not aggregate:
-            return []
-        if not element:
-            return []
-        
-        product_linked_agg_group = [
-            r
-            for r in getattr(aggregate, "HasAssignments", []) or []
-            if r.is_a("IfcRelAssignsToGroup")
-            if "BBIM_Linked_Aggregate" in r.RelatingGroup.Name
-        ]
-
-        if not product_linked_agg_group:
-            return []
-        
-        total = len(product_linked_agg_group[0].RelatedObjects)
-        return total
-        
@@ -33,34 +33,21 @@ 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:
-            element = tool.Ifc.get().by_id(self.relating_object)
-            if element.IsDecomposedBy:
-                relating_obj = tool.Ifc.get_object(element)
-            else:
-                assembly = element.Decomposes[0].RelatingObject
-                relating_obj = tool.Ifc.get_object(assembly)
-        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
+            relating_obj = tool.Ifc.get_object(tool.Ifc.get().by_id(self.relating_object))
            result = core.assign_object(
                tool.Ifc,
                tool.Aggregate,
@@ -69,14 +56,16 @@ class BIM_OT_aggregate_assign_object(bpy.types.Operator, Operator):
                related_obj=obj,
            )
            if not result:
-                self.report({"ERROR"}, f" Cannot aggregate {obj.name} to {relating_obj.name}")
+                self.report({"ERROR"}, f"Objects {relating_obj} and {obj} cannot be aggregated")
+
+        return {"FINISHED"}


-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):
@@ -95,12 +84,6 @@ class BIM_OT_aggregate_unassign_object(bpy.types.Operator, Operator):
                related_obj=tool.Ifc.get_object(element),
            )

-            # Removes Pset related to Linked Aggregates
-            pset = ifcopenshell.util.element.get_pset(element, "BBIM_Linked_Aggregate")
-            if pset:
-                pset = tool.Ifc.get().by_id(pset["id"])
-                ifcopenshell.api.run("pset.remove_pset", tool.Ifc.get(), pset=pset)
-

 class BIM_OT_enable_editing_aggregate(bpy.types.Operator, Operator):
    """Enable editing aggregation relationship"""
@@ -174,8 +157,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

@@ -206,29 +191,14 @@ class BIM_OT_select_aggregate(bpy.types.Operator):
    bl_label = "Select Aggregate"
    bl_options = {"REGISTER", "UNDO"}
    obj: bpy.props.StringProperty()
-    select_parts: bpy.props.BoolProperty(default=False)
-
-    @classmethod
-    def description(cls, context, properties):
-        if properties.select_parts:
-            return "Select Aggregate and Parts"
-        else:
-            return "Select Aggregate"

    def execute(self, context):
        self.file = IfcStore.get_file()
        obj = bpy.data.objects.get(self.obj) or context.active_object
        aggregate = ifcopenshell.util.element.get_aggregate(tool.Ifc.get_entity(obj))
        aggregate_obj = tool.Ifc.get_object(aggregate)
-        if self.select_parts:
-            bpy.ops.bim.select_parts(obj=aggregate_obj.name)
        if aggregate_obj in context.selectable_objects:
-            tool.Blender.set_objects_selection(
-                context,
-                aggregate_obj,
-                [aggregate_obj],
-                clear_previous_selection=not self.select_parts,
-            )
+            aggregate_obj.select_set(True)
        return {"FINISHED"}


@@ -255,65 +225,3 @@ class BIM_OT_add_part_to_object(bpy.types.Operator, Operator):
            part_class=self.part_class,
            part_name=self.part_name,
        )
-
-
-class BIM_OT_break_link_to_other_aggregates(bpy.types.Operator, Operator):
-    bl_idname = "bim.break_link_to_other_aggregates"
-    bl_label = "Break link to other aggregates"
-    bl_options = {"REGISTER", "UNDO"}
-
-    def _execute(self, context):
-        element = tool.Ifc.get_entity(bpy.context.active_object)
-        aggregate = ifcopenshell.util.element.get_aggregate(element)
-        if not aggregate:
-            return []
-        if not element:
-            return []
-
-        parts = ifcopenshell.util.element.get_parts(aggregate)
-
-        for part in parts:
-            pset = ifcopenshell.util.element.get_pset(part, "BBIM_Linked_Aggregate")
-            pset = tool.Ifc.get().by_id(pset["id"])
-            ifcopenshell.api.run("pset.remove_pset", tool.Ifc.get(), pset=pset)
-
-        linked_aggregate_group = [
-            r.RelatingGroup
-            for r in getattr(aggregate, "HasAssignments", []) or []
-            if r.is_a("IfcRelAssignsToGroup")
-            if "BBIM_Linked_Aggregate" in r.RelatingGroup.Name
-        ]
-        tool.Ifc.run("group.unassign_group", group=linked_aggregate_group[0], products=[aggregate])
-
-        return {"FINISHED"}
-
-
-class BIM_OT_select_linked_aggregates(bpy.types.Operator, Operator):
-    bl_idname = "bim.select_linked_aggregates"
-    bl_label = "Select linked aggregates"
-    bl_options = {"REGISTER", "UNDO"}
-
-    def _execute(self, context):
-        element = tool.Ifc.get_entity(bpy.context.active_object)
-        aggregate = ifcopenshell.util.element.get_aggregate(element)
-        if not aggregate:
-            return []
-        if not element:
-            return []
-
-        linked_aggregate_group = [
-            r.RelatingGroup
-            for r in getattr(aggregate, "HasAssignments", []) or []
-            if r.is_a("IfcRelAssignsToGroup")
-            if "BBIM_Linked_Aggregate" in r.RelatingGroup.Name
-        ]
-
-        for obj in context.selected_objects:
-            obj.select_set(False)
-
-        for rel in linked_aggregate_group[0].IsGroupedBy or []:
-            for element in rel.RelatedObjects:
-                obj = tool.Ifc.get_object(element)
-                obj.select_set(True)
-
-        return {"FINISHED"}
@@ -18,18 +18,17 @@

 from bpy.types import Panel
 from blenderbim.bim.module.aggregate.data import AggregateData
-from blenderbim.bim.module.group.data import GroupsData, ObjectGroupsData
 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):
@@ -55,36 +54,27 @@ 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)
            if AggregateData.data["has_relating_object"]:
                row.label(text=AggregateData.data["relating_object_label"], icon="TRIA_UP")
-                op = row.operator("bim.select_aggregate", icon="OBJECT_DATA", text="")
-                op.obj = context.active_object.name
-                op.select_parts = False
                op = row.operator("bim.select_aggregate", icon="RESTRICT_SELECT_OFF", text="")
                op.obj = context.active_object.name
-                op.select_parts = True
                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
@@ -101,49 +91,3 @@ class BIM_PT_aggregate(Panel):
            op = layout.operator("bim.add_part_to_object", text="Add " + part_class.lstrip("Ifc"))
            op.part_class = part_class
            op.obj = context.active_object.name
-            
-            
-class BIM_PT_linked_aggregate(Panel):
-    bl_label = "Linked Aggregates"
-    bl_idname = "BIM_PT_linked_aggregate"
-    bl_options = {"DEFAULT_CLOSED"}
-    bl_space_type = "PROPERTIES"
-    bl_region_type = "WINDOW"
-    bl_context = "object"
-    bl_order = 2
-    bl_parent_id = "BIM_PT_aggregate"
-
-    @classmethod
-    def poll(cls, context):
-        if not context.active_object:
-            return False
-        props = context.active_object.BIMObjectProperties
-        if not props.ifc_definition_id:
-            return False
-        if not IfcStore.get_element(props.ifc_definition_id):
-            return False
-        if not IfcStore.get_file().by_id(props.ifc_definition_id).is_a("IfcObjectDefinition"):
-            return False
-        return True
-
-    def draw(self, context):
-        layout = self.layout
-        if not AggregateData.is_loaded:
-            AggregateData.load()
-
-        props = context.active_object.BIMObjectAggregateProperties
-        row = layout.row(align=True)
-        row.label(text="Advanced Users Only", icon="ERROR")
-        row = layout.row(align=True)
-        
-        if type(AggregateData.data['total_linked_aggregate']) is int:
-            if AggregateData.data['total_linked_aggregate'] > 0:
-                row.label(text=f"{AggregateData.data['total_linked_aggregate']} Linked Aggregates")
-                row.operator("bim.select_linked_aggregates", text="", icon="RESTRICT_SELECT_OFF")
-                row.operator("bim.refresh_linked_aggregate", text="", icon="FILE_REFRESH")
-                op = row.operator("bim.break_link_to_other_aggregates", text="", icon="X")
-        else:
-            row.label(text="No Linked Aggregates")
-            
-        
-
@@ -120,46 +120,20 @@ class EditAttributes(bpy.types.Operator, Operator):
        return {"FINISHED"}


-class GenerateGlobalId(bpy.types.Operator, Operator):
+class GenerateGlobalId(bpy.types.Operator):
    bl_idname = "bim.generate_global_id"
    bl_label = "Regenerate GlobalId"
-    bl_description = "Regenerate GlobalId\n\nSHIFT+CLICK to regenerate GlobalIds for all selected objects"
    bl_options = {"REGISTER", "UNDO"}

-    use_selected: bpy.props.BoolProperty(name="Use All Selected Objects", default=False, options={"SKIP_SAVE"})
-
-    def invoke(self, context, event):
-        # using all selected objects on shift+click
-        # make sure to use SKIP_SAVE on property, otherwise it might get stuck
-        if event.type == "LEFTMOUSE" and event.shift:
-            self.use_selected = True
-        return self.execute(context)
-
-    def _execute(self, context):
-        if self.use_selected:
-            for obj in context.selected_objects:
-                element = tool.Ifc.get_entity(obj)
-                if not element or not element.is_a("IfcRoot"):
-                    continue
-                element.GlobalId = ifcopenshell.guid.new()
-
-        obj = context.active_object
-        if not obj or not obj.BIMAttributeProperties.is_editing_attributes:
-            return {"FINISHED"}
-
-        props = obj.BIMAttributeProperties
-        element = tool.Ifc.get_entity(obj)
-
-        if not element.is_a("IfcRoot"):
-            return {"FINISHED"}
-
-        if self.use_selected and obj in context.selected_objects:
-            # guid value was already regenerated, just update the ui prop
-            guid_value = element.GlobalId
+    def execute(self, context):
+        index = context.active_object.BIMAttributeProperties.attributes.find("GlobalId")
+        if index >= 0:
+            global_id = context.active_object.BIMAttributeProperties.attributes[index]
        else:
-            guid_value = ifcopenshell.guid.new()
-
-        props.attributes["GlobalId"].string_value = guid_value
+            global_id = context.active_object.BIMAttributeProperties.attributes.add()
+        global_id.name = "GlobalId"
+        global_id.data_type = "string"
+        global_id.string_value = ifcopenshell.guid.new()
        return {"FINISHED"}


@@ -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
@@ -22,7 +22,6 @@ from . import ui, operator, prop
 classes = (
    operator.AddBoundary,
    operator.ColourByRelatedBuildingElement,
-    operator.DecorateBoundaries,
    operator.DisableEditingBoundary,
    operator.DisableEditingBoundaryGeometry,
    operator.EditBoundaryAttributes,
@@ -62,14 +62,14 @@ class BoundaryDecorator:
        gpu.state.point_size_set(6)
        gpu.state.blend_set("ALPHA")

-        self.line_shader = gpu.shader.from_builtin("POLYLINE_UNIFORM_COLOR")
+        self.line_shader = gpu.shader.from_builtin("3D_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")
+        self.shader = gpu.shader.from_builtin("3D_UNIFORM_COLOR")

        selected_vertices = []
        selected_edges = []
@@ -22,9 +22,7 @@ import logging
 import shapely
 import mathutils
 import numpy as np
-import multiprocessing
 import ifcopenshell.api
-import ifcopenshell.geom
 import ifcopenshell.util.unit
 import ifcopenshell.util.shape
 import ifcopenshell.util.element
@@ -32,17 +30,15 @@ import ifcopenshell.util.placement
 import ifcopenshell.util.representation
 import blenderbim.tool as tool
 import blenderbim.bim.import_ifc as import_ifc
-from math import pi, inf, degrees, acos, radians
+from math import pi, inf
 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.core.geometry


 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:
@@ -66,8 +62,7 @@ def disable_editing_boundary_geometry(context):


 class Loader:
-    def __init__(self, operator=None):
-        self.operator = operator
+    def __init__(self):
        self.ifc_file = None
        self.logger = None
        self.ifc_importer = None
@@ -89,33 +84,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])
@@ -127,7 +103,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

@@ -149,17 +127,7 @@ class Loader:
        self.ifc_importer = import_ifc.IfcImporter(ifc_import_settings)
        self.ifc_importer.file = self.ifc_file

-    def load_boundary(
-        self, boundary: ifcopenshell.entity_instance, blender_space: bpy.types.Object = None
-    ) -> bpy.types.Object:
-        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
@@ -178,9 +146,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"}


@@ -191,7 +159,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)
@@ -206,7 +174,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)
@@ -454,7 +422,7 @@ class EnableEditingBoundaryGeometry(bpy.types.Operator, tool.Ifc.Operator):
        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")
+            bpy.ops.wm.tool_set_by_id(tool.Blender.get_viewport_context(), name="bim.cad_tool")
        return {"FINISHED"}


@@ -492,7 +460,7 @@ class EditBoundaryGeometry(bpy.types.Operator, tool.Ifc.Operator):
            ifcopenshell.util.element.remove_deep2(tool.Ifc.get(), old_surface)

            old_mesh = obj.data
-            loader = Loader(self)
+            loader = Loader()
            obj.data = loader.create_mesh(element)
            tool.Geometry.delete_data(old_mesh)

@@ -513,11 +481,11 @@ class DisableEditingBoundaryGeometry(bpy.types.Operator, tool.Ifc.Operator):
 class ShowBoundaries(bpy.types.Operator, tool.Ifc.Operator):
    bl_idname = "bim.show_boundaries"
    bl_label = "Show Boundaries"
-    bl_description = "Load selected objects boundaries if they are not loaded"
    bl_options = {"REGISTER", "UNDO"}

    def _execute(self, context):
-        loader = Loader(self)
+        props = bpy.context.scene.BIMBoundaryProperties
+        loader = Loader()
        for obj in context.selected_objects:
            element = tool.Ifc.get_entity(obj)
            if not element or not getattr(element, "BoundedBy", None):
@@ -528,7 +496,7 @@ class ShowBoundaries(bpy.types.Operator, tool.Ifc.Operator):
            for rel in element.BoundedBy or []:
                boundary_obj = loader.load_boundary(rel, obj)
                tool.Boundary.decorate_boundary(boundary_obj)
-        BoundaryDecorator.install(context)
+        BoundaryDecorator.install(bpy.context)
        return {"FINISHED"}


@@ -561,36 +529,6 @@ class HideBoundaries(bpy.types.Operator, tool.Ifc.Operator):
        return {"FINISHED"}


-class DecorateBoundaries(bpy.types.Operator, tool.Ifc.Operator):
-    bl_idname = "bim.decorate_boundaries"
-    bl_label = "Toggle Boundaries Decorations"
-    bl_description = "Add special decorations for all boundaries in the scene or hide them if they are already added"
-    bl_options = {"REGISTER", "UNDO"}
-
-    def _execute(self, context):
-        props = context.scene.BIMBoundaryProperties
-        # filter not decorated boundaries and add decorations for them
-        decorated_boundaries = set([i.obj for i in props.boundaries])
-        active_boundaries = set()
-        for element in tool.Ifc.get().by_type("IfcRelSpaceBoundary"):
-            obj = tool.Ifc.get_object(element)
-            if obj is not None:
-                active_boundaries.add(obj)
-
-        boundaries_to_decorate = active_boundaries - decorated_boundaries
-        if boundaries_to_decorate:
-            for obj in boundaries_to_decorate:
-                tool.Boundary.decorate_boundary(obj)
-            BoundaryDecorator.install(context)
-        else:
-            for obj in decorated_boundaries:
-                tool.Boundary.undecorate_boundary(obj)
-            props.boundaries.clear()
-            BoundaryDecorator.uninstall()
-            tool.Blender.update_viewport()
-        return {"FINISHED"}
-
-
 class AddBoundary(bpy.types.Operator, tool.Ifc.Operator):
    bl_idname = "bim.add_boundary"
    bl_label = "Add Boundary"
@@ -601,7 +539,6 @@ class AddBoundary(bpy.types.Operator, tool.Ifc.Operator):
        related_building_element = None
        relating_space_obj = None
        related_building_element_obj = None
-        parent_boundaries = []

        objs = context.selected_objects
        if len(objs) == 2:
@@ -616,19 +553,8 @@ class AddBoundary(bpy.types.Operator, tool.Ifc.Operator):
                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")
@@ -638,6 +564,8 @@ class AddBoundary(bpy.types.Operator, tool.Ifc.Operator):
                relating_space = element
                relating_space_obj = objs[0]

+            target = bpy.context.scene.cursor.location
+
            collection = context.view_layer.active_layer_collection.collection
            collection_obj = bpy.data.objects.get(collection.name)
            if not collection_obj:
@@ -649,258 +577,19 @@ class AddBoundary(bpy.types.Operator, tool.Ifc.Operator):
                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")
-                ):
+                if not (subelement.is_a("IfcWall") or subelement.is_a("IfcSlab")):
                    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)
+                    raycast = obj.closest_point_on_mesh(obj.matrix_world.inverted() @ target, distance=0.1)
+                    if raycast[0]:
+                        related_building_element = subelement
+                        related_building_element_obj = obj
+                        break

-        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)
@@ -921,6 +610,8 @@ class AddBoundary(bpy.types.Operator, tool.Ifc.Operator):
        if not target_face:
            return

+        parent_boundary = tool.Ifc.run("root.create_entity", ifc_class=context.scene.BIMModelProperties.boundary_class)
+
        # 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]])
@@ -940,18 +631,6 @@ class AddBoundary(bpy.types.Operator, tool.Ifc.Operator):
                    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
@@ -959,25 +638,19 @@ class AddBoundary(bpy.types.Operator, tool.Ifc.Operator):
        # space.
        exterior_boundary_polygon = shapely.Polygon(gross_boundary_polygon.exterior.coords)

+        net_boundary_polygon = shapely.Polygon(gross_boundary_polygon)
+
        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
+            filling = None
+            if opening.HasFillings:
+                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
-
+            net_boundary_polygon = net_boundary_polygon.difference(opening_polygon)
            # Only openings that are projected onto our exterior boundary are relevant.
            if opening_polygon.intersection(exterior_boundary_polygon).area == 0:
                continue
@@ -985,25 +658,24 @@ class AddBoundary(bpy.types.Operator, tool.Ifc.Operator):
            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.RelatedBuildingElement = filling or related_building_element
            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)
+            boundary.PhysicalOrVirtualBoundary = "PHYSICAL" if filling else "VIRTUAL"
+            boundary.InternalOrExternalBoundary = "INTERNAL"
+
            if boundary.is_a("IfcRelSpaceBoundary2ndLevel"):
                boundary.ParentBoundary = parent_boundary

-        connection_geometry = self.create_connection_geometry_from_polygon(
-            exterior_boundary_polygon, target_face_matrix
-        )
+        connection_geometry = self.create_connection_geometry_from_polygon(net_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
+        parent_boundary.PhysicalOrVirtualBoundary = "PHYSICAL"
+        parent_boundary.InternalOrExternalBoundary = "INTERNAL"
+
+        bpy.ops.bim.show_boundaries()
+        obj = tool.Ifc.get_object(parent_boundary)
+        obj.select_set(True)

    def get_face_matrix(self, p1, p2, p3):
        edge1 = p2 - p1
@@ -1018,7 +690,7 @@ class AddBoundary(bpy.types.Operator, tool.Ifc.Operator):
        mat.col[0][:3] = x_axis
        mat.col[1][:3] = y_axis
        mat.col[2][:3] = z_axis
-        mat.translation = p1
+        mat.col[3][:3] = p1

        return mat

@@ -1052,19 +724,17 @@ class AddBoundary(bpy.types.Operator, tool.Ifc.Operator):
    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
+        p1 = target_face_matrix.col[3][:3]

        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]),
-            )
-        )
+        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]
@@ -1077,24 +747,9 @@ class AddBoundary(bpy.types.Operator, tool.Ifc.Operator):
                point_list = tool.Ifc.get().createIfcCartesianPointList2D(points)
                inner_boundaries.append(tool.Ifc.get().createIfcIndexedPolyCurve(point_list, None, False))
        else:
-            pass  # TODO
+            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"
--- a/Show More
+++ b/Show More