No need to specify SI unit names as they can be derived from the unit type

- refactor work schedule visualisation operator
- Fix text handler
- Improve durations UI for task times (proposal to replicate for all durations)
- Simplify durations ( P32H as P4D or P1D8H)
- Implement years/months in various datetime calculations
- Feature to customise animation colors per construction task type
- Feature to add Visual task bars
- Feature to customise Visual task bar material colors
- Move helper functions from blenderbim.bim.module.sequence to ifcopenshell.util.sequence

.github/workflows/cd.yml

@@ -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
+        libhdf5-dev libcgal-dev
 
     -
       name: ccache
@@ -61,8 +61,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 \
-         -DGLTF_SUPPORT=On \
-         -DJSON_INCLUDE_DIR=/usr/include \
          ../cmake
         make -j $(nproc)
         make install
@@ -80,7 +78,7 @@ jobs:
         path: build/assets/Ifc*
 
   deliver:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     needs: build
     name: Docker Build, Tag, Push
 

.github/workflows/check_repo_ci_jobs.py

@@ -1,104 +0,0 @@
-import pathlib
-import shutil
-
-import requests
-import zipfile
-import os
-
-# To test this locally, set these environment variables
-REPO_OWNER = os.environ.get("REPO_OWNER", "IfcOpenShell/IfcOpenShell")
-MY_WORKFLOW = os.environ.get("MY_WORKFLOW", "ci-ifcopenshell-conda-daily")
-WORKFLOW_RUN_ID = os.environ.get("WORKFLOW_RUN_ID", None)
-TOKEN = os.environ.get("GITHUB_TOKEN", None)
-# To test this locally create a fine-grained personal access token for this repo with permissions "actions:read"
-# See https://github.com/settings/tokens?type=beta
-
-# This is a list of strings that indicate that a job has stopped abruptly.
-SIGNS_OF_STOPPAGE = [
-    "Error: The operation was canceled.",
-    "fatal error C1060: compiler is out of heap space",
-]
-
-
-def start_request_session():
-    s = requests.Session()
-    headers = {
-        "Accept": "application/vnd.github+json",
-        "X-GitHub-Api-Version": "2022-11-28",
-    }
-    if TOKEN:
-        headers["Authorization"] = f"Bearer {TOKEN}"
-
-    s.headers = headers
-    return s
-
-
-def get_ci_run(repo_name, run_id):
-    url = f"https://api.github.com/repos/{repo_name}/actions/runs/{run_id}"
-    s = start_request_session()
-    response = s.get(url)
-    return response.json()
-
-
-def evaluate_log_file_for_abrupt_stop(log_file):
-    with open(log_file) as f:
-        for i, line in enumerate(f):
-            for sign in SIGNS_OF_STOPPAGE:
-                if sign in line:
-                    print(f"Found sign of abrupt stoppage in [line {i}]: '{sign}'")
-                    return True
-    return False
-
-
-def get_ci_specific_run_specific_failure_details(repo_name, run_id):
-    url = f"https://api.github.com/repos/{repo_name}/actions/runs/{run_id}/attempts/1/logs"
-    s = start_request_session()
-    response = s.get(url)
-
-    # SAVE zip file
-    with open("logs.zip", "wb") as f:
-        f.write(response.content)
-
-    # unzip file
-    with zipfile.ZipFile("logs.zip", "r") as zip_ref:
-        zip_ref.extractall("logs")
-
-    failed_logs = []
-    for file in pathlib.Path("logs").iterdir():
-        if file.is_dir():
-            continue
-
-        if evaluate_log_file_for_abrupt_stop(file):
-            failed_logs.append(file)
-
-    return failed_logs
-
-
-def restart_job(repo_name, job_id):
-    url = f"https://api.github.com/repos/{repo_name}/actions/runs/{job_id}/rerun-failed-jobs"
-    s = start_request_session()
-    response = s.post(url)
-    return response.json()
-
-
-def eval_jobs():
-    run = get_ci_run(REPO_OWNER, WORKFLOW_RUN_ID)
-    if run["run_attempt"] > 1:
-        print("This is not the first attempt. Exiting")
-        return
-    failed_logs = get_ci_specific_run_specific_failure_details(REPO_OWNER, WORKFLOW_RUN_ID)
-
-    if len(failed_logs) == 0:
-        print("No runs exhibit signs of abrupt stoppage")
-        return
-
-    print("restarting job", WORKFLOW_RUN_ID)
-    r = restart_job(REPO_OWNER, WORKFLOW_RUN_ID)
-    print(r)
-
-    shutil.rmtree("logs")
-    os.remove("logs.zip")
-
-
-if __name__ == "__main__":
-    eval_jobs()

.github/workflows/ci-bcf-pypi.yml

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

.github/workflows/ci-bcf.yml

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

.github/workflows/ci-blenderbim-matrix.yml

@@ -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,6 @@ 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'
       - run: echo ${{ env.DATE }}
       - name: Get current date
         id: date

.github/workflows/ci-bsdd-pypi.yaml

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

.github/workflows/ci-ifcclash-pypi.yaml

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

.github/workflows/ci-ifccsv-pypi.yaml

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

.github/workflows/ci-ifcopenshell-conda-daily.yml

@@ -1,19 +1,23 @@
 name: ci-ifcopenshell-conda-daily
 
 on:
-  workflow_dispatch:
-  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
+  workflow_run:
+    workflows: ["ci"]
+    types:
+      - completed
 
 jobs:
+  activate:
+    runs-on: ubuntu-latest
+    if: |
+      github.repository == 'IfcOpenShell/IfcOpenShell'
+    steps:
+      - name: Set env
+        run: echo ok go
+
   test:
-    name: ${{ matrix.platform.distver }}-${{ matrix.pyver.name }}-${{ matrix.variant }}
+    name: ${{ matrix.platform.distver }}-${{ matrix.pyver.name }}
+    needs: activate
     runs-on: ${{ matrix.platform.distver }}
     defaults:
       run:
@@ -22,23 +26,22 @@ jobs:
       fail-fast: false
       matrix:
         pyver: [
-          { name: py311, distver: '3.11'},
-          { name: py312, distver: '3.12'}
+          # { name: py39, distver: '3.9' },
+          { name: py310, distver: '3.10'},
+          { name: py311, distver: '3.11'}
         ]
         platform: [
-          { name: Windows, distver: windows-2022, upload: 'true' },
-          { name: Linux, distver: ubuntu-22.04,  upload: 'true' },
-          { name: macOS, distver: macos-12, upload: 'true' }
-        ]
-        variant: [
-          'novtk',
-#          'all'
+          { name: Windows, distver: windows-2022, upload: 'false' },
+          { name: Windows, distver: windows-2019, upload: 'true' },
+          { name: Linux, distver: ubuntu-20.04,  upload: 'true' },
+          { name: Linux, distver: ubuntu-22.04,  upload: 'false' },
+          { name: macOS, distver: macos-11, upload: 'true' },
+          { name: macOS, distver: macos-12, upload: 'false' }
         ]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
         with:
           submodules: recursive
-
       - name: Download MacOSX SDK
         if: ${{ matrix.platform.name == 'macOS' }}
         run: |
@@ -46,22 +49,17 @@ jobs:
           tar xf MacOSX10.13.sdk.tar.xz && \
           sudo mv -v MacOSX10.13.sdk /opt/ && \
           ls /opt/
-
-      - uses: mamba-org/setup-micromamba@v1 # https://github.com/mamba-org/setup-micromamba
+      - uses: seanmiddleditch/gha-setup-ninja@master
+      - uses: conda-incubator/setup-miniconda@v2  # https://github.com/conda-incubator/setup-miniconda
         with:
-          environment-name: build-env
-          cache-environment: true
-          condarc: |
-            channels:
-              - conda-forge
-            channel_priority: strict
-          create-args: >-
-            python=3.11
-            anaconda-client
-            boa
-
+          activate-environment: conda-build
+          python-version: ${{ matrix.pyver.distver }}
+          environment-file: conda/environment.yml
       - name: build, test and upload ifcopenshell
         if: ${{ matrix.platform.upload == 'true' }}
         run: |
-          conda mambabuild . --python ${{ matrix.pyver.distver }} -c conda-forge --variants "{variant: ${{ matrix.variant }}}" --token ${{ secrets.ANACONDA_TOKEN }} --user ifcopenshell
-        working-directory: ./conda
+          conda-build . --python ${{ matrix.pyver.distver }} -c conda-forge --token ${{ secrets.ANACONDA_TOKEN }} --user ifcopenshell --no-remove-work-dir
+      - name: build & test ifcopenshell
+        if: ${{ matrix.platform.upload == 'false' }}
+        run: |
+          conda-build . --python ${{ matrix.pyver.distver }} -c conda-forge --no-remove-work-dir

.github/workflows/ci-ifcopenshell-pypi.yml

@@ -1,7 +1,6 @@
 name: ci-ifcopenshell-pypi
 
 on:
-  workflow_dispatch:
   schedule:
     #         ┌───────────── minute (0 - 59)
     #         │  ┌───────────── hour (0 - 23)
@@ -9,11 +8,7 @@ on:
     #         │  │ │ ┌───────────── month (1 - 12 or JAN-DEC)
     #         │  │ │ │ ┌───────────── day of the week (0 - 6 or SUN-SAT)
     #         *  * * * *
-    - cron: "0 0 18 * *"
-  push:
-    paths:
-      - '.github/workflows/ci-ifcopenshell-pypi.yml'
-
+    - cron: "49 23 1 * *" # 11min before utc midnight
 
 env:
   major: 0
@@ -36,7 +31,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        pyver: [py39, py310, py311, py312]
+        pyver: [py36, py37, py38, py39, py310]
         config:
           - {
             name: "Windows Build",
@@ -58,7 +53,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.7.7' # 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

.github/workflows/ci-ifcpatch-pypi.yaml

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

.github/workflows/ci-ifcsverchok-build.yml

@@ -1,53 +0,0 @@
-name: Publish-ifcsverchok
-
-on:
-  push:
-    paths:
-      - '.github/workflows/ci-ifcsverchok-build.yml'
-      - 'src/ifcsverchok/*'
-    branches:
-      - v0.7.0
-
-env:
-  major: 0
-  minor: 0
-  name: ifcsverchok
-
-jobs:
-  activate:
-    runs-on: ubuntu-latest
-    if: |
-      github.repository == 'IfcOpenShell/IfcOpenShell'
-    steps:
-    - name: Set env
-      run: echo ok go
-
-  build:
-    needs: activate
-    name: ifcsverchok
-    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:
-          architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified
-          python-version: '3.11'
-      - run: echo ${{ env.DATE }}
-      - name: Get current date
-        id: date
-        run: echo "::set-output name=date::$(date +'%y%m%d')"
-      - name: Compile
-        run: |
-          cd src/ifcsverchok
-          make dist
-      - name: Upload Zip file to release
-        uses: svenstaro/upload-release-action@v2
-        with:
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: src/ifcsverchok/dist/ifcsverchok-${{steps.date.outputs.date}}.zip
-          asset_name: ifcsverchok-${{steps.date.outputs.date}}.zip
-          tag: "ifcsverchok-${{steps.date.outputs.date}}"
-          overwrite: true
-          body: "ifcsverchok build for ${{steps.date.outputs.date}}"

.github/workflows/ci-ifctester-pypi.yml

@@ -1,48 +0,0 @@
-name: ci-ifctester-pypi
-
-on:
-  schedule:
-    #         ┌───────────── minute (0 - 59)
-    #         │  ┌───────────── hour (0 - 23)
-    #         │  │ ┌───────────── day of the month (1 - 31)
-    #         │  │ │ ┌───────────── month (1 - 12 or JAN-DEC)
-    #         │  │ │ │ ┌───────────── day of the week (0 - 6 or SUN-SAT)
-    #         *  * * * *
-    - cron: "0 0 18 * *"
-  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/ifctester &&
-          make dist
-      - name: Publish a Python distribution to PyPI
-        uses: ortega2247/pypi-upload-action@master
-        with:
-          user: __token__
-          password: ${{ secrets.PYPI_API_TOKEN }}
-          packages_dir: src/ifctester/dist

.github/workflows/ci-py-only.yml

@@ -0,0 +1,96 @@
+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
+
+      - name: Build ifcopenshell
+        run: |
+          mkdir build && cd build
+          cmake \
+               -DCMAKE_C_COMPILER_LAUNCHER=ccache \
+               -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
+               -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" \
+               -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 numpy lxml
+          sudo /usr/bin/python -m pip install src/bcf
+          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
+
+      - 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

.github/workflows/ci-restart-failed-daily-conda-builds.yml

@@ -1,34 +0,0 @@
-name: Restart failed daily conda builds
-
-on:
-  workflow_run:
-    workflows: [ ci-ifcopenshell-conda-daily ]
-    types:
-      - completed
-
-env:
-  REPO_OWNER: IfcOpenShell/IfcOpenShell
-  MY_WORKFLOW: ci-ifcopenshell-conda-daily
-
-jobs:
-  restart-failed-runs:
-    runs-on: ubuntu-latest
-    if: ${{ github.event.workflow_run.conclusion == 'failure' }}
-    steps:
-      - name: checkout
-        uses: actions/checkout@v3
-      - name: Use python 3.11
-        uses: actions/setup-python@v2
-        with:
-          python-version: 3.11
-      - name: Install dependencies
-        run: |
-          python -m pip install --upgrade pip
-          pip install requests
-      - name: Check for failed runs
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          WORKFLOW_RUN_ID: ${{ github.event.workflow_run.id }}
-        run: |
-          python check_repo_ci_jobs.py
-        working-directory: .github/workflows

.github/workflows/ci.yml

@@ -31,25 +31,12 @@ jobs:
       - run: echo ok go
 
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     needs: activate
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v2
         with:
             submodules: recursive
-
-      - name: Set up Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: 3.11
-
-      - name: Install dependencies
-        run: |
-          python -m pip install --upgrade pip
-          pip install xmlschema xsdata numpy lxml pytest isodate lark networkx tabulate python-dateutil
-          pip install src/bcf --no-deps
-          pip install https://github.com/Andrej730/aud/archive/refs/heads/master-reduced-size.zip
-
       - name: Install C++ dependencies
         run: |
           sudo apt update
@@ -62,6 +49,7 @@ jobs:
           libboost-regex-dev \
           libboost-system-dev \
           libboost-thread-dev \
+          python3-all-dev python3-pip \
           swig libpcre3-dev libxml2-dev \
           libtbb-dev nlohmann-json3-dev \
           libocct-foundation-dev libocct-modeling-algorithms-dev libocct-modeling-data-dev libocct-ocaf-dev libocct-visualization-dev libocct-data-exchange-dev \
@@ -69,14 +57,9 @@ jobs:
           
       - name: ccache
         uses: hendrikmuhs/ccache-action@v1
-        with:
-          key: ${GITHUB_WORKFLOW}
 
       - name: Build ifcopenshell
         run: |
-          echo $Python3_ROOT_DIR
-          echo ${{ env.pythonLocation }}
-          
           mkdir build && cd build
           cmake \
                -DCMAKE_C_COMPILER_LAUNCHER=ccache \
@@ -86,11 +69,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_add1" \
+               "-DSCHEMA_VERSIONS=2x3;4;4x3" \
                -DGLTF_SUPPORT=On \
                -DJSON_INCLUDE_DIR=/usr/include \
                -DCGAL_INCLUDE_DIR=/usr/include \
@@ -103,25 +86,21 @@ jobs:
           sudo make -j $(nproc)
           sudo make install
 
-      - name: Run IfcConvert on Sample files
+      - name: Install Python dependencies
         run: |
-          (find test/input src/blenderbim/test/files -name '*.ifc' | while read i; do \
-            echo $i | tee -a log; \
-            timeout 1m "$(which IfcConvert)" -yv "$i" "$i.obj" --validate >> log 2>&1; \
-            echo $i $? >> statuses; \
-          done) || true
-          echo Failed 
-          grep -v 0$ statuses
-          grep -v 0$ statuses | wc -l
-          echo Succeeded
-          grep 0$ statuses
-          grep 0$ statuses | wc -l
+          sudo /usr/bin/python -m pip install -U pip
+          sudo /usr/bin/python -m pip install xmlschema numpy lxml
+          sudo /usr/bin/python -m pip install src/bcf
+          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
 
-
-      - 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

.gitignore

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

.gitmodules

@@ -10,7 +10,4 @@
 	url = https://github.com/IfcOpenShell/svgfill
 [submodule "src/ifcopenshell-python/test/Sample-BIM-Files"]
 	path = src/ifcopenshell-python/test/Sample-BIM-Files
-	url = https://github.com/IfcOpenShell/ids-test-files
-[submodule "docs/cpp-api/assets/doxygen-awesome-css"]
-	path = docs/cpp-api/assets/doxygen-awesome-css
-	url = https://github.com/jothepro/doxygen-awesome-css.git
+	url = https://github.com/IfcOpenShell/ids-test-files

.travis.yml

@@ -0,0 +1,81 @@
+language: cpp
+compiler: gcc
+cache: ccache
+os: linux
+dist: focal
+addons:
+  apt:
+    update: true
+    packages:
+    - libboost-date-time-dev
+    - libboost-filesystem-dev
+    - libboost-iostreams-dev
+    - libboost-program-options-dev
+    - libboost-regex-dev
+    - libboost-system-dev
+    - libboost-thread-dev
+    - libocct-data-exchange-dev
+    - libocct-foundation-dev
+    - libocct-modeling-algorithms-dev
+    - libocct-modeling-data-dev
+    - libxml2-dev
+    - nlohmann-json3-dev
+    - opencollada-dev
+    - python3-all-dev
+    - python3-pip
+    - swig
+    - libhdf5-dev
+
+before_script:
+  - if [ $TRAVIS_OS_NAME == "linux" ]; then ccache -z; fi
+  
+install:
+  # for IDS
+  - python3 -m pip install xmlschema
+
+script:
+  - pwd
+  - mkdir build && cd build
+  - |
+    cmake \
+    -DCMAKE_C_COMPILER_LAUNCHER=ccache \
+    -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
+    -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 \
+    "-DSCHEMA_VERSIONS=2x3;4" \
+    -DGLTF_SUPPORT=On \
+    -DJSON_INCLUDE_DIR=/usr/include \
+    -DHDF5_INCLUDE_DIR=/usr/include/hdf5/serial \
+    ../cmake
+
+  # TODO: Drop sudo
+  - sudo make -j $(nproc) install
+
+  - cd ../test
+  - /usr/bin/python tests.py
+  - /usr/bin/python ../src/ifcopenshell-python/ifcopenshell/test_ids.py
+
+  - cd input
+
+  - /usr/local/bin/IfcConvert -yv acad2010_walls.ifc acad2010_walls.glb
+
+  - /usr/bin/python -c "from io import open; import ifcopenshell; f = ifcopenshell.open('encoding.ifc'); assert list(map(ord, f[1][0])) == [39, 97, 39, 32, 49, 109, 179, 32, 8804, 32, 53, 109, 179, 32, 8805, 32, 49, 48, 109, 179]"
+
+  - |
+    (for i in *.ifc; do \
+    echo $i | tee -a log; \
+    timeout 1m /usr/local/bin/IfcConvert -yv "$i" "$i.dae" --validate >> log 2>&1; \
+    echo $i $? >> statuses; \
+    done) || true
+  - echo Failed
+  - grep -v 0$ statuses
+  - grep -v 0$ statuses | wc -l
+  - echo Succeeded
+  - grep 0$ statuses
+  - grep 0$ statuses | wc -l
+
+after_script:
+  - if [ $TRAVIS_OS_NAME == "linux" ]; then ccache -s; fi

Dockerfile

@@ -27,7 +27,7 @@ RUN echo "deb http://archive.ubuntu.com/ubuntu focal-proposed main restricted" |
                     libboost-all-dev \
                     libocct-foundation-dev libocct-modeling-algorithms-dev libocct-modeling-data-dev \
                     libocct-ocaf-dev libocct-visualization-dev libocct-data-exchange-dev \
-                    libhdf5-serial-dev python3-pytest ; \
+                    libhdf5-serial-dev ; \
     rm -rf /var/lib/apt/lists/* ; 
 
 COPY . /home/IfcOpenShell/

README.md

@@ -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"

aws/lambda/Dockerfile

@@ -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://docs.ifcopenshell.org/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"]

aws/lambda/example_handler/__init__.py

@@ -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
-    }

aws/lambda/requirements.txt

@@ -1 +0,0 @@
-boto3

choco/blenderbim/blenderbim.nuspec

@@ -15,7 +15,7 @@
     <licenseUrl>https://github.com/IfcOpenShell/IfcOpenShell/blob/v0.7.0/COPYING</licenseUrl>
     <requireLicenseAcceptance>true</requireLicenseAcceptance>
     <projectSourceUrl>https://github.com/IfcOpenShell/IfcOpenShell</projectSourceUrl>
-    <docsUrl>https://docs.blenderbim.org/</docsUrl>
+    <docsUrl>https://blenderbim.org/docs/</docsUrl>
     <!--<mailingListUrl></mailingListUrl>-->
     <bugTrackerUrl>https://github.com/IfcOpenShell/IfcOpenShell/issues</bugTrackerUrl>
     <tags>blender bim blenderbim ifc python opensource foss</tags>

choco/blenderbim/check_repo_infos.py

@@ -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)
 

cmake/cmake_uninstall.cmake.in

@@ -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()

conda/Makefile

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

conda/bld.bat

@@ -4,7 +4,6 @@ set MY_PY_VER=%PY_VER:.=%
 set LIBXML2="%LIBRARY_PREFIX%/lib/libxml2.lib"
 
 cmake -G "Ninja" ^
- -D SCHEMA_VERSIONS="2x3;4;4x1;4x3;4x3_add1" ^
  -D CMAKE_BUILD_TYPE:STRING=Release ^
  -D CMAKE_INSTALL_PREFIX:FILEPATH="%LIBRARY_PREFIX%" ^
  -D CMAKE_PREFIX_PATH:FILEPATH="%LIBRARY_PREFIX%" ^

conda/build.sh

@@ -13,7 +13,6 @@ if [ `uname` == Darwin ]; then
 fi
 
 cmake -G Ninja \
- -DSCHEMA_VERSIONS="2x3;4;4x1;4x3;4x3_add1" \
  -DCMAKE_BUILD_TYPE=Release \
  -DCMAKE_INSTALL_PREFIX=$PREFIX \
   ${CMAKE_PLATFORM_FLAGS[@]} \
@@ -42,4 +41,4 @@ cmake -G Ninja \
 
 ninja
 
-ninja install -j 1
+ninja install

conda/conda_build_config.yaml

@@ -1,6 +1,2 @@
 CONDA_BUILD_SYSROOT:
-  - /opt/MacOSX10.13.sdk       # [osx]
-
-variant:
-  - novtk
-  - all
+  - /opt/MacOSX10.13.sdk       # [osx]

conda/environment.yml

@@ -0,0 +1,14 @@
+name: conda-build
+channels:
+  - conda-forge
+dependencies:
+  - conda-build
+  - conda-verify
+  - anaconda-client
+  - ninja
+  - doxygen
+  - ripgrep
+  - pip
+  - pip:
+      - --extra-index-url https://lief.s3-website.fr-par.scw.cloud/latest
+      - lief==0.13.0.dev0

conda/meta.yaml

@@ -1,10 +1,8 @@
 {% set name = "ifcopenshell" %}
 {% set version = "0.7.0" %}
-{% set build = 1 %}
-
-# Higher number -> Always prioritize "novtk" variant over "all" variant
-{% set build = build + 200 %}   # [variant == "novtk"]
-{% set build = build + 100 %}   # [variant == "all"]
+{% set occt_version = "7.6.2" %}
+{% set cgal_cpp_version = "5.3" %}
+{% set hdf5_version = "1.12.1" %}
 
 package:
   name: {{ name }}
@@ -14,9 +12,8 @@ source:
   path: ..
 
 build:
-  string: py{{ CONDA_PY }}_{{ variant }}_h{{ PKG_HASH }}_{{ build }}
   binary_relocation: false [osx]
-  number: {{ build }}
+  number: 1
 
 requirements:
   build:
@@ -24,12 +21,12 @@ requirements:
     - {{ compiler('cxx') }}
     - ninja >=1.10.2
     - cmake
-    - swig 4.1.1
+    - swig >=4.0.2
 
   host:
     - python
     - boost-cpp
-    - occt 7.7.2 *{{ variant }}*
+    - occt
     - libxml2
     - cgal-cpp
     - hdf5
@@ -37,32 +34,30 @@ requirements:
     - gmp  # [unix]
     - mpir  # [win]
     - nlohmann_json
-    - zlib
 
   run:
     - python
-    - occt 7.7.2 *{{ variant }}*
-    - {{ pin_compatible('cgal-cpp', max_pin='x.x.x') }}
-    - {{ pin_compatible('boost-cpp', max_pin='x.x.x') }}
-    - {{ pin_compatible('hdf5', max_pin='x.x.x') }}
+    - boost-cpp
+    - occt
     - libxml2
+    - cgal-cpp
+    - hdf5
     - mpfr
     - gmp  # [unix]
     - mpir  # [win]
     - nlohmann_json
-    - zlib
 
 test:
   imports:
     - ifcopenshell
 
 about:
-  home: https://ifcopenshell.org
+  home: http://ifcopenshell.org
   license: LGPL-3.0-or-later
   license_file: COPYING
   summary: 'IfcOpenShell is a library to support the IFC file format'
   description: |
     IfcOpenShell is an open source (LGPL) software library for 
     working with the Industry Foundation Classes (IFC) file format.
-  doc_url: https://ifcopenshell.org/
+  doc_url: http://ifcopenshell.org/
   dev_url: https://github.com/IfcOpenShell/IfcOpenShell

docs/cmake/FindSphinx.cmake

@@ -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)

docs/cmake/SphinxConfig.cmake

@@ -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)

docs/cpp-api/README.md

@@ -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
-```

docs/geom/settings.md

@@ -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
+    ()

nix/build-all.py

@@ -59,10 +59,6 @@ import multiprocessing
 import platform
 import sysconfig
 
-# @todo temporary for expired mpfr.org certificate on 2023-04-08
-import ssl
-ssl._create_default_https_context = ssl._create_unverified_context
-
 from urllib.request import urlretrieve
 
 
@@ -76,7 +72,7 @@ PROJECT_NAME = "IfcOpenShell"
 USE_CURRENT_PYTHON_VERSION = os.getenv("USE_CURRENT_PYTHON_VERSION")
 ADD_COMMIT_SHA = os.getenv("ADD_COMMIT_SHA")
 
-PYTHON_VERSIONS = ["3.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.5.3"
@@ -254,11 +250,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):
 
     """
@@ -289,9 +280,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(".", "_")
 
@@ -898,9 +888,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
 

src/bcf/CITATION.cff

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

src/bcf/Makefile

@@ -1,30 +1,37 @@
-VERSION:=`date '+%y%m%d'`
-SED:=sed -i
-ifeq ($(UNAME_S),Darwin)
-SED:=sed -i '' -e
-endif
-
-.PHONY: ci
-ci:
+.PHONY: test
+test:
 	tox
 
+.PHONY: qa
+qa:
+	black .
+	isort .
+	pylint ./src --output-format=colorized
+
+.PHONY: typecheck
+typecheck:
+	mypy src/bcf
+
 .PHONY: license
 license:
 	copyright-header --license LGPL3 --copyright-holder "Andrea Ghensi <andrea.ghensi@gmail.com>" --copyright-year "2022" --copyright-software "IfcOpenShell" --copyright-software-description "BCF XML file handling" -a ./ -o ./
 
+.PHONY: coverage
+coverage:
+	coverage run --source bcf -m pytest tests
+	coverage html
+	xdg-open htmlcov/index.html
+
+.PHONY: clean
+clean:
+	rm -rf htmlcov
+
 # TODO: make this based on xsd file presence
 .PHONY: models
 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

src/bcf/README.md

@@ -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_handler in bcfxml.topics:
+        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)
+```

src/bcf/environment.yml

@@ -0,0 +1,7 @@
+name: bcf-client
+channels:
+  - conda-forge
+dependencies:
+  - ifcopenshell
+  - xsdata
+  - numpy

src/bcf/pyproject.toml

@@ -11,13 +11,12 @@ 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",
@@ -59,34 +58,20 @@ exclude_lines = [
 [tool.tox]
 legacy_tox_ini = """
 [tox]
-env_list = lint, type, py3{10,11}
+envlist = py310
+isolated_build = true
 skip_missing_interpreters = true
+requires = tox-conda
 
 [testenv]
-deps =
+conda_deps =
     pytest
     pytest-cov
     coverage
+conda_channels =
+    conda-forge
+conda_env = environment.yml
 commands = pytest --cov --cov-report=term tests
-
-[testenv:lint]
-description = run linters
-skip_install = true
-deps =
-    black
-    isort
-    pylint
-commands =
-    black {posargs:.}
-    isort {posargs:.}
-    pylint {posargs:.} --output-format=colorized
-
-[testenv:type]
-description = run type checks
-deps =
-    mypy>=0.991
-commands =
-    - mypy {posargs:src}
 """
 
 [tool.mypy]
@@ -138,4 +123,4 @@ max-attributes = 10
 
 [tool.pylint.format]
 expected-line-ending-format = "LF"
-max-line-length = 120
+max-line-length = 120

src/bcf/requirements-dev.txt

@@ -3,4 +3,5 @@ mypy
 pylint
 isort
 xsdata
-tox==3.27.1
+tox
+tox-conda

src/bcf/src/bcf/bcfxml.py

@@ -23,9 +23,8 @@ from pathlib import Path
 from typing import Optional, Union
 
 from bcf.v2.bcfxml import BcfXml as BcfXml2
-from bcf.v2.model import Version as Version2
 from bcf.v3.bcfxml import BcfXml as BcfXml3
-from bcf.v3.model import Version as Version3
+from bcf.v3.model import Version
 from bcf.xml_parser import AbstractXmlParserSerializer, XmlParserSerializer
 
 
@@ -66,8 +65,5 @@ def _get_version(filepath: Union[str, Path], xml_handler: Optional[AbstractXmlPa
     """
     xml_handler = xml_handler or XmlParserSerializer()
     with zipfile.ZipFile(filepath) as bcf_zip:
-        try:
-            version = xml_handler.parse(bcf_zip.read("bcf.version"), Version3)
-        except:
-            version = xml_handler.parse(bcf_zip.read("bcf.version"), Version2)
+        version = xml_handler.parse(bcf_zip.read("bcf.version"), Version)
         return version.version_id

src/bcf/src/bcf/geometry.py

@@ -1,10 +1,8 @@
-from typing import Optional
-
 import numpy as np
 from numpy.typing import NDArray
 
 
-def camera_vectors_from_element_placement(
+def calc_camera_vectors(
     elem_placement: NDArray[np.float_],
 ) -> tuple[NDArray[np.float_], NDArray[np.float_], NDArray[np.float_]]:
     """
@@ -17,37 +15,19 @@ def camera_vectors_from_element_placement(
         Camera position, direction and up vectors
     """
     target_position = elem_placement[:3, 3]
-    return camera_vectors_from_target_position(target_position)
-
-
-def camera_vectors_from_target_position(
-    target_position: NDArray[np.float_], offset: Optional[NDArray[np.float_]] = None
-) -> tuple[NDArray[np.float_], NDArray[np.float_], NDArray[np.float_]]:
-    """
-    Calculate the vectors of a camera pointing to a target point.
-
-    Args:
-        target_position: point the camera is pointing to.
-        camera_offset: offset of the camera from the target point.
-
-    Returns:
-        Camera position, direction and up vectors
-    """
-    camera_offset = np.array((5, 5, 5)) if offset is None else offset
-    camera_position = target_position + camera_offset
-    camera_direction = unit_vector(-camera_offset)  # pylint: disable=invalid-unary-operand-type
+    camera_position = target_position + np.array((5, 5, 5))
+    camera_direction = unit_vector(camera_position - target_position)
     camera_right = unit_vector(np.cross(np.array([0.0, 0.0, 1.0]), camera_direction))
     camera_up = unit_vector(np.cross(camera_direction, camera_right))
-    return camera_position, camera_direction, camera_up
-    # rotation_transform = np.eye(4)
-    # rotation_transform[0, :3] = camera_right
-    # rotation_transform[1, :3] = camera_up
-    # rotation_transform[2, :3] = camera_direction
-    # translation_transform = np.eye(4)
-    # translation_transform[:3, -1] = -camera_position
-    # look_at_transform = np.matmul(rotation_transform, translation_transform)
-    # mat = np.linalg.inv(look_at_transform)
-    # return camera_position, -mat[:3, 2], mat[:3, 1]
+    rotation_transform = np.eye(4)
+    rotation_transform[0, :3] = camera_right
+    rotation_transform[1, :3] = camera_up
+    rotation_transform[2, :3] = camera_direction
+    translation_transform = np.eye(4)
+    translation_transform[:3, -1] = -camera_position
+    look_at_transform = np.matmul(rotation_transform, translation_transform)
+    mat = np.linalg.inv(look_at_transform)
+    return camera_position, -mat[:3, 2], mat[:3, 1]
 
 
 def unit_vector(v: NDArray[np.float_]) -> NDArray[np.float_]:

src/bcf/src/bcf/v2/bcfxml.py

@@ -3,7 +3,7 @@ import uuid
 import warnings
 import zipfile
 from pathlib import Path
-from typing import Any, NoReturn, Optional, TypeVar
+from typing import Any, Optional, TypeVar
 
 import bcf.v2.model as mdl
 from bcf.inmemory_zipfile import InMemoryZipFile, ZipFileInterface
@@ -50,7 +50,7 @@ class BcfXml:
             self._version = (
                 self._xml_handler.parse(self._zip_file.read("bcf.version"), mdl.Version)
                 if self._zip_file
-                else mdl.Version(version_id="2.1")
+                else mdl.Version(version_id="3.0")
             )
         return self._version
 
@@ -210,12 +210,10 @@ class BcfXml:
         self.topics[topic_handler.guid] = topic_handler
         return topic_handler
 
-    def __eq__(self, other: object) -> bool | NoReturn:
-        return (
-            self.version == other.version and self.project_info == other.project_info
-            if isinstance(other, BcfXml)
-            else NotImplemented
-        )
+    def __eq__(self, other: object) -> bool:
+        if not isinstance(other, BcfXml):
+            raise TypeError("Equality needs a BcfXml object.")
+        return self.version == other.version and self.project_info == other.project_info
 
     # region Deprecated methods
     def new_project(self) -> "BcfXml":

src/bcf/src/bcf/v2/topic.py

@@ -1,14 +1,11 @@
 """BCF XML V2 Topic handler."""
 import datetime
-import tempfile
 import uuid
 import zipfile
 from pathlib import Path
-from typing import Any, NoReturn, Optional
+from typing import Any, Optional
 
-import numpy as np
 from ifcopenshell import entity_instance
-from numpy.typing import NDArray
 from xsdata.models.datatype import XmlDateTime
 
 import bcf.v2.model as mdl
@@ -219,88 +216,25 @@ class TopicHandler:
                 real_path = real_path.parent if path_part == ".." else real_path.joinpath(path_part)
             destination_zip.writestr(real_path.at, self.document_references[doc.referenced_document])
 
-    def extract_file(self, entity, outfile: Optional[Path] = None) -> Path:
-        """Extracts an element with a file into a temporary directory
-
-        These include header files, bim snippets, document references, and
-        viewpoint bitmaps. External reference are not downloaded. Instead, the
-        URI reference is returned.
-
-        :param entity: The entity with a file reference to extract
-        :type entity: bcf.v2.model.HeaderFile,bcf.v2.model.BimSnippet,bcf.v2.model.TopicDocumentReference
-        :param outfile: If provided, save the header file to that location.
-            Otherwise, a temporary directory is created and the filename is
-            derived from the header's original filename.
-        :type outfile: pathlib.Path,optional
-        :return: The filepath of the extracted file. It may be a URL if the
-            header file is external.
-        :rtype: Path
-        """
-        if hasattr(entity, "reference"):
-            reference = entity.reference
-        else:
-            reference = entity.referenced_document
-
-        if not reference:
-            return
-
-        if getattr(entity, "is_external", False):
-            return entity.reference
-
-        resolved_reference = self._topic_dir
-
-        for part in Path(reference).parts:
-            if part == "..":
-                resolved_reference = resolved_reference.parent
-            else:
-                resolved_reference = resolved_reference.joinpath(part)
-
-        if not outfile:
-            if getattr(entity, "filename", None):
-                filename = entity.filename
-            else:
-                filename = resolved_reference.name
-            outfile = Path(tempfile.mkdtemp()) / filename
-
-        with open(outfile, "wb") as f:
-            f.write(resolved_reference.read_bytes())
-
-        return outfile
-
     def add_viewpoint(self, element: entity_instance) -> None:
-        """Add a viewpoint pointed at the placement of an IFC element to the topic.
+        """
+        Add a viewpoint tergeting an IFC element to the topic.
 
         Args:
             element: The IFC element.
         """
         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
-
-        Args:
-            position: the XYZ point in space
-            guids: one or more element GlobalIds.
-        """
-        vi_handler = VisualizationInfoHandler.create_from_point_and_guids(
-            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
-        self.markup.viewpoints.append(mdl.ViewPoint(viewpoint=new_viewpoint.guid + ".bcfv", guid=new_viewpoint.guid))
+        self.viewpoints[new_viewpoint.guid] = new_viewpoint
+        self.markup.viewpoints.append(mdl.ViewPoint(viewpoint=new_viewpoint.guid, guid=new_viewpoint.guid))
 
-    def __eq__(self, other: object) -> bool | NoReturn:
+    def __eq__(self, other: object) -> bool:
+        if not isinstance(other, TopicHandler):
+            raise TypeError("Equality needs a BcfXml object.")
         return (
-            (
-                self.markup == other.markup
-                and self.viewpoints == other.viewpoints
-                and self.bim_snippet == other.bim_snippet
-            )
-            if isinstance(other, TopicHandler)
-            else NotImplemented
+            self.markup == other.markup
+            and self.viewpoints == other.viewpoints
+            and self.bim_snippet == other.bim_snippet
         )

src/bcf/src/bcf/v2/visinfo.py

@@ -5,15 +5,11 @@ from typing import Any, Iterable, Optional
 
 import numpy as np
 from ifcopenshell import entity_instance
-import ifcopenshell.util.unit
-import ifcopenshell.util.placement
+from ifcopenshell.util import placement
 from numpy.typing import NDArray
 
 import bcf.v2.model as mdl
-from bcf.geometry import (
-    camera_vectors_from_element_placement,
-    camera_vectors_from_target_position,
-)
+from bcf.geometry import calc_camera_vectors
 from bcf.inmemory_zipfile import ZipFileInterface
 from bcf.xml_parser import AbstractXmlParserSerializer, XmlParserSerializer
 
@@ -173,29 +169,6 @@ class VisualizationInfoHandler:
         xml_handler = xml_handler or XmlParserSerializer()
         return cls(visualization_info=build_viewpoint(element), xml_handler=xml_handler)
 
-    @classmethod
-    def create_from_point_and_guids(
-        cls,
-        position: NDArray[np.float_],
-        *guids: str,
-        xml_handler: Optional[AbstractXmlParserSerializer] = None,
-    ) -> "VisualizationInfoHandler":
-        """
-        Create a new VisualizationInfoHandler object from an IFC element.
-
-        Args:
-            position: target point coordinates.
-            *guids: One or more IFC element GUID.
-            xml_handler: The XML handler to use.
-
-        Returns:
-            The VisualizationInfoHandler object.
-        """
-        xml_handler = xml_handler or XmlParserSerializer()
-        return cls(
-            visualization_info=build_viewpoint_from_position_and_guids(position, *guids), xml_handler=xml_handler
-        )
-
 
 @lru_cache(maxsize=None)
 def build_viewpoint(element: entity_instance) -> mdl.VisualizationInfo:
@@ -210,12 +183,7 @@ def build_viewpoint(element: entity_instance) -> mdl.VisualizationInfo:
     Returns:
         The BCF viewpoint definition.
     """
-    ifc_file = element.wrapped_data.file
-    unit_scale = ifcopenshell.util.unit.calculate_unit_scale(ifc_file)
-    elem_placement = ifcopenshell.util.placement.get_local_placement(element.ObjectPlacement)
-    elem_placement[0][3] *= unit_scale
-    elem_placement[1][3] *= unit_scale
-    elem_placement[2][3] *= unit_scale
+    elem_placement = placement.get_local_placement(element.ObjectPlacement)
 
     return mdl.VisualizationInfo(
         guid=str(uuid.uuid4()),
@@ -224,39 +192,18 @@ def build_viewpoint(element: entity_instance) -> mdl.VisualizationInfo:
     )
 
 
-def build_viewpoint_from_position_and_guids(position: NDArray[np.float_], *guids: str) -> mdl.VisualizationInfo:
-    """
-    Return a BCF viewpoint of an IFC element.
-
-    This function is cached to speedudp the creation of multiple BCF topics regarding the same element.
-
-    Args:
-        position: target point coordinates.
-        *guids: One or more IFC element GUID.
-
-    Returns:
-        The BCF viewpoint definition.
-    """
-    return mdl.VisualizationInfo(
-        guid=str(uuid.uuid4()),
-        components=build_components(*guids),
-        perspective_camera=build_camera_from_vectors(*camera_vectors_from_target_position(position)),
-    )
-
-
-def build_components(*guids: str) -> mdl.Components:
+def build_components(guid: str) -> mdl.Components:
     """
     Return the BCF components from an IFC element GUID.
 
     Args:
-        *guids: One or more IFC element GUID.
+        guid: The IFC element GUID.
 
     Returns:
         The BCF components definition.
     """
-    components = [mdl.Component(ifc_guid=guid) for guid in guids]
     return mdl.Components(
-        selection=mdl.ComponentSelection(component=components),
+        selection=mdl.ComponentSelection(component=[mdl.Component(ifc_guid=guid)]),
         visibility=mdl.ComponentVisibility(default_visibility=True),
     )
 
@@ -271,7 +218,7 @@ def build_camera(elem_placement: NDArray[np.float_]) -> mdl.PerspectiveCamera:
     Returns:
         The BCF camera definition.
     """
-    return build_camera_from_vectors(*camera_vectors_from_element_placement(elem_placement))
+    return build_camera_from_vectors(*calc_camera_vectors(elem_placement))
 
 
 def build_camera_from_vectors(

src/bcf/src/bcf/v3/bcfxml.py

@@ -3,7 +3,7 @@ import uuid
 import warnings
 import zipfile
 from pathlib import Path
-from typing import Any, NoReturn, Optional, TypeVar
+from typing import Any, Optional, TypeVar
 
 import bcf.v3.model as mdl
 from bcf.inmemory_zipfile import InMemoryZipFile, ZipFileInterface
@@ -224,13 +224,13 @@ class BcfXml:
         self.topics[topic_handler.guid] = topic_handler
         return topic_handler
 
-    def __eq__(self, other: object) -> bool | NoReturn:
+    def __eq__(self, other: object) -> bool:
+        if not isinstance(other, BcfXml):
+            raise TypeError("Equality needs a BcfXml object.")
         return (
             self.version == other.version
             and self.project_info == other.project_info
             and self.extensions == other.extensions
-            if isinstance(other, BcfXml)
-            else NotImplemented
         )
 
     # region Deprecated methods

src/bcf/src/bcf/v3/topic.py

@@ -3,11 +3,9 @@ import datetime
 import uuid
 import zipfile
 from pathlib import Path
-from typing import Any, NoReturn, Optional
+from typing import Any, Optional
 
-import numpy as np
 from ifcopenshell import entity_instance
-from numpy.typing import NDArray
 from xsdata.models.datatype import XmlDateTime
 
 import bcf.v3.model as mdl
@@ -75,7 +73,7 @@ class TopicHandler:
         self._bim_snippet = value
 
     @property
-    def viewpoints(self) -> dict[str, "VisualizationInfoHandler"]:
+    def viewpoints(self) -> Optional[VisualizationInfoHandler]:
         if (
             not self._viewpoints
             and self._topic_dir
@@ -145,7 +143,7 @@ class TopicHandler:
         self._save_viewpoints(destination_zip, topic_dir)
         self._save_bim_snippet(destination_zip)
 
-    def _save_viewpoints(self, destination_zip: ZipFileInterface, topic_dir: str) -> None:
+    def _save_viewpoints(self, destination_zip, topic_dir) -> None:
         if not self.topic.viewpoints or not (viewpoints := self.topic.viewpoints.view_point):
             return
         for vpt in viewpoints:
@@ -174,33 +172,17 @@ class TopicHandler:
         new_viewpoint = VisualizationInfoHandler.create_new(element, self._xml_handler)
         self.add_visinfo_handler(new_viewpoint)
 
-    def add_viewpoint_from_point_and_guids(self, position: NDArray[np.float_], *guids: str) -> None:
-        """
-        Add a viewpoint tergeting an IFC element to the topic.
-
-        Args:
-            element: The IFC element.
-        """
-        vi_handler = VisualizationInfoHandler.create_from_point_and_guids(
-            position, *guids, xml_handler=self._xml_handler
-        )
-        self.add_visinfo_handler(vi_handler)
-
     def add_visinfo_handler(self, new_viewpoint: VisualizationInfoHandler) -> None:
-        self.viewpoints[new_viewpoint.guid + ".bcfv"] = new_viewpoint
+        self.viewpoints[new_viewpoint.guid] = new_viewpoint
         if self.topic.viewpoints is None:
             self.topic.viewpoints = mdl.TopicViewpoints()
-        self.topic.viewpoints.view_point.append(
-            mdl.ViewPoint(viewpoint=new_viewpoint.guid + ".bcfv", guid=new_viewpoint.guid)
-        )
+        self.topic.viewpoints.view_point.append(mdl.ViewPoint(viewpoint=new_viewpoint.guid, guid=new_viewpoint.guid))
 
-    def __eq__(self, other: object) -> bool | NoReturn:
+    def __eq__(self, other: object) -> bool:
+        if not isinstance(other, TopicHandler):
+            raise TypeError("Equality needs a BcfXml object.")
         return (
-            (
-                self.markup == other.markup
-                and self.viewpoints == other.viewpoints
-                and self.bim_snippet == other.bim_snippet
-            )
-            if isinstance(other, TopicHandler)
-            else NotImplemented
+            self.markup == other.markup
+            and self.viewpoints == other.viewpoints
+            and self.bim_snippet == other.bim_snippet
         )

src/bcf/src/bcf/v3/visinfo.py

@@ -9,10 +9,7 @@ from ifcopenshell.util import placement
 from numpy.typing import NDArray
 
 import bcf.v3.model as mdl
-from bcf.geometry import (
-    camera_vectors_from_element_placement,
-    camera_vectors_from_target_position,
-)
+from bcf.geometry import calc_camera_vectors
 from bcf.inmemory_zipfile import ZipFileInterface
 from bcf.xml_parser import AbstractXmlParserSerializer, XmlParserSerializer
 
@@ -172,29 +169,6 @@ class VisualizationInfoHandler:
         xml_handler = xml_handler or XmlParserSerializer()
         return cls(visualization_info=build_viewpoint(element), xml_handler=xml_handler)
 
-    @classmethod
-    def create_from_point_and_guids(
-        cls,
-        position: NDArray[np.float_],
-        *guids: str,
-        xml_handler: Optional[AbstractXmlParserSerializer] = None,
-    ) -> "VisualizationInfoHandler":
-        """
-        Create a new VisualizationInfoHandler object from an IFC element.
-
-        Args:
-            position: target point coordinates.
-            *guids: One or more IFC element GUID.
-            xml_handler: The XML handler to use.
-
-        Returns:
-            The VisualizationInfoHandler object.
-        """
-        xml_handler = xml_handler or XmlParserSerializer()
-        return cls(
-            visualization_info=build_viewpoint_from_position_and_guids(position, *guids), xml_handler=xml_handler
-        )
-
 
 @lru_cache(maxsize=None)
 def build_viewpoint(element: entity_instance) -> mdl.VisualizationInfo:
@@ -218,39 +192,18 @@ def build_viewpoint(element: entity_instance) -> mdl.VisualizationInfo:
     )
 
 
-def build_viewpoint_from_position_and_guids(position: NDArray[np.float_], *guids: str) -> mdl.VisualizationInfo:
-    """
-    Return a BCF viewpoint of an IFC element.
-
-    This function is cached to speedudp the creation of multiple BCF topics regarding the same element.
-
-    Args:
-        position: target point coordinates.
-        *guids: One or more IFC element GUID.
-
-    Returns:
-        The BCF viewpoint definition.
-    """
-    return mdl.VisualizationInfo(
-        guid=str(uuid.uuid4()),
-        components=build_components(*guids),
-        perspective_camera=build_camera_from_vectors(*camera_vectors_from_target_position(position)),
-    )
-
-
-def build_components(*guids: str) -> mdl.Components:
+def build_components(guid: str) -> mdl.Components:
     """
     Return the BCF components from an IFC element GUID.
 
     Args:
-        *guids: One or more IFC element GUID.
+        guid: The IFC element GUID.
 
     Returns:
         The BCF components definition.
     """
-    components = [mdl.Component(ifc_guid=guid) for guid in guids]
     return mdl.Components(
-        selection=mdl.ComponentSelection(component=components),
+        selection=mdl.ComponentSelection(component=[mdl.Component(ifc_guid=guid)]),
         visibility=mdl.ComponentVisibility(default_visibility=True),
     )
 
@@ -265,7 +218,7 @@ def build_camera(elem_placement: NDArray[np.float_]) -> mdl.PerspectiveCamera:
     Returns:
         The BCF camera definition.
     """
-    return build_camera_from_vectors(*camera_vectors_from_element_placement(elem_placement))
+    return build_camera_from_vectors(*calc_camera_vectors(elem_placement))
 
 
 def build_camera_from_vectors(

src/bcf/tests/v2/test_bcf_xml.py

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

src/bcf/tests/v2/test_ifcclash_api.py

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

src/bcf/tests/v3/test_bcf_xml.py

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

src/bcf/tests/v3/test_ifcclash_api.py

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

src/blenderbim/CITATION.cff

@@ -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'

src/blenderbim/Makefile

@@ -1,5 +1,5 @@
 # BlenderBIM Add-on - OpenBIM Blender Add-on
-# Copyright (C) 2020-2023 Dion Moult <dion@thinkmoult.com>
+# Copyright (C) 2020, 2021 Dion Moult <dion@thinkmoult.com>
 #
 # This file is part of BlenderBIM Add-on.
 #
@@ -16,8 +16,7 @@
 # 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/>.
 
-PYTHON:=python3.10
-PIP:=pip3.10
+PYTHON:=python
 PATCH:=patch
 SED:=sed -i
 ifeq ($(OS),Windows_NT)
@@ -36,95 +35,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
+PYNUMBER:=31
 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/a2/73/07f507b539527579c026ed5f411c35e287685ce794c4dfb7edf6675cdc24/Shapely-1.8.4-cp37-cp37m-manylinux_2_12_x86_64.manylinux2010_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/08/12/5af915b2bc0470f4a652ef9978557a0fa8b705b122ccaec6626029e1674c/Shapely-1.8.4-cp39-cp39-manylinux_2_12_x86_64.manylinux2010_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/60/20/c6321e3da92a4ad9495727c9aa8c423e47295572ccd35ece82d1ac013e28/Shapely-1.8.4-cp310-cp310-manylinux_2_12_x86_64.manylinux2010_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/47/a9/7c644e71638bff2bbaa87f05ee62fdf6b4552a55e74bbf731d6210b6d436/Shapely-1.8.4-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/f5/f9/bf6cc34b02b3c7d3777c5e47fa57d2f69387613bbd8decdf3577a9d83a83/Shapely-1.8.4-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/f5/a8/02347c450b5507b9a7a2c15ad6a029613149468fc55ac2100ab215666159/Shapely-1.8.4-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/47/a9/7c644e71638bff2bbaa87f05ee62fdf6b4552a55e74bbf731d6210b6d436/Shapely-1.8.4-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/8e/60/8186995a96c5a27c9b79c015bbdd89c6d9a6df9988f86f3f1027ecd4a56a/Shapely-1.8.4-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/ba/d0/75cd36c81a1aa26dd6d37cf7ae1c79b0bc2d379e0f32c359bcb00b14e5c3/Shapely-1.8.4-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/ca/4d/85b912d7947261e6b3218b01946bcd7c2efb2bbafaf517c6fe1dc3bb8399/Shapely-1.8.4-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/72/c3/0d52812db25ca71203f6203891277e6ee4f0244b21a36c062123ece15f36/Shapely-1.8.4-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/24/b5/46d13799804b5fe9ede2eca8b19023410e29b78baca0bff727671a1df8c1/Shapely-1.8.4-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:
-	cd . && $(SED) "s/$(OLD)/$(NEW)/" Makefile
-	cd ../ifcopenshell-python/ && $(SED) "s/$(OLD)/$(NEW)/" Makefile
-	cd ../ifcopenshell-python/docs/ifcconvert/ && $(SED) "s/$(OLD)/$(NEW)/" installation.rst
-	cd ../ifcopenshell-python/docs/ifcopenshell-python/ && $(SED) "s/$(OLD)/$(NEW)/" installation.rst
 
 .PHONY: dist
 dist:
@@ -137,7 +182,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-cdde536-$(PLATFORM)64.zip
 	cd dist/working && unzip ifcopenshell-python*
 	cp -r dist/working/ifcopenshell dist/blenderbim/libs/site/packages/
 
@@ -151,28 +196,24 @@ endif
 	cd dist/working && wget https://github.com/IfcOpenShell/IfcOpenShell/archive/v0.7.0.zip
 	cd dist/working && unzip v0.7.0.zip
 	# IfcOpenBot sometimes lags behind, so we hotfix the Python utilities
-	rm -rf dist/blenderbim/libs/site/packages/ifcopenshell/util/
-	rm -rf dist/blenderbim/libs/site/packages/ifcopenshell/api/
-	cp -r dist/working/IfcOpenShell-0.7.0/src/ifcopenshell-python/ifcopenshell/util dist/blenderbim/libs/site/packages/ifcopenshell/
-	cp -r dist/working/IfcOpenShell-0.7.0/src/ifcopenshell-python/ifcopenshell/api dist/blenderbim/libs/site/packages/ifcopenshell/
-	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/express/rule_executor.py dist/blenderbim/libs/site/packages/ifcopenshell/express/
+	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/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/
 	# Provides bcf functionality
 	cp -r dist/working/IfcOpenShell-0.7.0/src/bcf/src/bcf dist/blenderbim/libs/site/packages/
 	# Provides IFCClash functionality
 	cp -r dist/working/IfcOpenShell-0.7.0/src/ifcclash/ifcclash dist/blenderbim/libs/site/packages/
 	# Provides BIMTester functionality
 	cd dist/working && $(PYTHON) -m venv env
-	cd dist/working && . env/bin/activate && $(PIP) install pybabel
-	cd dist/working && . env/bin/activate && $(PIP) install babel
+	cd dist/working && . env/bin/activate && pip install pybabel
+	cd dist/working && . env/bin/activate && pip install babel
 	cd dist/working && . env/bin/activate && ./env/bin/pybabel compile -d ./IfcOpenShell-0.7.0/src/ifcbimtester/bimtester/locale/
 	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
@@ -185,15 +226,9 @@ endif
 	cp -r dist/working/IfcOpenShell-0.7.0/src/ifc5d/ifc5d dist/blenderbim/libs/site/packages/
 	# Provides IFCCityJSON functionality
 	cp -r dist/working/IfcOpenShell-0.7.0/src/ifccityjson dist/blenderbim/libs/site/packages/
-	# Provides IfcGit functionality
-	cd dist/working && . env/bin/activate && $(PIP) install GitPython --target=./site-packages
-	cp -r dist/working/site-packages/smmap dist/blenderbim/libs/site/packages/
-	cp -r dist/working/site-packages/gitdb dist/blenderbim/libs/site/packages/
-	cp -r dist/working/site-packages/git dist/blenderbim/libs/site/packages/
 	rm -rf dist/working
 
 	# Provides Mustache templating in construction documentation
-	# TODO: remove this dependency, it seems overkill and we seem to get by with str replaces
 	mkdir dist/working
 	cd dist/working && wget https://files.pythonhosted.org/packages/3f/e7/8750ba6c6101d6aa5ceeb20c013adf2c6f3554a12c71d75654b468404bfa/pystache-0.6.0.tar.gz
 	cd dist/working && tar -xzvf pystache*
@@ -235,13 +270,6 @@ endif
 	cp -r dist/working/decorator-5.0.9/src/decorator.py dist/blenderbim/libs/site/packages/
 	rm -rf dist/working
 
-	# Provides audio playback for costing
-	mkdir -p dist/working
-	git clone https://github.com/Andrej730/aud.git --branch master-reduced-size --depth 1 dist/working/aud
-	cd dist/working/aud && git checkout 529af208fbcb707c387bfb681d2605c0b6112de7
-	cp -r dist/working/aud/aud dist/blenderbim/libs/site/packages/
-	rm -rf dist/working
-
 	# Provides jsgantt-improved supports for web-based construction sequencing gantt charts
 	mkdir dist/working
 	cd dist/working && wget https://raw.githubusercontent.com/jsGanttImproved/jsgantt-improved/master/dist/jsgantt.js
@@ -325,10 +353,10 @@ endif
 	cd dist/working && cp *.whl shapely.zip && unzip shapely.zip
 	cp -r dist/working/shapely dist/blenderbim/libs/site/packages/
 ifeq ($(PLATFORM), win)
-	cp -r dist/working/shapely.libs dist/blenderbim/libs/site/packages/
+	cp -r dist/working/Shapely.libs dist/blenderbim/libs/site/packages/
 endif
 ifeq ($(PLATFORM), linux)
-	cp -r dist/working/shapely.libs dist/blenderbim/libs/site/packages/
+	cp -r dist/working/Shapely.libs dist/blenderbim/libs/site/packages/
 endif
 	rm -rf dist/working
 
@@ -350,26 +378,108 @@ endif
 	cp -r dist/working/tqdm-4.50.0/tqdm dist/blenderbim/libs/site/packages/
 	rm -rf dist/working
 
+	# Required by IFCCityJSON
 	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 && . env/bin/activate && pip install cjio --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
@@ -417,6 +527,55 @@ 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
+	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
@@ -424,43 +583,55 @@ 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
+	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
 
-	# Required for hipped roof generation
-	mkdir dist/working
-	cd dist/working && wget https://github.com/prochitecture/bpypolyskel/archive/refs/heads/master.zip
-	cd dist/working && unzip master.zip
-	cp -r dist/working/bpypolyskel-master/bpypolyskel dist/blenderbim/libs/site/packages/
-	rm -rf dist/working
-
-	# Required for Desktop icon and file association
-	cp -r blenderbim/libs/desktop dist/blenderbim/libs/
-
-	# Generate translations module for BBIM build
-	git clone https://github.com/IfcOpenShell/blenderbim-translations.git dist/working
-	$(PYTHON) scripts/bbim_translations.py -i "dist/working" -o "dist/blenderbim"
-	rm -rf dist/working
-
-	# Remove dependencies also bundled with Blender
-	rm -rf dist/blenderbim/libs/site/packages/numpy
-	rm -rf dist/blenderbim/libs/site/packages/numpy.libs
-
 	cd dist/blenderbim && $(SED) "s/999999/$(VERSION)/" __init__.py
-	cd dist/blenderbim && $(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
 

src/blenderbim/blenderbim/__init__.py

@@ -18,170 +18,28 @@
 
 import os
 import sys
-import bpy
-import platform
-import traceback
-import subprocess
-import webbrowser
-import addon_utils
-from collections import deque
+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",
 }
 
-last_error = None
-last_actions: deque = deque(maxlen=10)
-
-
-def get_debug_info():
-    version = ".".join(
-        [
-            str(x)
-            for x in [
-                addon.bl_info.get("version", (-1, -1, -1))
-                for addon in addon_utils.modules()
-                if addon.bl_info["name"] == "BlenderBIM"
-            ][0]
-        ]
-    )
-    return {
-        "os": platform.system(),
-        "os_version": platform.version(),
-        "python_version": platform.python_version(),
-        "architecture": platform.architecture(),
-        "machine": platform.machine(),
-        "processor": platform.processor(),
-        "blender_version": bpy.app.version_string,
-        "blenderbim_version": version,
-        "last_actions": last_actions,
-        "last_error": last_error,
-    }
-
-
-def format_debug_info(info: dict):
-    last_actions = ""
-    for action in info["last_actions"]:
-        last_actions += f"\n# {action['type']}: {action['name']}"
-        if settings := action.get("settings"):
-            last_actions += f"\n>>> {settings}"
-    info["last_actions"] = last_actions
-    text = "\n".join(f"{k}: {v}" for k, v in info.items())
-    return text.strip()
-
-
 if sys.modules.get("bpy", None):
     # Process *.pth in /libs/site/packages to setup globally importable modules
     # This is 3 levels deep as required by the static RPATH of ../../ from dependencies taken from Anaconda
-    # site.addsitedir(os.path.join(os.path.dirname(os.path.realpath(__file__)), "libs", "site", "packages"))
-    sys.path.insert(0, os.path.join(os.path.dirname(os.path.realpath(__file__)), "libs", "site", "packages"))
+    site.addsitedir(os.path.join(os.path.dirname(os.path.realpath(__file__)), "libs", "site", "packages"))
 
-    try:
-        import blenderbim.bim
-        import ifcopenshell.api
+    import blenderbim.bim
 
-        def log_api(usecase_path, ifc_file, settings):
-            last_actions.append(
-                {
-                    "type": "ifcopenshell.api",
-                    "name": usecase_path,
-                    "settings": ifcopenshell.api.serialise_settings(settings),
-                }
-            )
+    def register():
+        blenderbim.bim.register()
 
-        ifcopenshell.api.add_pre_listener("*", "action_logger", log_api)
-
-        def register():
-            blenderbim.bim.register()
-
-        def unregister():
-            blenderbim.bim.unregister()
-
-    except:
-        last_error = traceback.format_exc()
-
-        print(last_error)
-        print(format_debug_info(get_debug_info()))
-        print("\nFATAL ERROR: Unable to load the BlenderBIM Add-on")
-
-        class BIM_PT_fatal_error(bpy.types.Panel):
-            bl_label = "BlenderBIM Fatal Error"
-            bl_idname = "SCENE_PT_error_message"
-            bl_space_type = "PROPERTIES"
-            bl_region_type = "WINDOW"
-            bl_context = "scene"
-
-            def draw(self, context):
-                layout = self.layout
-                layout.label(text="BlenderBIM could not load.", icon="ERROR")
-                layout.label(text="View the console for full logs.", icon="CONSOLE")
-                box = layout.box()
-                info = get_debug_info()
-                py = ".".join(info["python_version"].split(".")[0:2])
-                b3d = ".".join(info["blender_version"].split(".")[0:2])
-                box.label(text=f"Blender {b3d} {info['os']} {info['machine']}", icon="BLENDER")
-                box.label(text=f"Python {py} BBIM {info['blenderbim_version']}", icon="SCRIPTPLUGINS")
-                layout.operator("bim.copy_debug_information", text="Copy Error Message To Clipboard")
-                op = layout.operator("bim.open_uri", text="How Can I Fix This?")
-                op.uri = "https://docs.blenderbim.org/users/troubleshooting.html#installation-issues"
-
-        class OpenUri(bpy.types.Operator):
-            bl_idname = "bim.open_uri"
-            bl_label = "Open URI"
-            uri: bpy.props.StringProperty()
-
-            def execute(self, context):
-                webbrowser.open(self.uri)
-                return {"FINISHED"}
-
-        class CopyDebugInformation(bpy.types.Operator):
-            bl_idname = "bim.copy_debug_information"
-            bl_label = "Copy Debug Information"
-            bl_description = "Copies debugging information to your clipboard for use in bugreports"
-
-            def execute(self, context):
-                info = format_debug_info(get_debug_info())
-
-                if platform.system() == "Windows":
-                    command = "echo | set /p nul=" + info
-                elif platform.system() == "Darwin":  # for MacOS
-                    command = 'printf "' + info.replace("\n", "\\n").replace('"', "") + '" | pbcopy'
-                else:  # Linux
-                    command = 'printf "' + info.replace("\n", "\\n").replace('"', "") + '" | xclip -selection clipboard'
-                subprocess.run(command, shell=True, check=True)
-                return {"FINISHED"}
-
-        class HiddenPanel:
-            @classmethod
-            def false_poll(cls, context):
-                return False
-
-        def register():
-            # Only show our error panel and nothing else in the scene tab
-            for item_name in dir(bpy.types):
-                item = getattr(bpy.types, item_name)
-                if not hasattr(item, "bl_rna") or not isinstance(item.bl_rna, bpy.types.Panel):
-                    continue
-                if getattr(item, "bl_context", None) != "scene":
-                    continue
-
-                # Reregister scene panel with a new poll to hide it
-                item.poll = HiddenPanel.false_poll
-                bpy.utils.unregister_class(item)
-                bpy.utils.register_class(item)
-            bpy.utils.register_class(BIM_PT_fatal_error)
-            bpy.utils.register_class(CopyDebugInformation)
-            bpy.utils.register_class(OpenUri)
-
-        def unregister():
-            bpy.utils.unregister_class(OpenUri)
-            bpy.utils.unregister_class(CopyDebugInformation)
-            bpy.utils.unregister_class(BIM_PT_fatal_error)
+    def unregister():
+        blenderbim.bim.unregister()

src/blenderbim/blenderbim/bim/__init__.py

@@ -16,26 +16,14 @@
 # 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 bpy.utils.previews
-import blenderbim
 import importlib
-from pathlib import Path
 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 +37,8 @@ modules = {
     "spatial": None,
     "void": None,
     "aggregate": None,
-    "nest": None,
     "geometry": None,
-    "fm": None,
+    "cobie": None,
     "resource": None,
     "cost": None,
     "sequence": None,
@@ -73,6 +60,7 @@ modules = {
     "document": None,
     "pset_template": None,
     "clash": None,
+    "lca": None,
     "csv": None,
     "tester": None,
     "bimtester": None,
@@ -82,8 +70,6 @@ modules = {
     "covetool": None,
     "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,128 +83,76 @@ 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.CloseError,
-    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.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_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_pre.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)
@@ -226,59 +160,21 @@ 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.utils.unregister_class(cls)
+    bpy.app.handlers.load_post.remove(handler.setDefaultProperties)
     bpy.app.handlers.load_post.remove(handler.loadIfcStore)
+    bpy.app.handlers.save_pre.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
@@ -286,24 +182,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")

src/blenderbim/blenderbim/bim/data/assets/shading_styles.json

@@ -1,755 +0,0 @@
-{
-    "Technical": {
-        "render_type": "VIEWPORT",
-        "raster_style": {
-            "bpy.data.worlds[0].color": [
-                1.0,
-                1.0,
-                1.0
-            ],
-            "scene.render.bake_bias": 0.0010000000474974513,
-            "scene.render.bake_margin": 16,
-            "scene.render.bake_margin_type": "ADJACENT_FACES",
-            "scene.render.bake_samples": 256,
-            "scene.render.bake_type": "NORMALS",
-            "scene.render.bake_user_scale": 0.0,
-            "scene.render.border_max_x": 1.0,
-            "scene.render.border_max_y": 1.0,
-            "scene.render.border_min_x": 0.0,
-            "scene.render.border_min_y": 0.0,
-            "scene.render.dither_intensity": 1.0,
-            "scene.render.engine": "BLENDER_WORKBENCH",
-            "scene.render.film_transparent": false,
-            "scene.render.filter_size": 1.5,
-            "scene.render.fps": 24,
-            "scene.render.fps_base": 1.0,
-            "scene.render.frame_map_new": 100,
-            "scene.render.frame_map_old": 100,
-            "scene.render.hair_subdiv": 0,
-            "scene.render.hair_type": "STRAND",
-            "scene.render.line_thickness": 1.0,
-            "scene.render.line_thickness_mode": "ABSOLUTE",
-            "scene.render.metadata_input": "SCENE",
-            "scene.render.motion_blur_shutter": 0.5,
-            "scene.render.pixel_aspect_x": 1.0,
-            "scene.render.pixel_aspect_y": 1.0,
-            "scene.render.preview_pixel_size": "AUTO",
-            "scene.render.resolution_percentage": 100,
-            "scene.render.resolution_x": 1000,
-            "scene.render.resolution_y": 1000,
-            "scene.render.sequencer_gl_preview": "SOLID",
-            "scene.render.simplify_child_particles": 1.0,
-            "scene.render.simplify_child_particles_render": 1.0,
-            "scene.render.simplify_gpencil": false,
-            "scene.render.simplify_gpencil_antialiasing": true,
-            "scene.render.simplify_gpencil_modifier": true,
-            "scene.render.simplify_gpencil_onplay": false,
-            "scene.render.simplify_gpencil_shader_fx": true,
-            "scene.render.simplify_gpencil_tint": true,
-            "scene.render.simplify_gpencil_view_fill": true,
-            "scene.render.simplify_shadows": 1.0,
-            "scene.render.simplify_shadows_render": 1.0,
-            "scene.render.simplify_subdivision": 6,
-            "scene.render.simplify_subdivision_render": 6,
-            "scene.render.simplify_volumes": 1.0,
-            "scene.render.stamp_font_size": 12,
-            "scene.render.stamp_note_text": "",
-            "scene.render.threads": 20,
-            "scene.render.threads_mode": "AUTO",
-            "scene.render.use_bake_clear": true,
-            "scene.render.use_bake_lores_mesh": false,
-            "scene.render.use_bake_multires": false,
-            "scene.render.use_bake_selected_to_active": false,
-            "scene.render.use_bake_user_scale": false,
-            "scene.render.use_border": false,
-            "scene.render.use_compositing": true,
-            "scene.render.use_crop_to_border": false,
-            "scene.render.use_file_extension": true,
-            "scene.render.use_freestyle": false,
-            "scene.render.use_high_quality_normals": false,
-            "scene.render.use_lock_interface": false,
-            "scene.render.use_motion_blur": false,
-            "scene.render.use_multiview": false,
-            "scene.render.use_overwrite": true,
-            "scene.render.use_persistent_data": false,
-            "scene.render.use_placeholder": false,
-            "scene.render.use_render_cache": false,
-            "scene.render.use_sequencer": true,
-            "scene.render.use_sequencer_override_scene_strip": false,
-            "scene.render.use_simplify": false,
-            "scene.render.use_single_layer": false,
-            "scene.render.use_stamp": false,
-            "scene.render.use_stamp_camera": true,
-            "scene.render.use_stamp_date": true,
-            "scene.render.use_stamp_filename": true,
-            "scene.render.use_stamp_frame": true,
-            "scene.render.use_stamp_frame_range": false,
-            "scene.render.use_stamp_hostname": false,
-            "scene.render.use_stamp_labels": true,
-            "scene.render.use_stamp_lens": false,
-            "scene.render.use_stamp_marker": false,
-            "scene.render.use_stamp_memory": false,
-            "scene.render.use_stamp_note": false,
-            "scene.render.use_stamp_render_time": true,
-            "scene.render.use_stamp_scene": true,
-            "scene.render.use_stamp_sequencer_strip": false,
-            "scene.render.use_stamp_time": true,
-            "scene.render.views_format": "STEREO_3D",
-            "scene.view_settings.exposure": 0.0,
-            "scene.view_settings.gamma": 1.0,
-            "scene.view_settings.look": "None",
-            "scene.view_settings.use_curve_mapping": false,
-            "scene.view_settings.view_transform": "Standard",
-            "scene.display.shading.aov_name": "",
-            "scene.display.shading.background_color": [
-                0.0,
-                0.0,
-                0.0
-            ],
-            "scene.display.shading.background_type": "THEME",
-            "scene.display.shading.cavity_ridge_factor": 1.0,
-            "scene.display.shading.cavity_type": "BOTH",
-            "scene.display.shading.cavity_valley_factor": 1.0,
-            "scene.display.shading.color_type": "SINGLE",
-            "scene.display.shading.curvature_ridge_factor": 1.0,
-            "scene.display.shading.curvature_valley_factor": 1.0,
-            "scene.display.shading.light": "FLAT",
-            "scene.display.shading.object_outline_color": [
-                0.0,
-                0.0,
-                0.0
-            ],
-            "scene.display.shading.render_pass": "COMBINED",
-            "scene.display.shading.shadow_intensity": 0.5,
-            "scene.display.shading.show_backface_culling": false,
-            "scene.display.shading.show_cavity": false,
-            "scene.display.shading.show_object_outline": true,
-            "scene.display.shading.show_shadows": false,
-            "scene.display.shading.show_specular_highlight": true,
-            "scene.display.shading.show_xray": false,
-            "scene.display.shading.show_xray_wireframe": false,
-            "scene.display.shading.single_color": [
-                1.0,
-                1.0,
-                1.0
-            ],
-            "scene.display.shading.studio_light": "Default",
-            "scene.display.shading.studiolight_background_alpha": 0.0,
-            "scene.display.shading.studiolight_background_blur": 0.0,
-            "scene.display.shading.studiolight_intensity": 0.0,
-            "scene.display.shading.studiolight_rotate_z": 0.0,
-            "scene.display.shading.type": "SOLID",
-            "scene.display.shading.use_compositor": "DISABLED",
-            "scene.display.shading.use_dof": false,
-            "scene.display.shading.use_scene_lights": false,
-            "scene.display.shading.use_scene_lights_render": false,
-            "scene.display.shading.use_scene_world": false,
-            "scene.display.shading.use_scene_world_render": false,
-            "scene.display.shading.use_studiolight_view_rotation": true,
-            "scene.display.shading.use_world_space_lighting": false,
-            "scene.display.shading.wireframe_color_type": "MATERIAL",
-            "scene.display.shading.xray_alpha": 0.5,
-            "scene.display.shading.xray_alpha_wireframe": 0.0,
-            "scene.display.light_direction": [
-                0.5,
-                0.5,
-                0.5
-            ],
-            "scene.display.matcap_ssao_attenuation": 1.0,
-            "scene.display.matcap_ssao_distance": 0.20000000298023224,
-            "scene.display.matcap_ssao_samples": 16,
-            "scene.display.render_aa": "8",
-            "scene.display.shadow_focus": 0.0,
-            "scene.display.shadow_shift": 0.10000000149011612,
-            "scene.display.viewport_aa": "FXAA",
-            "space.overlay.backwire_opacity": 0.5,
-            "space.overlay.bone_wire_alpha": 1.0,
-            "space.overlay.display_handle": "SELECTED",
-            "space.overlay.fade_inactive_alpha": 0.4000000059604645,
-            "space.overlay.gpencil_fade_layer": 0.5,
-            "space.overlay.gpencil_fade_objects": 0.5,
-            "space.overlay.gpencil_grid_opacity": 0.5,
-            "space.overlay.gpencil_vertex_paint_opacity": 1.0,
-            "space.overlay.grid_lines": 16,
-            "space.overlay.grid_scale": 1.0,
-            "space.overlay.grid_subdivisions": 10,
-            "space.overlay.normals_constant_screen_size": 7.0,
-            "space.overlay.normals_length": 0.10000000149011612,
-            "space.overlay.sculpt_curves_cage_opacity": 0.5,
-            "space.overlay.sculpt_mode_face_sets_opacity": 1.0,
-            "space.overlay.sculpt_mode_mask_opacity": 0.75,
-            "space.overlay.show_annotation": true,
-            "space.overlay.show_axis_x": false,
-            "space.overlay.show_axis_y": false,
-            "space.overlay.show_axis_z": false,
-            "space.overlay.show_bones": true,
-            "space.overlay.show_cursor": true,
-            "space.overlay.show_curve_normals": false,
-            "space.overlay.show_edge_bevel_weight": true,
-            "space.overlay.show_edge_crease": true,
-            "space.overlay.show_edge_seams": true,
-            "space.overlay.show_edge_sharp": true,
-            "space.overlay.show_edges": false,
-            "space.overlay.show_extra_edge_angle": false,
-            "space.overlay.show_extra_edge_length": false,
-            "space.overlay.show_extra_face_angle": false,
-            "space.overlay.show_extra_face_area": false,
-            "space.overlay.show_extra_indices": false,
-            "space.overlay.show_extras": true,
-            "space.overlay.show_face_center": false,
-            "space.overlay.show_face_normals": false,
-            "space.overlay.show_face_orientation": false,
-            "space.overlay.show_faces": true,
-            "space.overlay.show_fade_inactive": false,
-            "space.overlay.show_floor": false,
-            "space.overlay.show_freestyle_edge_marks": true,
-            "space.overlay.show_freestyle_face_marks": true,
-            "space.overlay.show_look_dev": false,
-            "space.overlay.show_motion_paths": true,
-            "space.overlay.show_object_origins": false,
-            "space.overlay.show_object_origins_all": false,
-            "space.overlay.show_occlude_wire": false,
-            "space.overlay.show_onion_skins": false,
-            "space.overlay.show_ortho_grid": true,
-            "space.overlay.show_outline_selected": true,
-            "space.overlay.show_overlays": true,
-            "space.overlay.show_paint_wire": false,
-            "space.overlay.show_relationship_lines": false,
-            "space.overlay.show_sculpt_curves_cage": true,
-            "space.overlay.show_sculpt_face_sets": true,
-            "space.overlay.show_sculpt_mask": true,
-            "space.overlay.show_split_normals": false,
-            "space.overlay.show_stats": false,
-            "space.overlay.show_statvis": false,
-            "space.overlay.show_text": true,
-            "space.overlay.show_vertex_normals": false,
-            "space.overlay.show_viewer_attribute": true,
-            "space.overlay.show_weight": false,
-            "space.overlay.show_wireframes": true,
-            "space.overlay.show_wpaint_contours": false,
-            "space.overlay.show_xray_bone": false,
-            "space.overlay.texture_paint_mode_opacity": 1.0,
-            "space.overlay.use_debug_freeze_view_culling": false,
-            "space.overlay.use_gpencil_canvas_xray": false,
-            "space.overlay.use_gpencil_edit_lines": true,
-            "space.overlay.use_gpencil_fade_gp_objects": false,
-            "space.overlay.use_gpencil_fade_layers": false,
-            "space.overlay.use_gpencil_fade_objects": false,
-            "space.overlay.use_gpencil_grid": false,
-            "space.overlay.use_gpencil_multiedit_line_only": false,
-            "space.overlay.use_gpencil_onion_skin": false,
-            "space.overlay.use_gpencil_show_directions": false,
-            "space.overlay.use_gpencil_show_material_name": false,
-            "space.overlay.use_normals_constant_screen_size": false,
-            "space.overlay.vertex_opacity": 1.0,
-            "space.overlay.vertex_paint_mode_opacity": 1.0,
-            "space.overlay.viewer_attribute_opacity": 1.0,
-            "space.overlay.weight_paint_mode_opacity": 1.0,
-            "space.overlay.wireframe_opacity": 1.0,
-            "space.overlay.wireframe_threshold": 0.0,
-            "space.overlay.xray_alpha_bone": 0.0
-        }
-    },
-    "Shaded": {
-        "render_type": "VIEWPORT",
-        "raster_style": {
-            "bpy.data.worlds[0].color": [
-                1.0,
-                1.0,
-                1.0
-            ],
-            "scene.render.bake_bias": 0.0010000000474974513,
-            "scene.render.bake_margin": 16,
-            "scene.render.bake_margin_type": "ADJACENT_FACES",
-            "scene.render.bake_samples": 256,
-            "scene.render.bake_type": "NORMALS",
-            "scene.render.bake_user_scale": 0.0,
-            "scene.render.border_max_x": 1.0,
-            "scene.render.border_max_y": 1.0,
-            "scene.render.border_min_x": 0.0,
-            "scene.render.border_min_y": 0.0,
-            "scene.render.dither_intensity": 1.0,
-            "scene.render.engine": "BLENDER_WORKBENCH",
-            "scene.render.film_transparent": false,
-            "scene.render.filter_size": 1.5,
-            "scene.render.fps": 24,
-            "scene.render.fps_base": 1.0,
-            "scene.render.frame_map_new": 100,
-            "scene.render.frame_map_old": 100,
-            "scene.render.hair_subdiv": 0,
-            "scene.render.hair_type": "STRAND",
-            "scene.render.line_thickness": 1.0,
-            "scene.render.line_thickness_mode": "ABSOLUTE",
-            "scene.render.metadata_input": "SCENE",
-            "scene.render.motion_blur_shutter": 0.5,
-            "scene.render.pixel_aspect_x": 1.0,
-            "scene.render.pixel_aspect_y": 1.0,
-            "scene.render.preview_pixel_size": "AUTO",
-            "scene.render.resolution_percentage": 100,
-            "scene.render.resolution_x": 1000,
-            "scene.render.resolution_y": 1000,
-            "scene.render.sequencer_gl_preview": "SOLID",
-            "scene.render.simplify_child_particles": 1.0,
-            "scene.render.simplify_child_particles_render": 1.0,
-            "scene.render.simplify_gpencil": false,
-            "scene.render.simplify_gpencil_antialiasing": true,
-            "scene.render.simplify_gpencil_modifier": true,
-            "scene.render.simplify_gpencil_onplay": false,
-            "scene.render.simplify_gpencil_shader_fx": true,
-            "scene.render.simplify_gpencil_tint": true,
-            "scene.render.simplify_gpencil_view_fill": true,
-            "scene.render.simplify_shadows": 1.0,
-            "scene.render.simplify_shadows_render": 1.0,
-            "scene.render.simplify_subdivision": 6,
-            "scene.render.simplify_subdivision_render": 6,
-            "scene.render.simplify_volumes": 1.0,
-            "scene.render.stamp_font_size": 12,
-            "scene.render.stamp_note_text": "",
-            "scene.render.threads": 20,
-            "scene.render.threads_mode": "AUTO",
-            "scene.render.use_bake_clear": true,
-            "scene.render.use_bake_lores_mesh": false,
-            "scene.render.use_bake_multires": false,
-            "scene.render.use_bake_selected_to_active": false,
-            "scene.render.use_bake_user_scale": false,
-            "scene.render.use_border": false,
-            "scene.render.use_compositing": true,
-            "scene.render.use_crop_to_border": false,
-            "scene.render.use_file_extension": true,
-            "scene.render.use_freestyle": false,
-            "scene.render.use_high_quality_normals": false,
-            "scene.render.use_lock_interface": false,
-            "scene.render.use_motion_blur": false,
-            "scene.render.use_multiview": false,
-            "scene.render.use_overwrite": true,
-            "scene.render.use_persistent_data": false,
-            "scene.render.use_placeholder": false,
-            "scene.render.use_render_cache": false,
-            "scene.render.use_sequencer": true,
-            "scene.render.use_sequencer_override_scene_strip": false,
-            "scene.render.use_simplify": false,
-            "scene.render.use_single_layer": false,
-            "scene.render.use_stamp": false,
-            "scene.render.use_stamp_camera": true,
-            "scene.render.use_stamp_date": true,
-            "scene.render.use_stamp_filename": true,
-            "scene.render.use_stamp_frame": true,
-            "scene.render.use_stamp_frame_range": false,
-            "scene.render.use_stamp_hostname": false,
-            "scene.render.use_stamp_labels": true,
-            "scene.render.use_stamp_lens": false,
-            "scene.render.use_stamp_marker": false,
-            "scene.render.use_stamp_memory": false,
-            "scene.render.use_stamp_note": false,
-            "scene.render.use_stamp_render_time": true,
-            "scene.render.use_stamp_scene": true,
-            "scene.render.use_stamp_sequencer_strip": false,
-            "scene.render.use_stamp_time": true,
-            "scene.render.views_format": "STEREO_3D",
-            "scene.view_settings.exposure": 0.0,
-            "scene.view_settings.gamma": 1.0,
-            "scene.view_settings.look": "None",
-            "scene.view_settings.use_curve_mapping": false,
-            "scene.view_settings.view_transform": "Standard",
-            "scene.display.shading.aov_name": "",
-            "scene.display.shading.background_color": [
-                0.0,
-                0.0,
-                0.0
-            ],
-            "scene.display.shading.background_type": "THEME",
-            "scene.display.shading.cavity_ridge_factor": 1.0,
-            "scene.display.shading.cavity_type": "BOTH",
-            "scene.display.shading.cavity_valley_factor": 1.0,
-            "scene.display.shading.color_type": "MATERIAL",
-            "scene.display.shading.curvature_ridge_factor": 1.0,
-            "scene.display.shading.curvature_valley_factor": 1.0,
-            "scene.display.shading.light": "STUDIO",
-            "scene.display.shading.object_outline_color": [
-                0.0,
-                0.0,
-                0.0
-            ],
-            "scene.display.shading.render_pass": "COMBINED",
-            "scene.display.shading.shadow_intensity": 0.5,
-            "scene.display.shading.show_backface_culling": false,
-            "scene.display.shading.show_cavity": true,
-            "scene.display.shading.show_object_outline": true,
-            "scene.display.shading.show_shadows": true,
-            "scene.display.shading.show_specular_highlight": true,
-            "scene.display.shading.show_xray": false,
-            "scene.display.shading.show_xray_wireframe": false,
-            "scene.display.shading.single_color": [
-                1.0,
-                1.0,
-                1.0
-            ],
-            "scene.display.shading.studio_light": "Default",
-            "scene.display.shading.studiolight_background_alpha": 0.0,
-            "scene.display.shading.studiolight_background_blur": 0.0,
-            "scene.display.shading.studiolight_intensity": 0.0,
-            "scene.display.shading.studiolight_rotate_z": 0.0,
-            "scene.display.shading.type": "RENDERED",
-            "scene.display.shading.use_compositor": "DISABLED",
-            "scene.display.shading.use_dof": false,
-            "scene.display.shading.use_scene_lights": false,
-            "scene.display.shading.use_scene_lights_render": false,
-            "scene.display.shading.use_scene_world": false,
-            "scene.display.shading.use_scene_world_render": false,
-            "scene.display.shading.use_studiolight_view_rotation": true,
-            "scene.display.shading.use_world_space_lighting": false,
-            "scene.display.shading.wireframe_color_type": "MATERIAL",
-            "scene.display.shading.xray_alpha": 0.5,
-            "scene.display.shading.xray_alpha_wireframe": 0.0,
-            "scene.display.light_direction": [
-                0.5,
-                0.5,
-                0.5
-            ],
-            "scene.display.matcap_ssao_attenuation": 1.0,
-            "scene.display.matcap_ssao_distance": 0.20000000298023224,
-            "scene.display.matcap_ssao_samples": 16,
-            "scene.display.render_aa": "8",
-            "scene.display.shadow_focus": 0.0,
-            "scene.display.shadow_shift": 0.10000000149011612,
-            "scene.display.viewport_aa": "FXAA",
-            "space.overlay.backwire_opacity": 0.5,
-            "space.overlay.bone_wire_alpha": 1.0,
-            "space.overlay.display_handle": "SELECTED",
-            "space.overlay.fade_inactive_alpha": 0.4000000059604645,
-            "space.overlay.gpencil_fade_layer": 0.5,
-            "space.overlay.gpencil_fade_objects": 0.5,
-            "space.overlay.gpencil_grid_opacity": 0.5,
-            "space.overlay.gpencil_vertex_paint_opacity": 1.0,
-            "space.overlay.grid_lines": 16,
-            "space.overlay.grid_scale": 1.0,
-            "space.overlay.grid_subdivisions": 10,
-            "space.overlay.normals_constant_screen_size": 7.0,
-            "space.overlay.normals_length": 0.10000000149011612,
-            "space.overlay.sculpt_curves_cage_opacity": 0.5,
-            "space.overlay.sculpt_mode_face_sets_opacity": 1.0,
-            "space.overlay.sculpt_mode_mask_opacity": 0.75,
-            "space.overlay.show_annotation": true,
-            "space.overlay.show_axis_x": false,
-            "space.overlay.show_axis_y": false,
-            "space.overlay.show_axis_z": false,
-            "space.overlay.show_bones": true,
-            "space.overlay.show_cursor": true,
-            "space.overlay.show_curve_normals": false,
-            "space.overlay.show_edge_bevel_weight": true,
-            "space.overlay.show_edge_crease": true,
-            "space.overlay.show_edge_seams": true,
-            "space.overlay.show_edge_sharp": true,
-            "space.overlay.show_edges": false,
-            "space.overlay.show_extra_edge_angle": false,
-            "space.overlay.show_extra_edge_length": false,
-            "space.overlay.show_extra_face_angle": false,
-            "space.overlay.show_extra_face_area": false,
-            "space.overlay.show_extra_indices": false,
-            "space.overlay.show_extras": true,
-            "space.overlay.show_face_center": false,
-            "space.overlay.show_face_normals": false,
-            "space.overlay.show_face_orientation": false,
-            "space.overlay.show_faces": true,
-            "space.overlay.show_fade_inactive": false,
-            "space.overlay.show_floor": false,
-            "space.overlay.show_freestyle_edge_marks": true,
-            "space.overlay.show_freestyle_face_marks": true,
-            "space.overlay.show_look_dev": false,
-            "space.overlay.show_motion_paths": true,
-            "space.overlay.show_object_origins": false,
-            "space.overlay.show_object_origins_all": false,
-            "space.overlay.show_occlude_wire": false,
-            "space.overlay.show_onion_skins": false,
-            "space.overlay.show_ortho_grid": true,
-            "space.overlay.show_outline_selected": true,
-            "space.overlay.show_overlays": true,
-            "space.overlay.show_paint_wire": false,
-            "space.overlay.show_relationship_lines": false,
-            "space.overlay.show_sculpt_curves_cage": true,
-            "space.overlay.show_sculpt_face_sets": true,
-            "space.overlay.show_sculpt_mask": true,
-            "space.overlay.show_split_normals": false,
-            "space.overlay.show_stats": false,
-            "space.overlay.show_statvis": false,
-            "space.overlay.show_text": true,
-            "space.overlay.show_vertex_normals": false,
-            "space.overlay.show_viewer_attribute": true,
-            "space.overlay.show_weight": false,
-            "space.overlay.show_wireframes": false,
-            "space.overlay.show_wpaint_contours": false,
-            "space.overlay.show_xray_bone": false,
-            "space.overlay.texture_paint_mode_opacity": 1.0,
-            "space.overlay.use_debug_freeze_view_culling": false,
-            "space.overlay.use_gpencil_canvas_xray": false,
-            "space.overlay.use_gpencil_edit_lines": true,
-            "space.overlay.use_gpencil_fade_gp_objects": false,
-            "space.overlay.use_gpencil_fade_layers": false,
-            "space.overlay.use_gpencil_fade_objects": false,
-            "space.overlay.use_gpencil_grid": false,
-            "space.overlay.use_gpencil_multiedit_line_only": false,
-            "space.overlay.use_gpencil_onion_skin": false,
-            "space.overlay.use_gpencil_show_directions": false,
-            "space.overlay.use_gpencil_show_material_name": false,
-            "space.overlay.use_normals_constant_screen_size": false,
-            "space.overlay.vertex_opacity": 1.0,
-            "space.overlay.vertex_paint_mode_opacity": 1.0,
-            "space.overlay.viewer_attribute_opacity": 1.0,
-            "space.overlay.weight_paint_mode_opacity": 1.0,
-            "space.overlay.wireframe_opacity": 1.0,
-            "space.overlay.wireframe_threshold": 0.0,
-            "space.overlay.xray_alpha_bone": 0.0
-        }
-    },
-    "Blender Default": {
-        "render_type": "VIEWPORT",
-        "raster_style": {
-            "bpy.data.worlds[0].color": [
-                0.05087608844041824,
-                0.05087608844041824,
-                0.05087608844041824
-            ],
-            "scene.render.bake_bias": 0.0010000000474974513,
-            "scene.render.bake_margin": 16,
-            "scene.render.bake_margin_type": "ADJACENT_FACES",
-            "scene.render.bake_samples": 256,
-            "scene.render.bake_type": "NORMALS",
-            "scene.render.bake_user_scale": 0.0,
-            "scene.render.border_max_x": 1.0,
-            "scene.render.border_max_y": 1.0,
-            "scene.render.border_min_x": 0.0,
-            "scene.render.border_min_y": 0.0,
-            "scene.render.dither_intensity": 1.0,
-            "scene.render.engine": "BLENDER_EEVEE",
-            "scene.render.film_transparent": false,
-            "scene.render.filter_size": 1.5,
-            "scene.render.fps": 24,
-            "scene.render.fps_base": 1.0,
-            "scene.render.frame_map_new": 100,
-            "scene.render.frame_map_old": 100,
-            "scene.render.hair_subdiv": 0,
-            "scene.render.hair_type": "STRAND",
-            "scene.render.line_thickness": 1.0,
-            "scene.render.line_thickness_mode": "ABSOLUTE",
-            "scene.render.metadata_input": "SCENE",
-            "scene.render.motion_blur_shutter": 0.5,
-            "scene.render.pixel_aspect_x": 1.0,
-            "scene.render.pixel_aspect_y": 1.0,
-            "scene.render.preview_pixel_size": "AUTO",
-            "scene.render.resolution_percentage": 100,
-            "scene.render.resolution_x": 1000,
-            "scene.render.resolution_y": 1000,
-            "scene.render.sequencer_gl_preview": "SOLID",
-            "scene.render.simplify_child_particles": 1.0,
-            "scene.render.simplify_child_particles_render": 1.0,
-            "scene.render.simplify_gpencil": false,
-            "scene.render.simplify_gpencil_antialiasing": true,
-            "scene.render.simplify_gpencil_modifier": true,
-            "scene.render.simplify_gpencil_onplay": false,
-            "scene.render.simplify_gpencil_shader_fx": true,
-            "scene.render.simplify_gpencil_tint": true,
-            "scene.render.simplify_gpencil_view_fill": true,
-            "scene.render.simplify_shadows": 1.0,
-            "scene.render.simplify_shadows_render": 1.0,
-            "scene.render.simplify_subdivision": 6,
-            "scene.render.simplify_subdivision_render": 6,
-            "scene.render.simplify_volumes": 1.0,
-            "scene.render.stamp_font_size": 12,
-            "scene.render.stamp_note_text": "",
-            "scene.render.threads": 20,
-            "scene.render.threads_mode": "AUTO",
-            "scene.render.use_bake_clear": true,
-            "scene.render.use_bake_lores_mesh": false,
-            "scene.render.use_bake_multires": false,
-            "scene.render.use_bake_selected_to_active": false,
-            "scene.render.use_bake_user_scale": false,
-            "scene.render.use_border": false,
-            "scene.render.use_compositing": true,
-            "scene.render.use_crop_to_border": false,
-            "scene.render.use_file_extension": true,
-            "scene.render.use_freestyle": false,
-            "scene.render.use_high_quality_normals": false,
-            "scene.render.use_lock_interface": false,
-            "scene.render.use_motion_blur": false,
-            "scene.render.use_multiview": false,
-            "scene.render.use_overwrite": true,
-            "scene.render.use_persistent_data": false,
-            "scene.render.use_placeholder": false,
-            "scene.render.use_render_cache": false,
-            "scene.render.use_sequencer": true,
-            "scene.render.use_sequencer_override_scene_strip": false,
-            "scene.render.use_simplify": false,
-            "scene.render.use_single_layer": false,
-            "scene.render.use_stamp": false,
-            "scene.render.use_stamp_camera": true,
-            "scene.render.use_stamp_date": true,
-            "scene.render.use_stamp_filename": true,
-            "scene.render.use_stamp_frame": true,
-            "scene.render.use_stamp_frame_range": false,
-            "scene.render.use_stamp_hostname": false,
-            "scene.render.use_stamp_labels": true,
-            "scene.render.use_stamp_lens": false,
-            "scene.render.use_stamp_marker": false,
-            "scene.render.use_stamp_memory": false,
-            "scene.render.use_stamp_note": false,
-            "scene.render.use_stamp_render_time": true,
-            "scene.render.use_stamp_scene": true,
-            "scene.render.use_stamp_sequencer_strip": false,
-            "scene.render.use_stamp_time": true,
-            "scene.render.views_format": "STEREO_3D",
-            "scene.view_settings.exposure": 0.0,
-            "scene.view_settings.gamma": 1.0,
-            "scene.view_settings.look": "None",
-            "scene.view_settings.use_curve_mapping": false,
-            "scene.view_settings.view_transform": "Filmic",
-            "scene.display.shading.aov_name": "",
-            "scene.display.shading.background_color": [
-                0.0,
-                0.0,
-                0.0
-            ],
-            "scene.display.shading.background_type": "THEME",
-            "scene.display.shading.cavity_ridge_factor": 1.0,
-            "scene.display.shading.cavity_type": "WORLD",
-            "scene.display.shading.cavity_valley_factor": 1.0,
-            "scene.display.shading.color_type": "MATERIAL",
-            "scene.display.shading.curvature_ridge_factor": 0.0,
-            "scene.display.shading.curvature_valley_factor": 0.0,
-            "scene.display.shading.light": "STUDIO",
-            "scene.display.shading.object_outline_color": [
-                0.0,
-                0.0,
-                0.0
-            ],
-            "scene.display.shading.render_pass": "COMBINED",
-            "scene.display.shading.shadow_intensity": 0.5,
-            "scene.display.shading.show_backface_culling": false,
-            "scene.display.shading.show_cavity": false,
-            "scene.display.shading.show_object_outline": false,
-            "scene.display.shading.show_shadows": false,
-            "scene.display.shading.show_specular_highlight": true,
-            "scene.display.shading.show_xray": false,
-            "scene.display.shading.show_xray_wireframe": false,
-            "scene.display.shading.single_color": [
-                0.800000011920929,
-                0.800000011920929,
-                0.800000011920929
-            ],
-            "scene.display.shading.studio_light": "Default",
-            "scene.display.shading.studiolight_background_alpha": 0.0,
-            "scene.display.shading.studiolight_background_blur": 0.0,
-            "scene.display.shading.studiolight_intensity": 0.0,
-            "scene.display.shading.studiolight_rotate_z": 0.0,
-            "scene.display.shading.type": "RENDERED",
-            "scene.display.shading.use_compositor": "DISABLED",
-            "scene.display.shading.use_dof": false,
-            "scene.display.shading.use_scene_lights": false,
-            "scene.display.shading.use_scene_lights_render": false,
-            "scene.display.shading.use_scene_world": false,
-            "scene.display.shading.use_scene_world_render": false,
-            "scene.display.shading.use_studiolight_view_rotation": true,
-            "scene.display.shading.use_world_space_lighting": false,
-            "scene.display.shading.wireframe_color_type": "MATERIAL",
-            "scene.display.shading.xray_alpha": 0.5,
-            "scene.display.shading.xray_alpha_wireframe": 0.0,
-            "scene.display.light_direction": [
-                0.5773502588272095,
-                0.5773502588272095,
-                0.5773502588272095
-            ],
-            "scene.display.matcap_ssao_attenuation": 1.0,
-            "scene.display.matcap_ssao_distance": 0.20000000298023224,
-            "scene.display.matcap_ssao_samples": 16,
-            "scene.display.render_aa": "8",
-            "scene.display.shadow_focus": 0.0,
-            "scene.display.shadow_shift": 0.10000000149011612,
-            "scene.display.viewport_aa": "FXAA",
-            "space.overlay.backwire_opacity": 0.5,
-            "space.overlay.bone_wire_alpha": 1.0,
-            "space.overlay.display_handle": "SELECTED",
-            "space.overlay.fade_inactive_alpha": 0.4000000059604645,
-            "space.overlay.gpencil_fade_layer": 0.5,
-            "space.overlay.gpencil_fade_objects": 0.5,
-            "space.overlay.gpencil_grid_opacity": 0.5,
-            "space.overlay.gpencil_vertex_paint_opacity": 1.0,
-            "space.overlay.grid_lines": 16,
-            "space.overlay.grid_scale": 1.0,
-            "space.overlay.grid_subdivisions": 10,
-            "space.overlay.normals_constant_screen_size": 7.0,
-            "space.overlay.normals_length": 0.10000000149011612,
-            "space.overlay.sculpt_curves_cage_opacity": 0.5,
-            "space.overlay.sculpt_mode_face_sets_opacity": 1.0,
-            "space.overlay.sculpt_mode_mask_opacity": 0.75,
-            "space.overlay.show_annotation": true,
-            "space.overlay.show_axis_x": true,
-            "space.overlay.show_axis_y": true,
-            "space.overlay.show_axis_z": false,
-            "space.overlay.show_bones": true,
-            "space.overlay.show_cursor": true,
-            "space.overlay.show_curve_normals": false,
-            "space.overlay.show_edge_bevel_weight": true,
-            "space.overlay.show_edge_crease": true,
-            "space.overlay.show_edge_seams": true,
-            "space.overlay.show_edge_sharp": true,
-            "space.overlay.show_edges": false,
-            "space.overlay.show_extra_edge_angle": false,
-            "space.overlay.show_extra_edge_length": false,
-            "space.overlay.show_extra_face_angle": false,
-            "space.overlay.show_extra_face_area": false,
-            "space.overlay.show_extra_indices": false,
-            "space.overlay.show_extras": true,
-            "space.overlay.show_face_center": false,
-            "space.overlay.show_face_normals": false,
-            "space.overlay.show_face_orientation": false,
-            "space.overlay.show_faces": true,
-            "space.overlay.show_fade_inactive": false,
-            "space.overlay.show_floor": true,
-            "space.overlay.show_freestyle_edge_marks": true,
-            "space.overlay.show_freestyle_face_marks": true,
-            "space.overlay.show_look_dev": false,
-            "space.overlay.show_motion_paths": true,
-            "space.overlay.show_object_origins": true,
-            "space.overlay.show_object_origins_all": false,
-            "space.overlay.show_occlude_wire": false,
-            "space.overlay.show_onion_skins": false,
-            "space.overlay.show_ortho_grid": true,
-            "space.overlay.show_outline_selected": true,
-            "space.overlay.show_overlays": true,
-            "space.overlay.show_paint_wire": false,
-            "space.overlay.show_relationship_lines": true,
-            "space.overlay.show_sculpt_curves_cage": true,
-            "space.overlay.show_sculpt_face_sets": true,
-            "space.overlay.show_sculpt_mask": true,
-            "space.overlay.show_split_normals": false,
-            "space.overlay.show_stats": false,
-            "space.overlay.show_statvis": false,
-            "space.overlay.show_text": true,
-            "space.overlay.show_vertex_normals": false,
-            "space.overlay.show_viewer_attribute": true,
-            "space.overlay.show_weight": false,
-            "space.overlay.show_wireframes": false,
-            "space.overlay.show_wpaint_contours": false,
-            "space.overlay.show_xray_bone": false,
-            "space.overlay.texture_paint_mode_opacity": 1.0,
-            "space.overlay.use_debug_freeze_view_culling": false,
-            "space.overlay.use_gpencil_canvas_xray": false,
-            "space.overlay.use_gpencil_edit_lines": true,
-            "space.overlay.use_gpencil_fade_gp_objects": false,
-            "space.overlay.use_gpencil_fade_layers": false,
-            "space.overlay.use_gpencil_fade_objects": false,
-            "space.overlay.use_gpencil_grid": false,
-            "space.overlay.use_gpencil_multiedit_line_only": false,
-            "space.overlay.use_gpencil_onion_skin": false,
-            "space.overlay.use_gpencil_show_directions": false,
-            "space.overlay.use_gpencil_show_material_name": false,
-            "space.overlay.use_normals_constant_screen_size": false,
-            "space.overlay.vertex_opacity": 1.0,
-            "space.overlay.vertex_paint_mode_opacity": 1.0,
-            "space.overlay.viewer_attribute_opacity": 1.0,
-            "space.overlay.weight_paint_mode_opacity": 1.0,
-            "space.overlay.wireframe_opacity": 1.0,
-            "space.overlay.wireframe_threshold": 1.0,
-            "space.overlay.xray_alpha_bone": 0.0
-        }
-    }
-}

src/blenderbim/blenderbim/bim/data/assets/symbols.svg

@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<svg baseProfile="full" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <g id="rectangle-tag">
-        <rect x="-6" y="-2.5" width="12" height="5" fill="white" stroke="black" style="stroke-width: 0.25;" />
-    </g>
-    <g id="triangle-tag">
-        <path style="fill: white; stroke: black; stroke-width: 0.25;" d="M 3.1409425e-7,-7.1069207 5.7650623,2.8784603 l -11.5301246,-6e-7 z" />
-    </g>
-    <g id="hexagon-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="capsule-tag">
-        <rect x="-6" y="-2.5" width="12" height="5" rx="2.5" ry="2.5" fill="white" stroke="black" style="stroke-width: 0.25;" />
-    </g>
-    <g id="circle-tag">
-        <circle r="5" fill="white" stroke="black" style="stroke-width: 0.25;" />
-    </g>
-    <g id="door-tag">
-        <circle r="5" fill="white" stroke="black" style="stroke-width: 0.25;" />
-        <text y="-1.75" class="regular" text-anchor="middle" dominant-baseline="middle" data-type="text-template"></text>
-        <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;" />
-        <text class="regular" text-anchor="middle" dominant-baseline="middle" data-type="text-template"></text>
-        <text y="5" class="regular" text-anchor="middle" dominant-baseline="middle" data-type="text-template"></text>
-    </g>
-    <g id="elevation-arrow">
-        <path style="fill: black;" d="M -7.07106 0 0 -7.07106 7.07106 0" />
-    </g>
-    <g id="elevation-tag">
-        <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="section-arrow">
-        <path style="fill: black;" d="M -7.07106 0 0 -7.07106 7.07106 0" />
-    </g>
-    <g id="section-tag">
-        <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>

src/blenderbim/blenderbim/bim/data/gantt/index.mustache

@@ -1,55 +1,67 @@
 <link href="jsgantt.css" rel="stylesheet" type="text/css"/>
-<link href="../../module/sequence/gantt/main.css" rel="stylesheet" type="text/css"/>
 <script src="jsgantt.js" type="text/javascript"></script>
-<script type="text/javascript" src="../../module/sequence/gantt/index.js"></script>
-<script>
-var json_data = `{{{json_data}}}`;
-</script>
+<style>
+.gtaskcellwkend,
+.gtaskcellcurrent,
+.gminorheadingwkend {
+  background-color: #e1e1e1;
+}
 
-<div id="options" class="no-print">
-  <h4>Choose a language:
-  <select id="lang" class="sweet_button" onchange="set_language(event)">
-    <option value='cn'>Chinese (cn)</option>
-    <option value='cs'>Czech (cs)</option>
-    <option value='nl'>Dutch (Standard)</option>
-    <option value='en' selected>English (en)</option>
-    <option value='fr'>French (fr)</option>
-    <option value='de'>German (de)</option>
-    <option value='hu'>Hungarian (hu)</option>
-    <option value='id'>Indonesian (id)</option>
-    <option value='it'>Italian (it)</option>
-    <option value='ja'>Japanese (ja)</option>
-    <option value='pt'>Portuguese (pt)</option>
-    <option value='ru'>Russian (ru)</option>
-    <option value='es'>Spanish (es)</option>
-    <option value='sv'>Swedish (sv)</option>
-    <option value='tr'>Turkish (tr)</option>
-  </select>
-  </h4>
+.gitemhighlight td {
+  background-color: #ffdaaa;
+}
 
-  <br>
-</div>
-<div class="top-right no-print" id="print_options">
-  <select class="sweet_button" id="print_page_size">
-    <option value="210,297">A4 Portrait</option>
-    <option value="297,210">A4 Landscape</option>
-    <option value="297,420">A3 Portrait</option>
-    <option value="420,297">A3 Landscape</option>
-    <option value="420,594">A2 Portrait</option>
-    <option value="594,420">A2 Landscape</option>
-    <option value="594,841">A1 Portrait</option>
-    <option value="841,594">A1 Landscape</option>
-    <option value="841,1189">A0 Portrait</option>
-    <option value="1189,841">A0 Landscape</option>
-  </select>
-</div>
+.gtaskblue {
+  background: #4281A4;
+}
 
-<div id="schedule-data" class="no-print"></div>
-<div id="schedule-header" style=""></div>
+.gtaskred {
+  background: #C1666B;
+}
+
+.gtaskgreen {
+  background: #48A9A6;
+}
+
+.gtaskyellow {
+  background: #D4B483;
+}
+
+.gmainleft {
+  overflow: visible;
+  flex: 0 1 auto;
+}
+
+</style>
+<a href="#print" id="print">Print Mode</a>
 <div style="position:relative" class="gantt" id="GanttChartDIV"></div>
-
-<script>
-var data = `{{{data}}}`;
-setupPage(data);
-create_gantt_chart(atob(json_data))
+<script type="text/javascript">
+var g = new JSGantt.GanttChart(document.getElementById('GanttChartDIV'), 'day');
+g.setOptions({
+    vCaptionType: 'Caption',  // Set to Show Caption : None,Caption,Resource,Duration,Complete,
+    vQuarterColWidth: 36,
+    vDateTaskDisplayFormat: 'day dd month yyyy', // Shown in tool tip box
+    vDayMajorDateDisplayFormat: 'mon yyyy - Week ww',// Set format to dates in the "Major" header of the "Day" view
+    vWeekMinorDateDisplayFormat: 'dd mon', // Set format to display dates in the "Minor" header of the "Week" view
+    vLang: 'en',
+    vShowTaskInfoLink: 1, // Show link in tool tip (0/1)
+    vShowEndWeekDate: 0,  // Show/Hide the date for the last day of the week in header for daily
+    vUseSingleCell: 10000, // Set the threshold cell per table row (Helps performance for large data.
+    vFormatArr: ['Day', 'Week', 'Month', 'Quarter'], // Even with setUseSingleCell using Hour format on such a large chart can cause issues in some browsers,
+    vShowRes: false, // Disable the resource column.
+    vShowComp: false, // Disable the completion column.
+    vShowDur: false, // Disable the duration column, because jsgantt doesn't calculate durations the way we want.
+    vAdditionalHeaders: {ifcduration: {title: 'Duration'}},
+    vUseToolTip: false, // Disable tooltips.
+    vTotalHeight: 900,
+});
+document.getElementById('print').addEventListener('click', function() {
+    g.setTotalHeight("");
+    g.Draw();
+});
+var json_data = `
+{{{json_data}}}
+`;
+JSGantt.parseJSONString(json_data, g);
+g.Draw();
 </script>

src/blenderbim/blenderbim/bim/data/pset/EPset_Annotation.ifc

@@ -0,0 +1,13 @@
+ISO-10303-21;
+HEADER;
+FILE_DESCRIPTION((),'2;1');
+FILE_NAME('EPset_Annotation.ifc','2020-01-01T00:00:00',(),(),'EPset_Annotation','EPset_Annotation',$);
+FILE_SCHEMA(('IFC4'));
+ENDSEC;
+DATA;
+#1=IFCPROPERTYSETTEMPLATE('3VuPUwdCD2Qx3XDDRs0R1N',$,'EPset_Annotation','',.PSET_OCCURRENCEDRIVEN.,'IfcAnnotation',(#2,#3));
+#2=IFCSIMPLEPROPERTYTEMPLATE('2P7JN79n96Q9pElZ83LKe4',$,'ZIndex','',.P_SINGLEVALUE.,'IfcInteger',$,$,$,$,$,.READWRITE.);
+#3=IFCSIMPLEPROPERTYTEMPLATE('1Wpx_r2xj1_9w5JpI0QRJy',$,'Symbol','',.P_ENUMERATEDVALUE.,'IfcLabel',$,#4,$,$,$,.READWRITE.);
+#4=IFCPROPERTYENUMERATION('Symbol',(IFCLABEL('rectangle-tag'), IFCLABEL('door-tag')),$);
+ENDSEC;
+END-ISO-10303-21;

src/blenderbim/blenderbim/bim/data/pset/EPset_Drawing.ifc

@@ -5,28 +5,20 @@ 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/DRAWING',(#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));
 #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.);
+#3=IFCSIMPLEPROPERTYTEMPLATE('1yVWUt5H9DAOuu0OaMMLpe',$,'Scale','',.P_SINGLEVALUE.,'IfcLabel',$,$,$,$,$,.READWRITE.);
+#4=IFCSIMPLEPROPERTYTEMPLATE('3gsuPBtU93b8f0gg1pjkq6',$,'HumanScale','',.P_SINGLEVALUE.,'IfcLabel',$,$,$,$,$,.READWRITE.);
+#5=IFCSIMPLEPROPERTYTEMPLATE('0AK5C2UpL4$eaac2LszAx$',$,'HasUnderlay','',.P_SINGLEVALUE.,'IfcBoolean',$,$,$,$,$,.READWRITE.);
+#6=IFCSIMPLEPROPERTYTEMPLATE('2j2ZEZR8X5tONm7kli5hM6',$,'HasLinework','',.P_SINGLEVALUE.,'IfcBoolean',$,$,$,$,$,.READWRITE.);
+#7=IFCSIMPLEPROPERTYTEMPLATE('1ttChRysH9UuEX2FeMj5Hu',$,'HasAnnotation','',.P_SINGLEVALUE.,'IfcBoolean',$,$,$,$,$,.READWRITE.);
+#8=IFCSIMPLEPROPERTYTEMPLATE('2NPPxuABv1huDTVh32TFgw',$,'GlobalReferencing','',.P_SINGLEVALUE.,'IfcBoolean',$,$,$,$,$,.READWRITE.);
+#9=IFCSIMPLEPROPERTYTEMPLATE('10hT_1zrzEbRRKMXYAWvtD',$,'Metadata','',.P_SINGLEVALUE.,'IfcText',$,$,$,$,$,.READWRITE.);
+#10=IFCSIMPLEPROPERTYTEMPLATE('3Z0BXPSG5CWgtI33ioV7aj',$,'Include','',.P_SINGLEVALUE.,'IfcText',$,$,$,$,$,.READWRITE.);
+#11=IFCSIMPLEPROPERTYTEMPLATE('1RVts_g3PAw98PJA2yL3bO',$,'Exclude','',.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.);
 ENDSEC;
 END-ISO-10303-21;

src/blenderbim/blenderbim/bim/data/pset/EPset_Status.ifc

@@ -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;

src/blenderbim/blenderbim/bim/data/pset/EQto_BodyGeometryValidation.ifc

@@ -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;

src/blenderbim/blenderbim/bim/data/pset/Psets_BBIM_Annotation.ifc

@@ -1,38 +0,0 @@
-ISO-10303-21;
-HEADER;
-FILE_DESCRIPTION((),'2;1');
-FILE_NAME('Psets_BBIM_Annotation.ifc','2020-01-01T00:00:00',(),(),'Psets_BBIM_Annotation','Psets_BBIM_Annotation',$);
-FILE_SCHEMA(('IFC4'));
-ENDSEC;
-DATA;
-#1=IFCPROPERTYSETTEMPLATE('3VuPUwdCD2Qx3XDDRs0R1N',$,'EPset_Annotation','',.PSET_TYPEDRIVENOVERRIDE.,'IfcAnnotation,IfcTypeProduct',(#2,#3,#4));
-#2=IFCSIMPLEPROPERTYTEMPLATE('2P7JN79n96Q9pElZ83LKe4',$,'ZIndex','',.P_SINGLEVALUE.,'IfcInteger',$,$,$,$,$,.READWRITE.);
-#3=IFCSIMPLEPROPERTYTEMPLATE('1Wpx_r2xj1_9w5JpI0QRJy',$,'Symbol','',.P_SINGLEVALUE.,'IfcLabel',$,$,$,$,$,.READWRITE.);
-#4=IFCSIMPLEPROPERTYTEMPLATE('3q0oxMUKP47vZ4jnyG$dDb',$,'Classes','Classes separarated by spaces that end up in classes for this element in svg. Can be used to specify the text font size: small - 1.8mm; regular - 2.5mm; large - 3.5mm; header - 5mm; title - 7mm. By default regular size is used.',.P_SINGLEVALUE.,'IfcLabel',$,$,$,$,$,.READWRITE.);
-#5=IFCPROPERTYSETTEMPLATE('0iKwujnQL9IevVQato8f7Z',$,'BBIM_Batting','',.PSET_TYPEDRIVENOVERRIDE.,'IfcAnnotation/BATTING,IfcTypeProduct',(#6,#7));
-#6=IFCSIMPLEPROPERTYTEMPLATE('0t2LEesGT1QRQtrIZUAR8L',$,'Thickness','Batting thickness',.P_SINGLEVALUE.,'IfcPositiveLengthMeasure',$,$,$,$,$,.READWRITE.);
-#7=IFCSIMPLEPROPERTYTEMPLATE('082PndS6v2kBOiJoSboMnh',$,'Reverse pattern direction','Reverse batting pattern (swap starting and ending points)',.P_SINGLEVALUE.,'IfcBoolean',$,$,$,$,$,.READWRITE.);
-#8=IFCPROPERTYSETTEMPLATE('1Dx2EiZnP67xotInXpwz90',$,'BBIM_Section','',.PSET_TYPEDRIVENOVERRIDE.,'IfcAnnotation/SECTION,IfcTypeProduct',(#9,#10,#11,#12,#13));
-#9=IFCSIMPLEPROPERTYTEMPLATE('2a_9s8spHDc9dZHtgg71XL',$,'ShowStartArrow','Display start arrow.',.P_SINGLEVALUE.,'IfcBoolean',$,$,$,$,$,.READWRITE.);
-#10=IFCSIMPLEPROPERTYTEMPLATE('3i6SH_GbT7zhKea$wVE56A',$,'StartArrowSymbol','Custom symbol for the start of the section marker arrow. Need to make sure it''s present in "symbols.svg".',.P_SINGLEVALUE.,'IfcLabel',$,$,$,$,$,.READWRITE.);
-#11=IFCSIMPLEPROPERTYTEMPLATE('1DtsPn5a9FG8$zXHDDMavY',$,'ShowEndArrow','Display end arrow.',.P_SINGLEVALUE.,'IfcBoolean',$,$,$,$,$,.READWRITE.);
-#12=IFCSIMPLEPROPERTYTEMPLATE('2$6U0mLI9AiPRWeBabdY3u',$,'EndArrowSymbol','Custom symbol for the end of the section marker arrow. Need to make sure it''s present in "symbols.svg".',.P_SINGLEVALUE.,'IfcLabel',$,$,$,$,$,.READWRITE.);
-#13=IFCSIMPLEPROPERTYTEMPLATE('1naFqntIL7igCY7hCaE7kq',$,'HasConnectedSectionLine','Connect or disconnect section markers with line (by default = True).',.P_SINGLEVALUE.,'IfcBoolean',$,$,$,$,$,.READWRITE.);
-#14=IFCPROPERTYSETTEMPLATE('3V8oZ8YRD3_O7uR5vcUleS',$,'BBIM_Documentation','',.PSET_TYPEDRIVENOVERRIDE.,'IfcProject',(#15,#16,#17,#18,#19,#20,#21,#22,#23));
-#15=IFCSIMPLEPROPERTYTEMPLATE('0ulAhgk3v9qfGlDILauR6J',$,'SheetsDir','Default sheets directory',.P_SINGLEVALUE.,'IfcLabel',$,$,$,$,$,.READWRITE.);
-#16=IFCSIMPLEPROPERTYTEMPLATE('2yvlVKiQXASucfH40deCvu',$,'LayoutsDir','Default layouts directory',.P_SINGLEVALUE.,'IfcLabel',$,$,$,$,$,.READWRITE.);
-#17=IFCSIMPLEPROPERTYTEMPLATE('2kXZqXicL3jRwsOnLM_0ho',$,'TitleblocksDir','Default titleblocks directory',.P_SINGLEVALUE.,'IfcLabel',$,$,$,$,$,.READWRITE.);
-#18=IFCSIMPLEPROPERTYTEMPLATE('1lmOfo9Bf9beMBJkCZKf5Y',$,'DrawingsDir','Default drawings directory',.P_SINGLEVALUE.,'IfcLabel',$,$,$,$,$,.READWRITE.);
-#19=IFCSIMPLEPROPERTYTEMPLATE('30cOKpb4D9CADKM04$N9X3',$,'StylesheetPath','Default stylesheet CSS',.P_SINGLEVALUE.,'IfcLabel',$,$,$,$,$,.READWRITE.);
-#20=IFCSIMPLEPROPERTYTEMPLATE('23tejOrxj859R_eCRp1AFP',$,'MarkersPath','Default markers SVG',.P_SINGLEVALUE.,'IfcLabel',$,$,$,$,$,.READWRITE.);
-#21=IFCSIMPLEPROPERTYTEMPLATE('1UDakJ5_f7kBhggNSW4$h5',$,'SymbolsPath','Default symbols SVG',.P_SINGLEVALUE.,'IfcLabel',$,$,$,$,$,.READWRITE.);
-#22=IFCSIMPLEPROPERTYTEMPLATE('0d53LEtgLDQxnv__NfgH7i',$,'PatternsPath','Default patterns SVG',.P_SINGLEVALUE.,'IfcLabel',$,$,$,$,$,.READWRITE.);
-#23=IFCSIMPLEPROPERTYTEMPLATE('26qFNMv7nCHgU6Jd7Anga5',$,'ShadingStylesPath','Default shading styles',.P_SINGLEVALUE.,'IfcLabel',$,$,$,$,$,.READWRITE.);
-#24=IFCPROPERTYSETTEMPLATE('0I9merLinF5Ap$aZwaclgm',$,'BBIM_Dimension','',.PSET_TYPEDRIVENOVERRIDE.,'IfcAnnotation/DIMENSION,IfcTypeProduct',(#25,#26,#27,#28));
-#25=IFCSIMPLEPROPERTYTEMPLATE('1rL2AbQsXD8RbpoWH5pYOV',$,'ShowDescriptionOnly','Hide the measurement values and show only annotation description',.P_SINGLEVALUE.,'IfcBoolean',$,$,$,$,$,.READWRITE.);
-#26=IFCSIMPLEPROPERTYTEMPLATE('0SVyOfB0rC2xNfdRYf3XvY',$,'SuppressZeroInches','Suppress 0 inch values in dimension annotation text (for example: 12'' - 0" -> 12'')',.P_SINGLEVALUE.,'IfcBoolean',$,$,$,$,$,.READWRITE.);
-#27=IFCSIMPLEPROPERTYTEMPLATE('2bUmj458PBqPAtUoI3MXsb',$,'TextPrefix','Text to add before annotation measurement value',.P_SINGLEVALUE.,'IfcLabel',$,$,$,$,$,.READWRITE.);
-#28=IFCSIMPLEPROPERTYTEMPLATE('0bnzttUb9BPuN597uNTXOE',$,'TextSuffix','Text to add after annotation measurement value',.P_SINGLEVALUE.,'IfcLabel',$,$,$,$,$,.READWRITE.);
-
-ENDSEC;
-END-ISO-10303-21;

src/blenderbim/blenderbim/bim/data/pset/ePSet_Georeferencing.ifc

@@ -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;

src/blenderbim/blenderbim/bim/data/styles/default.css

@@ -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.
  *
@@ -19,20 +19,12 @@
  */
 
 * { stroke-linecap: round; stroke-linejoin: round; }
-text, tspan { /* 2.5mm */ fill: black; stroke: none; font-family: 'OpenGost Type B TT', 'DejaVu Sans Condensed', 'Liberation Sans', 'Arial Narrow', 'Arial'; font-size: 4.13px; }
+text { fill: black; stroke: none; }
 .cut { fill: black; stroke: black; stroke-linecap: 'round'; stroke-width: 0.35; fill-rule: evenodd; }
 .projection { fill: white; stroke: black; stroke-linecap: 'round'; stroke-width: 0.25; }
-.surface { stroke: none; fill: #fff; fill-rule: evenodd; }
 .annotation { fill: none; stroke: black; stroke-linecap: 'round'; stroke-width: 0.25; }
 .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; }
@@ -40,26 +32,18 @@ text, tspan { /* 2.5mm */ fill: black; stroke: none; font-family: 'OpenGost Type
 .PredefinedType-PLANLEVEL { marker-end: url(#plan-level-marker); }
 .PredefinedType-DIMENSION { marker-start: url(#dimension-marker-start); marker-end: url(#dimension-marker-end); }
 .PredefinedType-ANGLE { marker-start: url(#angle-marker-start); marker-end: url(#angle-marker-end); }
-.PredefinedType-RADIUS { marker-end: url(#fall-marker-end); }
-.PredefinedType-FALL { marker-end: url(#radius-marker-end); }
-.PredefinedType-SLOPEANGLE { marker-end: url(#radius-marker-end); }
-.PredefinedType-SLOPEPERCENT { marker-end: url(#radius-marker-end); }
-.PredefinedType-SLOPEFRACTION { marker-end: url(#radius-marker-end); }
+.PredefinedType-RADIUS { 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-BATTING { marker-start: url(#batting); stroke: none; }
 .PredefinedType-SEALANT { fill: url(#crosshatch1); stroke-width: 0.25; }
-.PredefinedType-FILLAREA { fill: white; stroke: black; }
+.PredefinedType-FILLAREA { fill: white; stroke: none; }
 .PredefinedType-BREAKLINE { fill: none; stroke: black; stroke-width: 0.25; marker-mid: url(#breakline-marker); }
 .PredefinedType-TEXT { fill: black; stroke: none; }
 path.PredefinedType-TEXTLEADER { marker-end: url(#leader-marker); }
-text.PredefinedType-TEXTLEADER, tspan.PredefinedType-TEXTLEADER { fill: black; stroke: none; }
-text.title, tspan.title { /* 7mm */ font-size: 11.55px; }
-text.header, tspan.header { /* 5mm */ font-size: 8.25px; }
-text.large, tspan.large { /* 3.5mm */ font-size: 5.78px; }
-text.regular, tspan.regular { /* 2.5mm */ font-size: 4.13px; }
-text.small, tspan.small { /* 1.8mm */ font-size: 2.97px; }
-text.GRID, tspan.GRID { /* 5mm */ font-size: 8.25px; }
+text.PredefinedType-TEXTLEADER { fill: black; stroke: none; }
 .material-blank { fill: white; }
 .material-diagonal1 { fill: url(#diagonal1); }
 .material-diagonal2 { fill: url(#diagonal2); }

src/blenderbim/blenderbim/bim/data/styles/sample.css

@@ -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.
  *

src/blenderbim/blenderbim/bim/data/templates/markers.svg

@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <svg baseProfile="full" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <marker id="batting" markerHeight="10" markerWidth="4" orient="auto" refX="0" refY="5" markerUnits="userSpaceOnUse">
         <!-- Tip: https://svg-path-visualizer.netlify.app/ -->
-        <!-- Tip: https://www.svgviewer.dev/ -->
+        <path style="fill: none; stroke:black; stroke-width:0.18" d="M 0 2 A 2 2 0 0 1 4 2 L 2 8 M 0 2 L 2 8 A 2 2 0 0 0 4 10 M 2 8 A 2 2 0 0 1 0 10" />
+    </marker>
     <marker id="eng-dimension-marker-start" markerHeight="14" markerWidth="11" orient="auto" refX="1" refY="7">
         <g>
             <path d="M 11 3.5 L 11 10.5 L 1 7" class="annotation" style="fill:black;" />
@@ -19,12 +21,6 @@
             <path d="M 0 3.5 L 0 10.5 L 10 7" class="annotation" style="fill:black;" />
         </g>
     </marker>
-    <!-- same as for the radius -->
-    <marker id="fall-marker-end" markerHeight="14" markerWidth="11" orient="auto" refX="10" refY="7">
-        <g>
-            <path d="M 0 3.5 L 0 10.5 L 10 7" class="annotation" style="fill:black;" />
-        </g>
-    </marker>
     <marker id="angle-marker-start" markerHeight="14" markerWidth="11" orient="auto" refX="1" refY="7">
         <g>
             <path d="M 11 3.5 L 11 10.5 L 1 7" class="annotation" style="fill:black;" />
@@ -75,7 +71,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 +80,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;" />
@@ -96,12 +92,4 @@
             <path d="M 7.5 10 L 10 0 L 15 10" class="annotation" style="stroke-width:1; fill: white;" />
         </g>
     </marker>
-    <filter x="0" y="0" width="1" height="1" id="fill-background">
-      <feFlood flood-color="white" result="bg" />
-      <feMerge>
-        <feMergeNode in="bg"/>
-        <feMergeNode in="SourceGraphic"/>
-      </feMerge>
-    </filter>
-
 </svg>

src/blenderbim/blenderbim/bim/data/templates/patterns.svg

@@ -17,49 +17,16 @@
     <line x1="0" y1="0" x2="0" y2="3" style="stroke:black; stroke-width:0.25" />
 </pattern>
 <pattern id="square1" width="1" height="1" patternUnits="userSpaceOnUse">
-    <path style="stroke: black; stroke-width: 0.25; fill: none;" d="M 0 0 1 0 1 1" />
+    <line x1="0" y1="0" x2="0" y2="1" style="stroke:black; stroke-width:0.25" />
+    <line x1="0" y1="0" x2="1" y2="0" style="stroke:black; stroke-width:0.25" />
 </pattern>
 <pattern id="square2" width="2" height="2" patternUnits="userSpaceOnUse">
-    <path style="stroke: black; stroke-width: 0.25; fill: none;" d="M 0 0 2 0 2 2" />
+    <line x1="0" y1="0" x2="0" y2="2" style="stroke:black; stroke-width:0.25" />
+    <line x1="0" y1="0" x2="2" y2="0" style="stroke:black; stroke-width:0.25" />
 </pattern>
 <pattern id="square3" width="3" height="3" patternUnits="userSpaceOnUse">
-    <path style="stroke: black; stroke-width: 0.25; fill: none;" d="M 0 0 3 0 3 3" />
-</pattern>
-<pattern id="recth1" width="2" height="1" patternUnits="userSpaceOnUse">
-    <path style="stroke: black; stroke-width: 0.25; fill: none;" d="M 0 0 2 0 2 1" />
-</pattern>
-<pattern id="recth2" width="4" height="2" patternUnits="userSpaceOnUse">
-    <path style="stroke: black; stroke-width: 0.25; fill: none;" d="M 0 0 4 0 4 2" />
-</pattern>
-<pattern id="recth3" width="6" height="3" patternUnits="userSpaceOnUse">
-    <path style="stroke: black; stroke-width: 0.25; fill: none;" d="M 0 0 6 0 6 3" />
-</pattern>
-<pattern id="rectv1" width="1" height="2" patternUnits="userSpaceOnUse">
-    <path style="stroke: black; stroke-width: 0.25; fill: none;" d="M 0 0 1 0 1 2" />
-</pattern>
-<pattern id="rectv2" width="2" height="4" patternUnits="userSpaceOnUse">
-    <path style="stroke: black; stroke-width: 0.25; fill: none;" d="M 0 0 2 0 2 4" />
-</pattern>
-<pattern id="rectv3" width="3" height="6" patternUnits="userSpaceOnUse">
-    <path style="stroke: black; stroke-width: 0.25; fill: none;" d="M 0 0 3 0 3 6" />
-</pattern>
-<pattern id="tile1" width="2" height="2" patternUnits="userSpaceOnUse">
-    <path style="stroke: black; stroke-width: 0.15; fill: none;" d="M 0 0 2 0 2 1 0 1 M 1 1 1 2" />
-</pattern>
-<pattern id="tile2" width="4" height="4" patternUnits="userSpaceOnUse">
-    <path style="stroke: black; stroke-width: 0.15; fill: none;" d="M 0 0 4 0 4 2 0 2 M 2 2 2 4" />
-</pattern>
-<pattern id="tile3" width="6" height="6" patternUnits="userSpaceOnUse">
-    <path style="stroke: black; stroke-width: 0.15; fill: none;" d="M 0 0 6 0 6 3 0 3 M 3 3 3 6" />
-</pattern>
-<pattern id="board1" width="4" height="2" patternUnits="userSpaceOnUse">
-    <path style="stroke: black; stroke-width: 0.15; fill: none;" d="M 0 0 4 0 4 1 0 1 M 2 1 2 2" />
-</pattern>
-<pattern id="board2" width="8" height="4" patternUnits="userSpaceOnUse">
-    <path style="stroke: black; stroke-width: 0.15; fill: none;" d="M 0 0 8 0 8 2 0 2 M 4 2 4 4" />
-</pattern>
-<pattern id="board3" width="12" height="6" patternUnits="userSpaceOnUse">
-    <path style="stroke: black; stroke-width: 0.15; fill: none;" d="M 0 0 12 0 12 3 0 3 M 6 3 6 6" />
+    <line x1="0" y1="0" x2="0" y2="3" style="stroke:black; stroke-width:0.25" />
+    <line x1="0" y1="0" x2="3" y2="0" style="stroke:black; stroke-width:0.25" />
 </pattern>
 <pattern id="crosshatch1" width="1" height="1" patternTransform="rotate(45 0 0)" patternUnits="userSpaceOnUse">
     <line x1="0" y1="0" x2="0" y2="1" style="stroke:black; stroke-width:0.25" />

src/blenderbim/blenderbim/bim/data/templates/symbols.svg

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<svg baseProfile="full" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <g id="rectangle-tag">
+        <rect x="-6" y="-2.5" width="12" height="5" fill="white" stroke="black" style="stroke-width: 0.25;" />
+    </g>
+    <g id="door-tag">
+        <circle cy="1.75" r="5" fill="white" stroke="black" style="stroke-width: 0.25;" />
+        <line x1="-5" y1="1.75" x2="5" y2="1.75" style="stroke: black; stroke-width: 0.25;" />
+    </g>
+    <g id="elevation-arrow">
+        <path style="fill: black;" d="M -7.07106 0 0 -7.07106 7.07106 0" />
+    </g>
+    <g id="elevation-tag">
+        <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="section-arrow">
+        <path style="fill: black;" d="M -7.07106 0 0 -7.07106 7.07106 0" />
+    </g>
+    <g id="section-tag">
+        <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>
+</svg>

src/blenderbim/blenderbim/bim/data/templates/titleblocks/A1.svg

@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
    viewBox="0 0 841 594"
    id="root"
    version="1.1"
    height="594mm"
-   width="841mm"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:dc="http://purl.org/dc/elements/1.1/">
+   width="841mm">
   <defs
      id="defs901" />
   <metadata
@@ -20,6 +20,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -43,10 +44,146 @@
        width="3027.1016"
        id="rect116616"
        style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:1.88976377;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <text
+       id="text116526"
+       y="909.15491"
+       x="113.70713"
+       style="font-style:normal;font-weight:normal;font-size:15.1536px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.94488188;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       xml:space="preserve"><tspan
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15.1536px;line-height:100%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:center;text-anchor:middle;stroke-width:0.94488188;stroke-miterlimit:4;stroke-dasharray:none"
+         y="909.15491"
+         x="113.70713"
+         id="tspan116524">REV. NO.</tspan></text>
     <path
        id="path116530"
        d="M 75.590564,895.24802 H 3102.9921"
        style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.94488188;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       id="path116532"
+       d="M 151.6811,895.24802 V 1046.9291"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.94488188;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.94488188;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 454.04331,895.24802 V 1046.9291"
+       id="path116534" />
+    <path
+       id="path116536"
+       d="M 529.63386,895.24802 V 1046.4302"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.94488188;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.94488188;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 605.22441,895.24802 V 1046.9291"
+       id="path116538" />
+    <path
+       id="path116540"
+       d="M 75.590564,914.14565 H 605.22441"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.94488188;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.94488188;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 75.590564,933.04329 H 605.22441"
+       id="path116542" />
+    <path
+       id="path116544"
+       d="M 75.590564,951.94093 H 605.22441"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.94488188;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.94488188;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 75.590564,970.83857 H 605.22441"
+       id="path116546" />
+    <path
+       id="path116548"
+       d="M 75.590564,989.73621 H 605.22441"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.94488188;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.94488188;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 75.590564,1008.6338 H 605.22441"
+       id="path116550" />
+    <path
+       id="path116552"
+       d="M 75.590564,1027.5315 H 605.22441"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.94488188;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       id="path116576"
+       d="M 2800.5,895.24802 V 1046.9291"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.94488188;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       id="path116578"
+       d="m 2800.5,1008.6338 h 302.4921"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.94488188;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       id="path116598"
+       d="m 3027.4027,1008.6338 v 38.2953"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.94488188;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:15.1536px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.94488188;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       x="302.86591"
+       y="909.15491"
+       id="text1395"><tspan
+         id="tspan1393"
+         x="302.86591"
+         y="909.15491"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15.1536px;line-height:100%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:center;text-anchor:middle;stroke-width:0.94488188;stroke-miterlimit:4;stroke-dasharray:none">DESCRIPTION</tspan></text>
+    <text
+       id="text1399"
+       y="909.15491"
+       x="491.97513"
+       style="font-style:normal;font-weight:normal;font-size:15.1536px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.94488188;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       xml:space="preserve"><tspan
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15.1536px;line-height:100%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:center;text-anchor:middle;stroke-width:0.94488188;stroke-miterlimit:4;stroke-dasharray:none"
+         y="909.15491"
+         x="491.97513"
+         id="tspan1397">AUTHOR</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:16.0591px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.94488188;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       x="568.05585"
+       y="909.15485"
+       id="text1403"><tspan
+         id="tspan1401"
+         x="568.05585"
+         y="909.15485"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16.0591px;line-height:100%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:center;text-anchor:middle;stroke-width:0.94488188;stroke-miterlimit:4;stroke-dasharray:none">DATE</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:11.2271px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.94488188;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       x="2839.5081"
+       y="1020.4988"
+       id="text1421"><tspan
+         id="tspan1419"
+         x="2839.5081"
+         y="1020.4988"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:11.2271px;line-height:100%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:center;text-anchor:middle;stroke-width:0.94488188;stroke-miterlimit:4;stroke-dasharray:none">DRAWING NUMBER</tspan></text>
+    <text
+       id="text1429"
+       y="1020.4988"
+       x="3038.5586"
+       style="font-style:normal;font-weight:normal;font-size:11.2271px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.94488188;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       xml:space="preserve"><tspan
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:11.2271px;line-height:100%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:center;text-anchor:middle;stroke-width:0.94488188;stroke-miterlimit:4;stroke-dasharray:none"
+         y="1020.4988"
+         x="3038.5586"
+         id="tspan1427">REV</tspan></text>
+    <text
+       id="text2529"
+       y="1036.1166"
+       x="3030.9653"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.3918px;line-height:125%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.999999px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       xml:space="preserve"><tspan
+         style="stroke-width:0.999999px"
+         y="1036.1166"
+         x="3030.9653"
+         id="tspan2527">{{Revision}}</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.3918px;line-height:125%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.999999px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="2804.7021"
+       y="1036.1166"
+       id="text2533"><tspan
+         id="tspan2531"
+         x="2804.7021"
+         y="1036.1166"
+         style="stroke-width:0.999999px">{{Identification}} - {{Name}}</tspan></text>
   </g>
   <g
      transform="matrix(0.26458333,0,0,0.26458334,-3.180917e-5,297.00003)"
@@ -68,260 +205,4 @@
      transform="matrix(0.26458333,0,0,0.26458334,-3.180917e-5,297.00003)"
      id="g90677"
      style="stroke-width:3.77953" />
-  <g
-     id="g38171"
-     transform="translate(411.014,286.96036)">
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 329.96563,246.86771 V 286.75"
-       id="path116576" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 329.96563,276.8677 H 410"
-       id="path116578" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 390.00031,276.8677 V 287"
-       id="path116598" />
-    <text
-       id="text1421"
-       y="280.00699"
-       x="340.28653"
-       style="font-style:normal;font-weight:normal;font-size:2.9705px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       xml:space="preserve"><tspan
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.9705px;line-height:100%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:center;text-anchor:middle;stroke-width:0.25;stroke-miterlimit:4;stroke-dasharray:none"
-         y="280.00699"
-         x="340.28653"
-         id="tspan1419">DRAWING NUMBER</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:3.05925px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.25747;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       x="393.00568"
-       y="280.0592"
-       id="text1429"><tspan
-         id="tspan1427"
-         x="393.00568"
-         y="280.0592"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.05925px;line-height:100%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:center;text-anchor:middle;stroke-width:0.25747;stroke-miterlimit:4;stroke-dasharray:none">REV</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.54325px;line-height:125%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       x="390.94287"
-       y="284.13919"
-       id="text2529"><tspan
-         id="tspan2527"
-         x="390.94287"
-         y="284.13919"
-         style="stroke-width:0.264583px">{{Revision}}</tspan></text>
-    <text
-       id="text2533"
-       y="284.13919"
-       x="331.07742"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.54325px;line-height:125%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.265;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       xml:space="preserve"><tspan
-         style="stroke-width:0.265;stroke-dasharray:none"
-         y="284.13919"
-         x="331.07742"
-         id="tspan2531">{{Identification}}</tspan></text>
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 329.96563,266.868 H 410"
-       id="path36736" />
-    <text
-       id="text36740"
-       y="270.05899"
-       x="339.00919"
-       style="font-style:normal;font-weight:normal;font-size:3.05925px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.25747;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       xml:space="preserve"><tspan
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.05925px;line-height:100%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:center;text-anchor:middle;stroke-width:0.25747;stroke-miterlimit:4;stroke-dasharray:none"
-         y="270.05899"
-         x="339.00919"
-         id="tspan36738">DRAWING TITLE</tspan></text>
-    <text
-       id="text36744"
-       y="275.05634"
-       x="330.99438"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.96055px;line-height:125%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.371;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       xml:space="preserve"><tspan
-         style="stroke-width:0.371;stroke-dasharray:none"
-         y="275.05634"
-         x="330.99438"
-         id="tspan36742">{{Name}}</tspan></text>
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 390.00031,246.86771 V 266.993"
-       id="path36746" />
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:2.88677px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.169851;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       x="397.04108"
-       y="249.72177"
-       id="text36677"><tspan
-         id="tspan36675"
-         x="397.04108"
-         y="249.72177"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.88677px;line-height:100%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:center;text-anchor:middle;stroke-width:0.169851;stroke-miterlimit:4;stroke-dasharray:none">GRID NORTH</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:2.88677px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.169851;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       x="338.77008"
-       y="249.72177"
-       id="text36752"><tspan
-         id="tspan36750"
-         x="335.76562"
-         y="249.72177"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.88677px;line-height:100%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:center;text-anchor:middle;stroke-width:0.169851;stroke-miterlimit:4;stroke-dasharray:none">COMPANY</tspan></text>
-    <g
-       id="g37148"
-       transform="translate(399.87519,258.25776)">
-      <g
-         id="g37140"
-         data-type="grid-north">
-        <path
-           id="path11652"
-           style="fill:none;stroke:#000000;stroke-width:0.25;stroke-linecap:round;stroke-dasharray:none"
-           d="M 0,0 V 7.12566 Z" />
-        <path
-           style="fill:none;stroke:#000000;stroke-width:0.25;stroke-linecap:round;stroke-dasharray:none"
-           d="M 7.3079,3e-5 H -7.30798"
-           id="path36547" />
-        <circle
-           style="fill:none;stroke:#000000;stroke-width:0.25;stroke-linecap:round;stroke-dasharray:none"
-           id="path36601"
-           cx="-3.8305665e-05"
-           cy="4.15625e-05"
-           r="5" />
-        <path
-           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.25;stroke-linecap:round;stroke-dasharray:none"
-           d="m -5.00004,4e-5 5,-5 5,5 H 3.94162 L -4e-5,-3.94162 -3.9417,4e-5 Z"
-           id="path36671" />
-        <path
-           style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-dasharray:none"
-           d="M -4e-5,-7.12545 V 3e-5"
-           id="path36673" />
-      </g>
-    </g>
-  </g>
-  <g
-     id="g38492"
-     transform="translate(9.7896584,287.21036)">
-    <text
-       id="text116526"
-       y="250.54721"
-       x="20.085007"
-       style="font-style:normal;font-weight:normal;font-size:4.00939px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       xml:space="preserve"><tspan
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.00939px;line-height:100%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:center;text-anchor:middle;stroke-width:0.25;stroke-miterlimit:4;stroke-dasharray:none"
-         y="250.54721"
-         x="20.085007"
-         id="tspan116524">REV. NO.</tspan></text>
-    <path
-       id="path116532"
-       d="M 30.132288,246.86771 V 287"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 110.13229,246.86771 V 287"
-       id="path116534" />
-    <path
-       id="path116536"
-       d="M 130.13229,246.86771 V 286.868"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 150.13229,246.86771 V 287"
-       id="path116538" />
-    <path
-       id="path116540"
-       d="M 10,251.86771 H 170.132"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 10,256.86771 H 170.132"
-       id="path116542" />
-    <path
-       id="path116544"
-       d="M 10,261.86771 H 170.132"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 10,266.86771 H 170.132"
-       id="path116546" />
-    <path
-       id="path116548"
-       d="M 10,271.86771 H 170.132"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 10,276.8677 H 170.132"
-       id="path116550" />
-    <path
-       id="path116552"
-       d="M 10,281.86772 H 170.132"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:4.00939px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       x="70.13327"
-       y="250.54721"
-       id="text1395"><tspan
-         id="tspan1393"
-         x="70.13327"
-         y="250.54721"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.00939px;line-height:100%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:center;text-anchor:middle;stroke-width:0.25;stroke-miterlimit:4;stroke-dasharray:none">DESCRIPTION</tspan></text>
-    <text
-       id="text1399"
-       y="250.54721"
-       x="120.16841"
-       style="font-style:normal;font-weight:normal;font-size:4.00939px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       xml:space="preserve"><tspan
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.00939px;line-height:100%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:center;text-anchor:middle;stroke-width:0.25;stroke-miterlimit:4;stroke-dasharray:none"
-         y="250.54721"
-         x="120.16841"
-         id="tspan1397">AUTHOR</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:4.24897px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       x="140.29811"
-       y="250.54721"
-       id="text1403"><tspan
-         id="tspan1401"
-         x="140.29811"
-         y="250.54721"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.24897px;line-height:100%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:center;text-anchor:middle;stroke-width:0.25;stroke-miterlimit:4;stroke-dasharray:none">ISSUED</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:4.24897px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       x="180.14232"
-       y="250.54721"
-       id="text36130"><tspan
-         id="tspan36128"
-         x="175.72011"
-         y="250.54721"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.24897px;line-height:100%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:center;text-anchor:middle;stroke-width:0.25;stroke-miterlimit:4;stroke-dasharray:none">NOTES</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:4.24897px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       x="194.37886"
-       y="255.5477"
-       id="text36768"><tspan
-         id="tspan36766"
-         x="189.95665"
-         y="255.5477"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.24897px;line-height:100%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:center;text-anchor:middle;stroke-width:0.25;stroke-miterlimit:4;stroke-dasharray:none">DO NOT SCALE DRAWINGS</tspan></text>
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 170.132,246.86771 V 287"
-       id="path36836" />
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:4.24897px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       x="160.29811"
-       y="250.54721"
-       id="text36842"><tspan
-         id="tspan36840"
-         x="160.29811"
-         y="250.54721"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.24897px;line-height:100%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:center;text-anchor:middle;stroke-width:0.25;stroke-miterlimit:4;stroke-dasharray:none">DATE</tspan></text>
-  </g>
 </svg>

src/blenderbim/blenderbim/bim/data/templates/titleblocks/A2.svg

@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
    width="594mm"
    height="420mm"
    version="1.1"
    id="root"
-   viewBox="0 0 594 420"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:dc="http://purl.org/dc/elements/1.1/">
+   viewBox="0 0 594 420">
   <defs
      id="defs901" />
   <metadata
@@ -20,6 +20,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -39,10 +40,146 @@
      width="553.5"
      id="rect116616"
      style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.499999;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <text
+     id="text116526"
+     y="363.54721"
+     x="30.085009"
+     style="font-style:normal;font-weight:normal;font-size:4.00939px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     xml:space="preserve"><tspan
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.00939px;line-height:100%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:center;text-anchor:middle;stroke-width:0.25;stroke-miterlimit:4;stroke-dasharray:none"
+       y="363.54721"
+       x="30.085009"
+       id="tspan116524">REV. NO.</tspan></text>
   <path
      id="path116530"
      d="m 20.000001,359.86771 553.749999,0"
      style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     id="path116532"
+     d="M 40.132289,359.86771 V 400"
+     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 120.13229,359.86771 V 400"
+     id="path116534" />
+  <path
+     id="path116536"
+     d="M 140.13229,359.86771 V 399.868"
+     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 160.13229,359.86771 V 400"
+     id="path116538" />
+  <path
+     id="path116540"
+     d="M 20.000001,364.86771 H 160.13229"
+     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 20.000001,369.86771 H 160.13229"
+     id="path116542" />
+  <path
+     id="path116544"
+     d="M 20.000001,374.86771 H 160.13229"
+     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 20.000001,379.86771 H 160.13229"
+     id="path116546" />
+  <path
+     id="path116548"
+     d="M 20.000001,384.86771 H 160.13229"
+     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 20.000001,389.8677 H 160.13229"
+     id="path116550" />
+  <path
+     id="path116552"
+     d="M 20.000001,394.86772 H 160.13229"
+     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <text
+     xml:space="preserve"
+     style="font-style:normal;font-weight:normal;font-size:4.00939px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     x="80.13327"
+     y="363.54721"
+     id="text1395"><tspan
+       id="tspan1393"
+       x="80.13327"
+       y="363.54721"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.00939px;line-height:100%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:center;text-anchor:middle;stroke-width:0.25;stroke-miterlimit:4;stroke-dasharray:none">DESCRIPTION</tspan></text>
+  <text
+     id="text1399"
+     y="363.54721"
+     x="130.16841"
+     style="font-style:normal;font-weight:normal;font-size:4.00939px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     xml:space="preserve"><tspan
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.00939px;line-height:100%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:center;text-anchor:middle;stroke-width:0.25;stroke-miterlimit:4;stroke-dasharray:none"
+       y="363.54721"
+       x="130.16841"
+       id="tspan1397">AUTHOR</tspan></text>
+  <text
+     xml:space="preserve"
+     style="font-style:normal;font-weight:normal;font-size:4.24897px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     x="150.29811"
+     y="363.54721"
+     id="text1403"><tspan
+       id="tspan1401"
+       x="150.29811"
+       y="363.54721"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.24897px;line-height:100%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:center;text-anchor:middle;stroke-width:0.25;stroke-miterlimit:4;stroke-dasharray:none">DATE</tspan></text>
+  <path
+     id="path116576"
+     d="M 493.96563,359.86771 V 400"
+     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     id="path116578"
+     d="M 493.96563,389.8677 H 574"
+     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     id="path116598"
+     d="M 554.00031,389.8677 V 400"
+     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <text
+     xml:space="preserve"
+     style="font-style:normal;font-weight:normal;font-size:2.9705px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     x="504.28653"
+     y="393.00699"
+     id="text1421"><tspan
+       id="tspan1419"
+       x="504.28653"
+       y="393.00699"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.9705px;line-height:100%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:center;text-anchor:middle;stroke-width:0.25;stroke-miterlimit:4;stroke-dasharray:none">DRAWING NUMBER</tspan></text>
+  <text
+     id="text1429"
+     y="393.00699"
+     x="556.9519"
+     style="font-style:normal;font-weight:normal;font-size:2.9705px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     xml:space="preserve"><tspan
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.9705px;line-height:100%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:center;text-anchor:middle;stroke-width:0.25;stroke-miterlimit:4;stroke-dasharray:none"
+       y="393.00699"
+       x="556.9519"
+       id="tspan1427">REV</tspan></text>
+  <text
+     id="text2529"
+     y="397.13919"
+     x="554.94287"
+     style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.54325px;line-height:125%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     xml:space="preserve"><tspan
+       style="stroke-width:0.264583px"
+       y="397.13919"
+       x="554.94287"
+       id="tspan2527">{{Revision}}</tspan></text>
+  <text
+     xml:space="preserve"
+     style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.54325px;line-height:125%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     x="495.07742"
+     y="397.13919"
+     id="text2533"><tspan
+       id="tspan2531"
+       x="495.07742"
+       y="397.13919"
+       style="stroke-width:0.264583px">{{Identification}} - {{Name}}</tspan></text>
   <g
      style="stroke-width:3.77953"
      id="g90669"
@@ -63,260 +200,4 @@
      style="stroke-width:3.77953"
      id="g90677"
      transform="matrix(0.26458333,0,0,0.26458334,-3.180917e-5,297.00003)" />
-  <g
-     id="g38171"
-     transform="translate(163.75769,113)">
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 329.96563,246.86771 V 286.75"
-       id="path116576" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 329.96563,276.8677 H 410"
-       id="path116578" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 390.00031,276.8677 V 287"
-       id="path116598" />
-    <text
-       id="text1421"
-       y="280.00699"
-       x="340.28653"
-       style="font-style:normal;font-weight:normal;font-size:2.9705px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       xml:space="preserve"><tspan
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.9705px;line-height:100%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:center;text-anchor:middle;stroke-width:0.25;stroke-miterlimit:4;stroke-dasharray:none"
-         y="280.00699"
-         x="340.28653"
-         id="tspan1419">DRAWING NUMBER</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:3.05925px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.25747;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       x="393.00568"
-       y="280.0592"
-       id="text1429"><tspan
-         id="tspan1427"
-         x="393.00568"
-         y="280.0592"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.05925px;line-height:100%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:center;text-anchor:middle;stroke-width:0.25747;stroke-miterlimit:4;stroke-dasharray:none">REV</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.54325px;line-height:125%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       x="390.94287"
-       y="284.13919"
-       id="text2529"><tspan
-         id="tspan2527"
-         x="390.94287"
-         y="284.13919"
-         style="stroke-width:0.264583px">{{Revision}}</tspan></text>
-    <text
-       id="text2533"
-       y="284.13919"
-       x="331.07742"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.54325px;line-height:125%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.265;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       xml:space="preserve"><tspan
-         style="stroke-width:0.265;stroke-dasharray:none"
-         y="284.13919"
-         x="331.07742"
-         id="tspan2531">{{Identification}}</tspan></text>
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 329.96563,266.868 H 410"
-       id="path36736" />
-    <text
-       id="text36740"
-       y="270.05899"
-       x="339.00919"
-       style="font-style:normal;font-weight:normal;font-size:3.05925px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.25747;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       xml:space="preserve"><tspan
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.05925px;line-height:100%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:center;text-anchor:middle;stroke-width:0.25747;stroke-miterlimit:4;stroke-dasharray:none"
-         y="270.05899"
-         x="339.00919"
-         id="tspan36738">DRAWING TITLE</tspan></text>
-    <text
-       id="text36744"
-       y="275.05634"
-       x="330.99438"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.96055px;line-height:125%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.371;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       xml:space="preserve"><tspan
-         style="stroke-width:0.371;stroke-dasharray:none"
-         y="275.05634"
-         x="330.99438"
-         id="tspan36742">{{Name}}</tspan></text>
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 390.00031,246.86771 V 266.993"
-       id="path36746" />
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:2.88677px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.169851;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       x="397.04108"
-       y="249.72177"
-       id="text36677"><tspan
-         id="tspan36675"
-         x="397.04108"
-         y="249.72177"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.88677px;line-height:100%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:center;text-anchor:middle;stroke-width:0.169851;stroke-miterlimit:4;stroke-dasharray:none">GRID NORTH</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:2.88677px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.169851;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       x="338.77008"
-       y="249.72177"
-       id="text36752"><tspan
-         id="tspan36750"
-         x="335.76562"
-         y="249.72177"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.88677px;line-height:100%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:center;text-anchor:middle;stroke-width:0.169851;stroke-miterlimit:4;stroke-dasharray:none">COMPANY</tspan></text>
-    <g
-       id="g37148"
-       transform="translate(399.87519,258.25776)">
-      <g
-         id="g37140"
-         data-type="grid-north">
-        <path
-           id="path11652"
-           style="fill:none;stroke:#000000;stroke-width:0.25;stroke-linecap:round;stroke-dasharray:none"
-           d="M 0,0 V 7.12566 Z" />
-        <path
-           style="fill:none;stroke:#000000;stroke-width:0.25;stroke-linecap:round;stroke-dasharray:none"
-           d="M 7.3079,3e-5 H -7.30798"
-           id="path36547" />
-        <circle
-           style="fill:none;stroke:#000000;stroke-width:0.25;stroke-linecap:round;stroke-dasharray:none"
-           id="path36601"
-           cx="-3.8305665e-05"
-           cy="4.15625e-05"
-           r="5" />
-        <path
-           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.25;stroke-linecap:round;stroke-dasharray:none"
-           d="m -5.00004,4e-5 5,-5 5,5 H 3.94162 L -4e-5,-3.94162 -3.9417,4e-5 Z"
-           id="path36671" />
-        <path
-           style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-dasharray:none"
-           d="M -4e-5,-7.12545 V 3e-5"
-           id="path36673" />
-      </g>
-    </g>
-  </g>
-  <g
-     id="g38492"
-     transform="translate(10.000001,113)">
-    <text
-       id="text116526"
-       y="250.54721"
-       x="20.085007"
-       style="font-style:normal;font-weight:normal;font-size:4.00939px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       xml:space="preserve"><tspan
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.00939px;line-height:100%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:center;text-anchor:middle;stroke-width:0.25;stroke-miterlimit:4;stroke-dasharray:none"
-         y="250.54721"
-         x="20.085007"
-         id="tspan116524">REV. NO.</tspan></text>
-    <path
-       id="path116532"
-       d="M 30.132288,246.86771 V 287"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 110.13229,246.86771 V 287"
-       id="path116534" />
-    <path
-       id="path116536"
-       d="M 130.13229,246.86771 V 286.868"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 150.13229,246.86771 V 287"
-       id="path116538" />
-    <path
-       id="path116540"
-       d="M 10,251.86771 H 170.132"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 10,256.86771 H 170.132"
-       id="path116542" />
-    <path
-       id="path116544"
-       d="M 10,261.86771 H 170.132"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 10,266.86771 H 170.132"
-       id="path116546" />
-    <path
-       id="path116548"
-       d="M 10,271.86771 H 170.132"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 10,276.8677 H 170.132"
-       id="path116550" />
-    <path
-       id="path116552"
-       d="M 10,281.86772 H 170.132"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:4.00939px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       x="70.13327"
-       y="250.54721"
-       id="text1395"><tspan
-         id="tspan1393"
-         x="70.13327"
-         y="250.54721"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.00939px;line-height:100%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:center;text-anchor:middle;stroke-width:0.25;stroke-miterlimit:4;stroke-dasharray:none">DESCRIPTION</tspan></text>
-    <text
-       id="text1399"
-       y="250.54721"
-       x="120.16841"
-       style="font-style:normal;font-weight:normal;font-size:4.00939px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       xml:space="preserve"><tspan
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.00939px;line-height:100%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:center;text-anchor:middle;stroke-width:0.25;stroke-miterlimit:4;stroke-dasharray:none"
-         y="250.54721"
-         x="120.16841"
-         id="tspan1397">AUTHOR</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:4.24897px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       x="140.29811"
-       y="250.54721"
-       id="text1403"><tspan
-         id="tspan1401"
-         x="140.29811"
-         y="250.54721"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.24897px;line-height:100%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:center;text-anchor:middle;stroke-width:0.25;stroke-miterlimit:4;stroke-dasharray:none">ISSUED</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:4.24897px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       x="180.14232"
-       y="250.54721"
-       id="text36130"><tspan
-         id="tspan36128"
-         x="175.72011"
-         y="250.54721"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.24897px;line-height:100%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:center;text-anchor:middle;stroke-width:0.25;stroke-miterlimit:4;stroke-dasharray:none">NOTES</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:4.24897px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       x="194.37886"
-       y="255.5477"
-       id="text36768"><tspan
-         id="tspan36766"
-         x="189.95665"
-         y="255.5477"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.24897px;line-height:100%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:center;text-anchor:middle;stroke-width:0.25;stroke-miterlimit:4;stroke-dasharray:none">DO NOT SCALE DRAWINGS</tspan></text>
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 170.132,246.86771 V 287"
-       id="path36836" />
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:4.24897px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       x="160.29811"
-       y="250.54721"
-       id="text36842"><tspan
-         id="tspan36840"
-         x="160.29811"
-         y="250.54721"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.24897px;line-height:100%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:center;text-anchor:middle;stroke-width:0.25;stroke-miterlimit:4;stroke-dasharray:none">DATE</tspan></text>
-  </g>
 </svg>

src/blenderbim/blenderbim/bim/data/templates/titleblocks/A3.svg

@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
    width="420mm"
    height="297mm"
    version="1.1"
    id="root"
-   viewBox="0 0 420 297"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:dc="http://purl.org/dc/elements/1.1/">
+   viewBox="0 0 420 297">
   <defs
      id="defs901" />
   <metadata
@@ -20,6 +20,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -39,10 +40,150 @@
      width="399.5"
      id="rect116616"
      style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.49999897;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <text
+     id="text116526"
+     y="250.54721"
+     x="20.085007"
+     style="font-style:normal;font-weight:normal;font-size:4.00939px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     xml:space="preserve"><tspan
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.00939px;line-height:100%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:center;text-anchor:middle;stroke-width:0.25;stroke-miterlimit:4;stroke-dasharray:none"
+       y="250.54721"
+       x="20.085007"
+       id="tspan116524">REV. NO.</tspan></text>
   <path
      id="path116530"
      d="m 10,246.86771 399.75,0"
      style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     id="path116532"
+     d="M 30.132288,246.86771 V 287"
+     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 110.13229,246.86771 V 287"
+     id="path116534" />
+  <path
+     id="path116536"
+     d="M 130.13229,246.86771 V 286.868"
+     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 150.13229,246.86771 V 287"
+     id="path116538" />
+  <path
+     id="path116540"
+     d="M 10,251.86771 H 150.13229"
+     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 10,256.86771 H 150.13229"
+     id="path116542" />
+  <path
+     id="path116544"
+     d="M 10,261.86771 H 150.13229"
+     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 10,266.86771 H 150.13229"
+     id="path116546" />
+  <path
+     id="path116548"
+     d="M 10,271.86771 H 150.13229"
+     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 10,276.8677 H 150.13229"
+     id="path116550" />
+  <path
+     id="path116552"
+     d="M 10,281.86772 H 150.13229"
+     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <text
+     xml:space="preserve"
+     style="font-style:normal;font-weight:normal;font-size:4.00939px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     x="70.13327"
+     y="250.54721"
+     id="text1395"><tspan
+       id="tspan1393"
+       x="70.13327"
+       y="250.54721"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.00939px;line-height:100%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:center;text-anchor:middle;stroke-width:0.25;stroke-miterlimit:4;stroke-dasharray:none">DESCRIPTION</tspan></text>
+  <text
+     id="text1399"
+     y="250.54721"
+     x="120.16841"
+     style="font-style:normal;font-weight:normal;font-size:4.00939px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     xml:space="preserve"><tspan
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.00939px;line-height:100%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:center;text-anchor:middle;stroke-width:0.25;stroke-miterlimit:4;stroke-dasharray:none"
+       y="250.54721"
+       x="120.16841"
+       id="tspan1397">AUTHOR</tspan></text>
+  <text
+     xml:space="preserve"
+     style="font-style:normal;font-weight:normal;font-size:4.24897px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     x="140.29811"
+     y="250.54721"
+     id="text1403"><tspan
+       id="tspan1401"
+       x="140.29811"
+       y="250.54721"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.24897px;line-height:100%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:center;text-anchor:middle;stroke-width:0.25;stroke-miterlimit:4;stroke-dasharray:none">DATE</tspan></text>
+  <g
+     transform="translate(-154)"
+     id="g3735">
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 483.96563,246.86771 V 287"
+       id="path116576" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 483.96563,276.8677 H 564"
+       id="path116578" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 544.00031,276.8677 V 287"
+       id="path116598" />
+    <text
+       id="text1421"
+       y="280.00699"
+       x="494.28653"
+       style="font-style:normal;font-weight:normal;font-size:2.9705px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       xml:space="preserve"><tspan
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.9705px;line-height:100%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:center;text-anchor:middle;stroke-width:0.25;stroke-miterlimit:4;stroke-dasharray:none"
+         y="280.00699"
+         x="494.28653"
+         id="tspan1419">DRAWING NUMBER</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:2.9705px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       x="546.9519"
+       y="280.00699"
+       id="text1429"><tspan
+         id="tspan1427"
+         x="546.9519"
+         y="280.00699"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.9705px;line-height:100%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:center;text-anchor:middle;stroke-width:0.25;stroke-miterlimit:4;stroke-dasharray:none">REV</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.54325px;line-height:125%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       x="544.94287"
+       y="284.13919"
+       id="text2529"><tspan
+         id="tspan2527"
+         x="544.94287"
+         y="284.13919"
+         style="stroke-width:0.264583px">{{Revision}}</tspan></text>
+    <text
+       id="text2533"
+       y="284.13919"
+       x="485.07742"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.54325px;line-height:125%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       xml:space="preserve"><tspan
+         style="stroke-width:0.264583px"
+         y="284.13919"
+         x="485.07742"
+         id="tspan2531">{{Identification}} - {{Name}}</tspan></text>
+  </g>
   <g
      style="stroke-width:3.77953"
      id="g90669"
@@ -63,271 +204,4 @@
      style="stroke-width:3.77953"
      id="g90677"
      transform="matrix(0.26458333,0,0,0.26458334,-3.180917e-5,297.00003)" />
-  <text
-     xml:space="preserve"
-     style="font-style:normal;font-weight:normal;font-size:4.24897px;line-height:100%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     x="162.3047"
-     y="256.66803"
-     id="text36756" />
-  <text
-     xml:space="preserve"
-     style="font-size:20.4013px;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT, Normal';text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.264999;stroke-linecap:round;stroke-dasharray:none"
-     x="161.2028"
-     y="266.93387"
-     id="text36760" />
-  <g
-     id="g38492">
-    <text
-       id="text116526"
-       y="250.54721"
-       x="20.085007"
-       style="font-style:normal;font-weight:normal;font-size:4.00939px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       xml:space="preserve"><tspan
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.00939px;line-height:100%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:center;text-anchor:middle;stroke-width:0.25;stroke-miterlimit:4;stroke-dasharray:none"
-         y="250.54721"
-         x="20.085007"
-         id="tspan116524">REV. NO.</tspan></text>
-    <path
-       id="path116532"
-       d="M 30.132288,246.86771 V 287"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 110.13229,246.86771 V 287"
-       id="path116534" />
-    <path
-       id="path116536"
-       d="M 130.13229,246.86771 V 286.868"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 150.13229,246.86771 V 287"
-       id="path116538" />
-    <path
-       id="path116540"
-       d="m 10,251.86771 160.132,0"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 10,256.86771 160.132,0"
-       id="path116542" />
-    <path
-       id="path116544"
-       d="m 10,261.86771 160.132,0"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 10,266.86771 160.132,0"
-       id="path116546" />
-    <path
-       id="path116548"
-       d="m 10,271.86771 160.132,0"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 10,276.8677 160.132,0"
-       id="path116550" />
-    <path
-       id="path116552"
-       d="m 10,281.86772 160.132,0"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:4.00939px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       x="70.13327"
-       y="250.54721"
-       id="text1395"><tspan
-         id="tspan1393"
-         x="70.13327"
-         y="250.54721"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.00939px;line-height:100%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:center;text-anchor:middle;stroke-width:0.25;stroke-miterlimit:4;stroke-dasharray:none">DESCRIPTION</tspan></text>
-    <text
-       id="text1399"
-       y="250.54721"
-       x="120.16841"
-       style="font-style:normal;font-weight:normal;font-size:4.00939px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       xml:space="preserve"><tspan
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.00939px;line-height:100%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:center;text-anchor:middle;stroke-width:0.25;stroke-miterlimit:4;stroke-dasharray:none"
-         y="250.54721"
-         x="120.16841"
-         id="tspan1397">AUTHOR</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:4.24897px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       x="140.29811"
-       y="250.54721"
-       id="text1403"><tspan
-         id="tspan1401"
-         x="140.29811"
-         y="250.54721"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.24897px;line-height:100%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:center;text-anchor:middle;stroke-width:0.25;stroke-miterlimit:4;stroke-dasharray:none">ISSUED</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:4.24897px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       x="180.14232"
-       y="250.54721"
-       id="text36130"><tspan
-         id="tspan36128"
-         x="175.72011"
-         y="250.54721"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.24897px;line-height:100%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:center;text-anchor:middle;stroke-width:0.25;stroke-miterlimit:4;stroke-dasharray:none">NOTES</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:4.24897px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       x="194.37886"
-       y="255.5477"
-       id="text36768"><tspan
-         id="tspan36766"
-         x="189.95665"
-         y="255.5477"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.24897px;line-height:100%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:center;text-anchor:middle;stroke-width:0.25;stroke-miterlimit:4;stroke-dasharray:none">DO NOT SCALE DRAWINGS</tspan></text>
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 170.132,246.86771 V 287"
-       id="path36836" />
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:4.24897px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       x="160.29811"
-       y="250.54721"
-       id="text36842"><tspan
-         id="tspan36840"
-         x="160.29811"
-         y="250.54721"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.24897px;line-height:100%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:center;text-anchor:middle;stroke-width:0.25;stroke-miterlimit:4;stroke-dasharray:none">DATE</tspan></text>
-  </g>
-  <g
-     id="g38171"
-     transform="translate(-0.25000095)">
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 329.96563,246.86771 V 286.75"
-       id="path116576" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 329.96563,276.8677 H 410"
-       id="path116578" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 390.00031,276.8677 V 287"
-       id="path116598" />
-    <text
-       id="text1421"
-       y="280.00699"
-       x="340.28653"
-       style="font-style:normal;font-weight:normal;font-size:2.9705px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       xml:space="preserve"><tspan
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.9705px;line-height:100%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:center;text-anchor:middle;stroke-width:0.25;stroke-miterlimit:4;stroke-dasharray:none"
-         y="280.00699"
-         x="340.28653"
-         id="tspan1419">DRAWING NUMBER</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:3.05925px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.25747;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       x="393.00568"
-       y="280.0592"
-       id="text1429"><tspan
-         id="tspan1427"
-         x="393.00568"
-         y="280.0592"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.05925px;line-height:100%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:center;text-anchor:middle;stroke-width:0.25747;stroke-miterlimit:4;stroke-dasharray:none">REV</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.54325px;line-height:125%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       x="390.94287"
-       y="284.13919"
-       id="text2529"><tspan
-         id="tspan2527"
-         x="390.94287"
-         y="284.13919"
-         style="stroke-width:0.264583px">{{Revision}}</tspan></text>
-    <text
-       id="text2533"
-       y="284.13919"
-       x="331.07742"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.54325px;line-height:125%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.265;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       xml:space="preserve"><tspan
-         style="stroke-width:0.265;stroke-dasharray:none"
-         y="284.13919"
-         x="331.07742"
-         id="tspan2531">{{Identification}}</tspan></text>
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 329.96563,266.868 H 410"
-       id="path36736" />
-    <text
-       id="text36740"
-       y="270.05899"
-       x="339.00919"
-       style="font-style:normal;font-weight:normal;font-size:3.05925px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.25747;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       xml:space="preserve"><tspan
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.05925px;line-height:100%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:center;text-anchor:middle;stroke-width:0.25747;stroke-miterlimit:4;stroke-dasharray:none"
-         y="270.05899"
-         x="339.00919"
-         id="tspan36738">DRAWING TITLE</tspan></text>
-    <text
-       id="text36744"
-       y="275.05634"
-       x="330.99438"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.96055px;line-height:125%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.371;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       xml:space="preserve"><tspan
-         style="stroke-width:0.371;stroke-dasharray:none"
-         y="275.05634"
-         x="330.99438"
-         id="tspan36742">{{Name}}</tspan></text>
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 390.00031,246.86771 V 266.993"
-       id="path36746" />
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:2.88677px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.169851;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       x="397.04108"
-       y="249.72177"
-       id="text36677"><tspan
-         id="tspan36675"
-         x="397.04108"
-         y="249.72177"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.88677px;line-height:100%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:center;text-anchor:middle;stroke-width:0.169851;stroke-miterlimit:4;stroke-dasharray:none">GRID NORTH</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:2.88677px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.169851;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       x="338.77008"
-       y="249.72177"
-       id="text36752"><tspan
-         id="tspan36750"
-         x="335.76562"
-         y="249.72177"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.88677px;line-height:100%;font-family:'OpenGost Type B TT';-inkscape-font-specification:'OpenGost Type B TT';text-align:center;text-anchor:middle;stroke-width:0.169851;stroke-miterlimit:4;stroke-dasharray:none">COMPANY</tspan></text>
-    <g
-       id="g37148"
-       transform="translate(399.87519,258.25776)">
-      <g
-         id="g37140"
-         data-type="grid-north">
-        <path
-           id="path11652"
-           style="fill:none;stroke:#000000;stroke-width:0.25;stroke-linecap:round;stroke-dasharray:none"
-           d="M 0,0 V 7.12566 Z" />
-        <path
-           style="fill:none;stroke:#000000;stroke-width:0.25;stroke-linecap:round;stroke-dasharray:none"
-           d="M 7.3079,3e-5 H -7.30798"
-           id="path36547" />
-        <circle
-           style="fill:none;stroke:#000000;stroke-width:0.25;stroke-linecap:round;stroke-dasharray:none"
-           id="path36601"
-           cx="-3.8305665e-05"
-           cy="4.15625e-05"
-           r="5" />
-        <path
-           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.25;stroke-linecap:round;stroke-dasharray:none"
-           d="m -5.00004,4e-5 5,-5 5,5 H 3.94162 L -4e-5,-3.94162 -3.9417,4e-5 Z"
-           id="path36671" />
-        <path
-           style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-dasharray:none"
-           d="M -4e-5,-7.12545 V 3e-5"
-           id="path36673" />
-      </g>
-    </g>
-  </g>
 </svg>

src/blenderbim/blenderbim/bim/data/ui/presets.py

@@ -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"],
+}

src/blenderbim/blenderbim/bim/data/window/typical/IfcWindowLiningProperties.csv

@@ -0,0 +1,2 @@
+Name,foo
+TransomThickness,500

src/blenderbim/blenderbim/bim/export_ifc.py

@@ -16,7 +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/>.
 
-from __future__ import annotations
 import os
 import bpy
 import json
@@ -28,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
@@ -36,8 +34,6 @@ import blenderbim.core.spatial
 import blenderbim.core.style
 from blenderbim.bim.ifc import IfcStore
 from mathutils import Vector
-from typing import Union
-from logging import Logger
 
 
 class IfcExporter:
@@ -48,8 +44,10 @@ 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_deletions()
+            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:
@@ -86,41 +84,49 @@ 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_deletions(self):
+        results = []
+        for ifc_definition_id in IfcStore.deleted_ids:
+            try:
+                product = self.file.by_id(ifc_definition_id)
+                if hasattr(product, "GlobalId"):
+                    results.append(product.GlobalId)
+            except:
+                continue
+            ifcopenshell.api.run("root.remove_product", self.file, **{"product": product})
+        IfcStore.deleted_ids.clear()
+        return results
+
+    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
             try:
                 if isinstance(obj, bpy.types.Material):
-                    if tool.Ifc.has_changed_shading(obj):
-                        blenderbim.core.style.update_style_colours(tool.Ifc, tool.Style, obj=obj)
+                    blenderbim.core.style.update_style_colours(tool.Ifc, tool.Style, obj=obj)
                 else:
                     element = tool.Ifc.get_entity(obj)
                     if element:
@@ -131,7 +137,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):
@@ -142,10 +148,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]:
-        element = self.file.by_id(obj.BIMObjectProperties.ifc_definition_id)
+    def sync_object_placement(self, obj):
         if not tool.Ifc.is_moved(obj):
             return
+        blender_matrix = np.array(obj.matrix_world)
+        element = self.file.by_id(obj.BIMObjectProperties.ifc_definition_id)
         if (obj.scale - Vector((1.0, 1.0, 1.0))).length > 1e-4:
             bpy.ops.bim.update_representation(obj=obj.name)
             return element
@@ -156,7 +163,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:
@@ -165,11 +172,11 @@ class IfcExporter:
                 bpy.ops.bim.update_representation(obj=obj.name)
         tool.Geometry.record_object_position(obj)
 
-    def get_application_name(self) -> str:
+    def get_application_name(self):
         return "BlenderBIM"
 
-    def get_application_version(self) -> str:
-        version = ".".join(
+    def get_application_version(self):
+        return ".".join(
             [
                 str(x)
                 for x in [
@@ -179,20 +186,15 @@ class IfcExporter:
                 ][0]
             ]
         )
-        if blenderbim.bim.last_commit_hash != "8888888":
-            version += f"-{blenderbim.bim.last_commit_hash[:7]}"
-        return version
 
 
 class IfcExportSettings:
     def __init__(self):
-        self.logger: Logger = None
-        self.output_file: str = None
-        self.json_version: str = None
-        self.json_compact: bool = None
+        self.logger = None
+        self.output_file = None
 
     @staticmethod
-    def factory(context: bpy.types.Context, output_file: str, logger: Logger) -> IfcExportSettings:
+    def factory(context, output_file, logger):
         settings = IfcExportSettings()
         settings.output_file = output_file
         settings.logger = logger

src/blenderbim/blenderbim/bim/handler.py

@@ -16,35 +16,49 @@
 # You should have received a copy of the GNU General Public License
 # along with BlenderBIM Add-on.  If not, see <http://www.gnu.org/licenses/>.
 
-import os
 import bpy
 import json
 import addon_utils
 import ifcopenshell.api.owner.settings
-import blenderbim.bim
 import blenderbim.tool as tool
 import blenderbim.core.owner as core_owner
+from blenderbim.bim.module.drawing.prop import RasterStyleProperty
 from bpy.app.handlers import persistent
 from blenderbim.bim.ifc import IfcStore
 from blenderbim.bim.module.owner.prop import get_user_person, get_user_organisation
 from blenderbim.bim.module.model.data import AuthoringData
-from blenderbim.bim.module.model.workspace import LIST_OF_TOOLS, TOOLS_TO_CLASSES_MAP
-from mathutils import Vector
-from math import cos, degrees
-from typing import Union
+from ifcopenshell.api.material.data import Data as MaterialData
+from ifcopenshell.api.type.data import Data as TypeData
 
 
-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:
+            IfcStore.edited_objs.add(obj)
+        elif IfcStore.get_file().by_id(obj.BIMObjectProperties.ifc_definition_id).is_a("IfcGridAxis"):
+            IfcStore.edited_objs.add(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:
@@ -53,118 +67,55 @@ def name_callback(obj, data):
     if isinstance(obj, bpy.types.Material):
         if obj.BIMObjectProperties.ifc_definition_id:
             IfcStore.get_file().by_id(obj.BIMObjectProperties.ifc_definition_id).Name = obj.name
+            MaterialData.load_materials()
         if obj.BIMMaterialProperties.ifc_style_id:
             IfcStore.get_file().by_id(obj.BIMMaterialProperties.ifc_style_id).Name = obj.name
         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
+    if element.is_a("IfcTypeProduct"):
+        TypeData.purge()
+    element.Name = "/".join(obj.name.split("/")[1:])
     refresh_ui_data()
 
 
 def color_callback(obj, data):
     if obj.BIMMaterialProperties.ifc_style_id:
-        tool.Ifc.edit(obj)
+        IfcStore.edited_objs.add(obj)
 
 
 def active_object_callback():
     refresh_ui_data()
-    update_bim_tool_props()
 
 
-def update_bim_tool_props():
-    """update BIM Tools props (such as extrusion_depth, length and x_angle) when active object changes"""
-    obj = bpy.context.active_object
-
-    # bunch of checks to see if we're in a valid state
-    if not obj:
-        return
-    mode = bpy.context.mode
-    current_tool = bpy.context.workspace.tools.from_space_view3d_mode(mode)
-    if not current_tool or current_tool.idname not in LIST_OF_TOOLS:
-        return
-    element = tool.Ifc.get_entity(obj)
-    if not element:
-        return
-    representation = ifcopenshell.util.representation.get_representation(element, "Model", "Body", "MODEL_VIEW")
-    if not representation:
-        return
-
-    props = bpy.context.scene.BIMModelProperties
-    if element.is_a("IfcElementType") or element.is_a("IfcElement"):
-        element_type = ifcopenshell.util.element.get_type(element)
-        if element_type:
-            is_bim_tool = current_tool.idname == "bim.bim_tool"
-            if is_bim_tool:
-                props.ifc_class = element_type.is_a()
-            if is_bim_tool or TOOLS_TO_CLASSES_MAP.get(current_tool.idname) == element_type.is_a():
-                props.relating_type_id = str(element_type.id())
-    extrusion = tool.Model.get_extrusion(representation)
-    if not extrusion:
-        return
-
-    def get_x_angle(extrusion):
-        x, y, z = extrusion.ExtrudedDirection.DirectionRatios
-        x_angle = Vector((0, 1)).angle_signed(Vector((y, z)))
-        return x_angle
-
-    si_conversion = ifcopenshell.util.unit.calculate_unit_scale(tool.Ifc.get())
-    if not AuthoringData.is_loaded:
-        AuthoringData.load()
-
-    if AuthoringData.data["active_material_usage"] == "LAYER2":
-        x_angle = get_x_angle(extrusion)
-        axis = tool.Model.get_wall_axis(obj)["reference"]
-        props.extrusion_depth = extrusion.Depth * si_conversion * cos(x_angle)
-        props.length = (axis[1] - axis[0]).length
-        props.x_angle = x_angle
-
-    elif AuthoringData.data["active_material_usage"] == "LAYER3":
-        x_angle = get_x_angle(extrusion)
-        props.x_angle = x_angle
-
-    elif AuthoringData.data["active_material_usage"] == "PROFILE":
-        props.extrusion_depth = extrusion.Depth * si_conversion
-
-
-def active_material_index_callback(obj, data):
-    refresh_ui_data()
-
-
-def subscribe_to(obj, data_path, callback):
+def subscribe_to(object, data_path, callback):
     try:
-        subscribe_to = obj.path_resolve(data_path, False)
+        subscribe_to = object.path_resolve(data_path, False)
     except:
         return
     bpy.msgbus.subscribe_rna(
         key=subscribe_to,
-        owner=obj,
+        owner=object,
         args=(
-            obj,
+            object,
             data_path,
         ),
         notify=callback,
@@ -183,47 +134,70 @@ 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()
 
 
-def get_application(ifc: ifcopenshell.file) -> ifcopenshell.entity_instance:
+@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):
     # TODO: cache this for even faster application retrieval. It honestly makes a difference on long scripts.
     version = get_application_version()
     for element in ifc.by_type("IfcApplication"):
@@ -238,20 +212,7 @@ def get_application(ifc: ifcopenshell.file) -> ifcopenshell.entity_instance:
     )
 
 
-def get_user(ifc: ifcopenshell.file) -> Union[ifcopenshell.entity_instance, None]:
-    # TODO: cache this for even faster application retrieval. It honestly makes a difference on long scripts.
-    if pao := next(iter(ifc.by_type("IfcPersonAndOrganization")), None):
-        return pao
-    elif ifc.schema == "IFC2X3":
-        if (person := next(iter(ifc.by_type("IfcPerson")), None)) is None:
-            person = tool.Ifc.run("owner.add_person")
-        if (organization := next(iter(ifc.by_type("IfcOrganization")), None)) is None:
-            organization = tool.Ifc.run("owner.add_organisation")
-        pao = tool.Ifc.run("owner.add_person_and_organisation", person=person, organisation=organization)
-        return pao
-
-
-def get_application_version() -> str:
+def get_application_version():
     return ".".join(
         [
             str(x)
@@ -264,52 +225,81 @@ def get_application_version() -> str:
     )
 
 
-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 = get_user
+    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()
+    # TODO: Move to drawing module
+    if len(bpy.context.scene.DocProperties.drawing_styles) == 0:
+        drawing_style = bpy.context.scene.DocProperties.drawing_styles.add()
+        drawing_style.name = "Technical"
+        drawing_style.render_type = "VIEWPORT"
+        drawing_style.raster_style = json.dumps(
+            {
+                RasterStyleProperty.WORLD_COLOR.value: (1, 1, 1),
+                RasterStyleProperty.RENDER_ENGINE.value: "BLENDER_WORKBENCH",
+                RasterStyleProperty.RENDER_TRANSPARENT.value: False,
+                RasterStyleProperty.SHADING_SHOW_OBJECT_OUTLINE.value: True,
+                RasterStyleProperty.SHADING_SHOW_CAVITY.value: False,
+                RasterStyleProperty.SHADING_CAVITY_TYPE.value: "BOTH",
+                RasterStyleProperty.SHADING_CURVATURE_RIDGE_FACTOR.value: 1,
+                RasterStyleProperty.SHADING_CURVATURE_VALLEY_FACTOR.value: 1,
+                RasterStyleProperty.VIEW_TRANSFORM.value: "Standard",
+                RasterStyleProperty.SHADING_LIGHT.value: "FLAT",
+                RasterStyleProperty.SHADING_COLOR_TYPE.value: "SINGLE",
+                RasterStyleProperty.SHADING_SINGLE_COLOR.value: (1, 1, 1),
+                RasterStyleProperty.SHADING_SHOW_SHADOWS.value: False,
+                RasterStyleProperty.SHADING_SHADOW_INTENSITY.value: 0.5,
+                RasterStyleProperty.DISPLAY_LIGHT_DIRECTION.value: (0.5, 0.5, 0.5),
+                RasterStyleProperty.VIEW_USE_CURVE_MAPPING.value: False,
+                RasterStyleProperty.OVERLAY_SHOW_WIREFRAMES.value: True,
+                RasterStyleProperty.OVERLAY_WIREFRAME_THRESHOLD.value: 0,
+                RasterStyleProperty.OVERLAY_SHOW_FLOOR.value: False,
+                RasterStyleProperty.OVERLAY_SHOW_AXIS_X.value: False,
+                RasterStyleProperty.OVERLAY_SHOW_AXIS_Y.value: False,
+                RasterStyleProperty.OVERLAY_SHOW_AXIS_Z.value: False,
+                RasterStyleProperty.OVERLAY_SHOW_OBJECT_ORIGINS.value: False,
+                RasterStyleProperty.OVERLAY_SHOW_RELATIONSHIP_LINES.value: False,
+            }
+        )
+        drawing_style = bpy.context.scene.DocProperties.drawing_styles.add()
+        drawing_style.name = "Shaded"
+        drawing_style.render_type = "VIEWPORT"
+        drawing_style.raster_style = json.dumps(
+            {
+                RasterStyleProperty.WORLD_COLOR.value: (1, 1, 1),
+                RasterStyleProperty.RENDER_ENGINE.value: "BLENDER_WORKBENCH",
+                RasterStyleProperty.RENDER_TRANSPARENT.value: False,
+                RasterStyleProperty.SHADING_SHOW_OBJECT_OUTLINE.value: True,
+                RasterStyleProperty.SHADING_SHOW_CAVITY.value: True,
+                RasterStyleProperty.SHADING_CAVITY_TYPE.value: "BOTH",
+                RasterStyleProperty.SHADING_CURVATURE_RIDGE_FACTOR.value: 1,
+                RasterStyleProperty.SHADING_CURVATURE_VALLEY_FACTOR.value: 1,
+                RasterStyleProperty.VIEW_TRANSFORM.value: "Standard",
+                RasterStyleProperty.SHADING_LIGHT.value: "STUDIO",
+                RasterStyleProperty.SHADING_COLOR_TYPE.value: "MATERIAL",
+                RasterStyleProperty.SHADING_SINGLE_COLOR.value: (1, 1, 1),
+                RasterStyleProperty.SHADING_SHOW_SHADOWS.value: True,
+                RasterStyleProperty.SHADING_SHADOW_INTENSITY.value: 0.5,
+                RasterStyleProperty.DISPLAY_LIGHT_DIRECTION.value: (0.5, 0.5, 0.5),
+                RasterStyleProperty.VIEW_USE_CURVE_MAPPING.value: False,
+                RasterStyleProperty.OVERLAY_SHOW_WIREFRAMES.value: False,
+                RasterStyleProperty.OVERLAY_WIREFRAME_THRESHOLD.value: 0,
+                RasterStyleProperty.OVERLAY_SHOW_FLOOR.value: False,
+                RasterStyleProperty.OVERLAY_SHOW_AXIS_X.value: False,
+                RasterStyleProperty.OVERLAY_SHOW_AXIS_Y.value: False,
+                RasterStyleProperty.OVERLAY_SHOW_AXIS_Z.value: False,
+                RasterStyleProperty.OVERLAY_SHOW_OBJECT_ORIGINS.value: False,
+                RasterStyleProperty.OVERLAY_SHOW_RELATIONSHIP_LINES.value: False,
+            }
+        )
+        drawing_style = bpy.context.scene.DocProperties.drawing_styles.add()
+        drawing_style.name = "Blender Default"
+        drawing_style.render_type = "DEFAULT"
+        bpy.ops.bim.save_drawing_style(index="2")
+        AuthoringData.type_thumbnails = {}