IfcParse: don't let a malformed binary token abort the parser

dispatch_token's Token_BINARY branch called TokenFunc::asBinary() unguarded. A fuzzed file with a stray double-quote inside a numeric list turns the next token into a 1-character Token_BINARY (e.g. a lone '"'), which asBinary() rejects by throwing IfcException("Token is not a valid binary sequence"). Nothing caught it, so it propagated out of parse_context::construct and aborted the process instead of producing a validation error. Wrap the call in the same try/catch pattern already used a few lines below for Token_ENUMERATION, logging a VAL error instead of crashing.
2026-08-08 00:41:36 +00:00 · 2026-07-16 22:41:03 +01:00
292 changed files with 1141 additions and 12865 deletions
@@ -21,12 +21,12 @@ jobs:

    steps:
      - name: Checkout Repository
-        uses: actions/checkout@v7
+        uses: actions/checkout@v6
        with:
          submodules: recursive

      - name: Checkout Build Repository
-        uses: actions/checkout@v7
+        uses: actions/checkout@v6
        with:
          repository: IfcOpenShell/build-outputs
          path: ./build
@@ -9,13 +9,13 @@ jobs:

    steps:
      - name: Checkout Repository
-        uses: actions/checkout@v7
+        uses: actions/checkout@v6
        with:
          submodules: recursive
          path: IfcOpenShell

      - name: Checkout Build Repository
-        uses: actions/checkout@v7
+        uses: actions/checkout@v6
        with:
          repository: IfcOpenShell/build-outputs
          path: ifcopenshell_build
@@ -35,12 +35,12 @@ jobs:
          aws --version

      - name: Checkout Repository
-        uses: actions/checkout@v7
+        uses: actions/checkout@v6
        with:
          submodules: recursive

      - name: Checkout Build Repository
-        uses: actions/checkout@v7
+        uses: actions/checkout@v6
        with:
          repository: IfcOpenShell/build-outputs
          path: ./build
@@ -35,12 +35,12 @@ jobs:
          aws --version

      - name: Checkout Repository
-        uses: actions/checkout@v7
+        uses: actions/checkout@v6
        with:
          submodules: recursive

      - name: Checkout Build Repository
-        uses: actions/checkout@v7
+        uses: actions/checkout@v6
        with:
          repository: IfcOpenShell/build-outputs
          path: ./build
@@ -27,12 +27,12 @@ jobs:

    steps:
      - name: Checkout Repository
-        uses: actions/checkout@v7
+        uses: actions/checkout@v6
        with:
          submodules: recursive

      - name: Checkout Build Repository
-        uses: actions/checkout@v7
+        uses: actions/checkout@v6
        with:
          repository: IfcOpenShell/build-outputs
          path: ${{ matrix.deps_dir }}
@@ -19,8 +19,8 @@ jobs:
    strategy:
      fail-fast: false
    steps:
-      - uses: actions/checkout@v7 # https://github.com/actions/checkout
-      - uses: actions/setup-python@v7 # https://github.com/actions/setup-python
+      - uses: actions/checkout@v6 # https://github.com/actions/checkout
+      - uses: actions/setup-python@v6 # 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
          architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified
@@ -34,7 +34,7 @@ jobs:
    strategy:
      fail-fast: false
    steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v6
        with:
          fetch-tags: true
          fetch-depth: 0
@@ -65,8 +65,8 @@ jobs:
            config:
              short_name: macos
    steps:
-      - uses: actions/checkout@v7
-      - uses: actions/setup-python@v7 # https://github.com/actions/setup-python
+      - uses: actions/checkout@v6
+      - uses: actions/setup-python@v6 # https://github.com/actions/setup-python
        with:
          architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified
          python-version: '3.11'
@@ -98,7 +98,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout bonsai_unstable_repo repository
-        uses: actions/checkout@v7
+        uses: actions/checkout@v6
        with:
          repository: IfcOpenShell/bonsai_unstable_repo
          token: ${{ secrets.IFCOPENBOT_TOKEN }}
@@ -48,8 +48,8 @@ jobs:
            config:
              short_name: macos
    steps:
-      - uses: actions/checkout@v7
-      - uses: actions/setup-python@v7 # https://github.com/actions/setup-python
+      - uses: actions/checkout@v6
+      - uses: actions/setup-python@v6 # https://github.com/actions/setup-python
        with:
          architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified
          python-version: '3.11'
@@ -18,8 +18,8 @@ jobs:
    strategy:
      fail-fast: false
    steps:
-      - uses: actions/checkout@v7
-      - uses: actions/setup-python@v7 # https://github.com/actions/setup-python
+      - uses: actions/checkout@v6
+      - uses: actions/setup-python@v6 # 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
@@ -18,8 +18,8 @@ jobs:
    strategy:
      fail-fast: false
    steps:
-      - uses: actions/checkout@v7
-      - uses: actions/setup-python@v7 # https://github.com/actions/setup-python
+      - uses: actions/checkout@v6
+      - uses: actions/setup-python@v6 # 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
@@ -18,8 +18,8 @@ jobs:
    strategy:
      fail-fast: false
    steps:
-      - uses: actions/checkout@v7
-      - uses: actions/setup-python@v7 # https://github.com/actions/setup-python
+      - uses: actions/checkout@v6
+      - uses: actions/setup-python@v6 # 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
@@ -18,8 +18,8 @@ jobs:
    strategy:
      fail-fast: false
    steps:
-      - uses: actions/checkout@v7
-      - uses: actions/setup-python@v7 # https://github.com/actions/setup-python
+      - uses: actions/checkout@v6
+      - uses: actions/setup-python@v6 # 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
@@ -18,8 +18,8 @@ jobs:
    strategy:
      fail-fast: false
    steps:
-      - uses: actions/checkout@v7
-      - uses: actions/setup-python@v7 # https://github.com/actions/setup-python
+      - uses: actions/checkout@v6
+      - uses: actions/setup-python@v6 # 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
@@ -37,8 +37,8 @@ jobs:
            short_name: macosm164
          }
    steps:
-      - uses: actions/checkout@v7
-      - uses: actions/setup-python@v7 # https://github.com/actions/setup-python
+      - uses: actions/checkout@v6
+      - uses: actions/setup-python@v6 # 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
          architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified
@@ -18,8 +18,8 @@ jobs:
    strategy:
      fail-fast: false
    steps:
-      - uses: actions/checkout@v7
-      - uses: actions/setup-python@v7 # https://github.com/actions/setup-python
+      - uses: actions/checkout@v6
+      - uses: actions/setup-python@v6 # 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
@@ -18,8 +18,8 @@ jobs:
    strategy:
      fail-fast: false
    steps:
-      - uses: actions/checkout@v7
-      - uses: actions/setup-python@v7 # https://github.com/actions/setup-python
+      - uses: actions/checkout@v6
+      - uses: actions/setup-python@v6 # 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
@@ -18,8 +18,8 @@ jobs:
    strategy:
      fail-fast: false
    steps:
-      - uses: actions/checkout@v7
-      - uses: actions/setup-python@v7
+      - uses: actions/checkout@v6
+      - uses: actions/setup-python@v6
        with:
          python-version: '3.11'
      - name: Compile
@@ -18,8 +18,8 @@ jobs:
    strategy:
      fail-fast: false
    steps:
-      - uses: actions/checkout@v7
-      - uses: actions/setup-python@v7 # https://github.com/actions/setup-python
+      - uses: actions/checkout@v6
+      - uses: actions/setup-python@v6 # 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
@@ -18,8 +18,8 @@ jobs:
    strategy:
      fail-fast: false
    steps:
-      - uses: actions/checkout@v7
-      - uses: actions/setup-python@v7
+      - uses: actions/checkout@v6
+      - uses: actions/setup-python@v6
        with:
          python-version: '3.11'
      - name: Compile
@@ -21,7 +21,7 @@ jobs:
      date: ${{ steps.date.outputs.date }}
      verdate: ${{ steps.verdate.outputs.verdate }}
    steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v6
      - name: Set env
        run: echo ok go
      
@@ -75,7 +75,7 @@ jobs:
            echo "ARTIFACTS_DIR=/home/runner/work/artifacts" >> $GITHUB_ENV
          fi
      
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v6
        with:
          submodules: recursive

@@ -21,7 +21,7 @@ jobs:
    runs-on: ubuntu-22.04
    needs: activate
    steps:
-    - uses: actions/checkout@v7
+    - uses: actions/checkout@v6
      with:
        submodules: recursive

@@ -86,7 +86,7 @@ jobs:
    name: Docker Build, Tag, Push

    steps:
-    - uses: actions/checkout@v7
+    - uses: actions/checkout@v6
      with:
        lfs: true
    
@@ -47,10 +47,10 @@ jobs:
            short_name: macosm164
          }
    steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v6
        with:
          submodules: recursive
-      - uses: actions/setup-python@v7 # https://github.com/actions/setup-python
+      - uses: actions/setup-python@v6 # 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
          architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified
@@ -38,10 +38,10 @@ jobs:
            short_name: macosm164
          }
    steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v6
        with:
          submodules: recursive
-      - uses: actions/setup-python@v7 # https://github.com/actions/setup-python
+      - uses: actions/setup-python@v6 # 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
          architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified
@@ -18,8 +18,8 @@ jobs:
    strategy:
      fail-fast: false
    steps:
-      - uses: actions/checkout@v7
-      - uses: actions/setup-python@v7 # https://github.com/actions/setup-python
+      - uses: actions/checkout@v6
+      - uses: actions/setup-python@v6 # 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
@@ -18,8 +18,8 @@ jobs:
    strategy:
      fail-fast: false
    steps:
-      - uses: actions/checkout@v7
-      - uses: actions/setup-python@v7
+      - uses: actions/checkout@v6
+      - uses: actions/setup-python@v6
        with:
          python-version: '3.11'
      - name: Compile
@@ -25,8 +25,8 @@ jobs:
    strategy:
      fail-fast: false
    steps:
-      - uses: actions/checkout@v7
-      - uses: actions/setup-python@v7 # https://github.com/actions/setup-python
+      - uses: actions/checkout@v6
+      - uses: actions/setup-python@v6 # https://github.com/actions/setup-python
        with:
          architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified
          python-version: '3.11'
@@ -19,8 +19,8 @@ jobs:
    strategy:
      fail-fast: false
    steps:
-      - uses: actions/checkout@v7
-      - uses: actions/setup-python@v7 # https://github.com/actions/setup-python
+      - uses: actions/checkout@v6
+      - uses: actions/setup-python@v6 # https://github.com/actions/setup-python
        with:
          architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified
          python-version: '3.11'
@@ -10,9 +10,9 @@ jobs:
  publish_website:
    runs-on: ubuntu-22.04
    steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v6
      - name: Checkout ifctester_org_static_html
-        uses: actions/checkout@v7
+        uses: actions/checkout@v6
        with:
          repository: IfcOpenShell/ifctester_org_static_html
          token: ${{ secrets.IFCOPENBOT_TOKEN }}
@@ -18,8 +18,8 @@ jobs:
    strategy:
      fail-fast: false
    steps:
-      - uses: actions/checkout@v7
-      - uses: actions/setup-python@v7 # https://github.com/actions/setup-python
+      - uses: actions/checkout@v6
+      - uses: actions/setup-python@v6 # 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
@@ -34,7 +34,7 @@ jobs:
    runs-on: ubuntu-22.04

    steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v6
        with:
          submodules: recursive

@@ -85,7 +85,7 @@ jobs:
          cmake --build build-ifcopenshell --target install -j "$(nproc)"

      - name: Set up Python 3.11
-        uses: actions/setup-python@v7
+        uses: actions/setup-python@v6
        with:
          python-version: 3.11

@@ -120,7 +120,7 @@ jobs:
          PY

      - name: Set up Python 3.12
-        uses: actions/setup-python@v7
+        uses: actions/setup-python@v6
        with:
          python-version: 3.12

@@ -12,15 +12,15 @@ jobs:
      MIN_BLENDER_PY_VERSION: "3.11"
    steps:
      - name: Action - checkout repository
-        uses: actions/checkout@v7
+        uses: actions/checkout@v6

      - name: Action - install python
-        uses: actions/setup-python@v7
+        uses: actions/setup-python@v6
        with:
          python-version: ${{ env.MIN_IOS_PY_VERSION }}

      - name: Action - install python
-        uses: actions/setup-python@v7
+        uses: actions/setup-python@v6
        with:
          python-version: ${{ env.MIN_BLENDER_PY_VERSION }}

@@ -8,7 +8,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout IfcOpenShell
-        uses: actions/checkout@v7
+        uses: actions/checkout@v6

      - name: Install uv
        uses: astral-sh/setup-uv@v7
@@ -25,7 +25,7 @@ jobs:
          echo "name=$(basename $WHEEL)" >> $GITHUB_OUTPUT

      - name: Checkout wasm-wheels
-        uses: actions/checkout@v7
+        uses: actions/checkout@v6
        with:
          repository: IfcOpenShell/wasm-wheels
          path: wasm-wheels
@@ -43,12 +43,12 @@ jobs:
      CLICOLOR_FORCE: "1"
      CMAKE_COLOR_DIAGNOSTICS: "ON"
    steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v6
        with:
            submodules: recursive

      - name: Set up Python
-        uses: actions/setup-python@v7
+        uses: actions/setup-python@v6
        with:
          python-version: 3.11

@@ -257,15 +257,13 @@ jobs:
          cd ../ifcdiff && make test || ERROR=1
          cd ../ifcpatch && make test || ERROR=1
          pip install -e ../ifc5d --no-deps
-          pip install odfpy openpyxl
+          pip install odfpy xlsxwriter
          cd ../ifc5d && make test || ERROR=1
          pip install -e ../ifcquery --no-deps
          cd ../ifcquery && make test || ERROR=1
          pip install -e ../ifcedit --no-deps
          cd ../ifcedit && make test || ERROR=1
-          # Pinned <2: mcp 2.0.0 renamed mcp.server.fastmcp.FastMCP to
-          # mcp.server.mcpserver.MCPServer, which ifcmcp doesn't support yet.
-          pip install "mcp>=1.0,<2"
+          pip install mcp
          pip install -e ../ifcmcp --no-deps
          cd ../ifcmcp && make test || ERROR=1
          pip install -e ../ifctester --no-deps
@@ -11,10 +11,10 @@ jobs:

    steps:
      - name: Checkout repository
-        uses: actions/checkout@v7
+        uses: actions/checkout@v6

      - name: Set up Python
-        uses: actions/setup-python@v7
+        uses: actions/setup-python@v6
        with:
          python-version: '3.x'

@@ -27,12 +27,12 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout (recursive)
-        uses: actions/checkout@v7
+        uses: actions/checkout@v6
        with:
          submodules: recursive
          fetch-depth: 0
      - name: Checkout intermediate Pages repo
-        uses: actions/checkout@v7
+        uses: actions/checkout@v6
        with:
          repository: IfcOpenShell/aichat_ifcopenshell_org_static_html
          ref: gh-pages
@@ -42,7 +42,7 @@ jobs:
        run: |
          rsync -av --delete --exclude='.git/' src/ifcchat/ output/
      - name: Setup Python
-        uses: actions/setup-python@v7
+        uses: actions/setup-python@v6
        with:
          python-version: "3.x"
      - name: Download wheels
@@ -7,7 +7,7 @@ jobs:
  publish:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v6

      - uses: astral-sh/setup-uv@v7

@@ -27,12 +27,12 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout (recursive)
-        uses: actions/checkout@v7
+        uses: actions/checkout@v6
        with:
          submodules: recursive
          fetch-depth: 0
      - name: Checkout intermediate Pages repo
-        uses: actions/checkout@v7
+        uses: actions/checkout@v6
        with:
          repository: IfcOpenShell/wasm_ifcopenshell_org_static_html
          ref: gh-pages
@@ -17,7 +17,7 @@ jobs:
    runs-on: ubuntu-22.04
    steps:
      - name: Checkout
-        uses: actions/checkout@v7
+        uses: actions/checkout@v6
        with:
          submodules: recursive
      - name: Install C++ dependencies
@@ -18,7 +18,7 @@ and many other libraries, CLI apps, and more. Support is also provided for auxil

 For more information, see:

-* [IfcOpenShell Website](https://ifcopenshell.org)
+* [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)
@@ -3,7 +3,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2015/06/nuspec.xsd">
  <metadata>
    <id>blenderbim-nightly</id>
-    <version>blenderbim_build_version</version>
+    <version>blenderbim_build_version-alpha</version>
    <packageSourceUrl>https://github.com/IfcOpenShell/IfcOpenShell</packageSourceUrl>
    <owners>fbpyr</owners>
    <!-- == SOFTWARE SPECIFIC SECTION == -->
@@ -3,12 +3,11 @@
 apt update && apt install git wget curl ptpython mono-devel micro
 mkdir -p /home/runner/work/IfcOpenShell && cd /home/runner/work/IfcOpenShell
 git clone https://github.com/IfcOpenShell/IfcOpenShell
-cd /home/runner/work/IfcOpenShell/IfcOpenShell/choco/bonsai/
+cd /home/runner/work/IfcOpenShell/IfcOpenShell/choco/blenderbim/
 micro choco_release.py # paste this script, comment out push command
 export CHOCO_TOKEN="secret_choco_release_token"
 python3 choco_release.py
 """
-
 import datetime
 import hashlib
 import os
@@ -29,7 +28,7 @@ def get_repo_tag_names() -> list[str]:


 def request_repo_info(url: str):
-    req = request.Request(url)
+    req  = request.Request(url)
    resp = request.urlopen(req)
    if not resp.status == 200:
        print(f"[ERROR] could not contact server: {url}")
@@ -86,15 +85,13 @@ def run(command: str) -> None:

 start = datetime.datetime.now()

-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>"
+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"\(_PYTHON_VERSION_SUPPORTED (\d+\.\d+)\)"

-BLENDERBIM_DIR = pathlib.Path("/home/runner/work/IfcOpenShell/IfcOpenShell/choco/bonsai/")
+BLENDERBIM_DIR = pathlib.Path("/home/runner/work/IfcOpenShell/IfcOpenShell/choco/blenderbim/")

 print("_____ check choco release needed?")

@@ -151,7 +148,7 @@ print(f"{blender_python_version_maj_min=}")
 python_version = f"py{found[0].replace('.', '')}"
 print(f"{python_version=}")

-blenderbim_build_version = target_release_tag.replace("bonsai-", "")
+blenderbim_build_version = target_release_tag.replace("blenderbim-", "")

 # url_blenderbim_py3x_win_zip
 release_zip_file_name, url_blenderbim_py3x_win_zip = get_release_zip(target_release_tag)
@@ -169,15 +166,15 @@ topics = {
        "path": HERE_DIR / "blenderbim.nuspec",
        "key_values": {
            "latest_blender_version_maj_min_pat": latest_blender_release_maj_min_pat,
-            "blenderbim_build_version": blenderbim_build_version,
+            "blenderbim_build_version"          : blenderbim_build_version,
        },
    },
    "install": {
        "path": HERE_DIR / "tools" / "chocolateyinstall.ps1",
        "key_values": {
-            "url_blenderbim_py3x_win_zip": url_blenderbim_py3x_win_zip,
+            "url_blenderbim_py3x_win_zip"      : url_blenderbim_py3x_win_zip,
            "sha256sum_blenderbim_py3x_win_zip": sha256sum_blenderbim_py3x_win_zip,
-            "latest_blender_version_maj_min": blender_version_min_maj,
+            "latest_blender_version_maj_min"   : blender_version_min_maj,
        },
    },
    "uninstall": {
@@ -121,7 +121,7 @@ import tarfile
 import threading
 from datetime import datetime

-ssl._create_default_https_context = ssl._create_unverified_context  # ty:ignore[invalid-assignment]
+ssl._create_default_https_context = ssl._create_unverified_context

 import time
 from collections.abc import Generator, Sequence
@@ -697,10 +697,7 @@ def build_dependency(
            compr = "xz"
        else:
            raise RuntimeError("fix source for new download type")
-        # ty: false positive bug upstream.
-        download_tarfile = tarfile.open(
-            name=download_tarfile_path, mode=f"r:{compr}"
-        )  # ty:ignore[no-matching-overload]
+        download_tarfile = tarfile.open(name=download_tarfile_path, mode=f"r:{compr}")
        # tarfile seriously doesn't have a function to retrieve the root directory more easily
        extract_dir_name = os.path.commonprefix([x for x in download_tarfile.getnames() if x != "."])
        # run([tar, "--exclude=\"*/*\"", "-tf", download_name], cwd=build_dir).strip() no longer works
@@ -68,7 +68,6 @@ def unpack_dependencies(install_dir: Path) -> None:


 if __name__ == "__main__":
-    action = None
    if len(sys.argv) != 2 or (action := sys.argv[1].lower()) not in ("pack", "unpack"):
        print(__doc__)
        sys.exit(1)
@@ -82,6 +82,8 @@ ignore = [
 all = "error"

 # Structural rules (no deep type inference needed, easier to adapt).
+# Has false positives due to ty walrus operator bug.
+possibly-unresolved-reference = "ignore"
 # Maybe later, requires to specify element types for all generics.
 missing-type-argument = "ignore"
 # Conflicts with `bpy` props defined using annotations.
@@ -109,6 +111,7 @@ no-matching-overload = "ignore"
 not-subscriptable = "ignore"
 unsupported-dynamic-base = "ignore"
 unsupported-operator = "ignore"
+type-assertion-failure = "ignore"

 [tool.ty.environment]
 extra-paths = [
@@ -156,8 +159,7 @@ exclude = [
 [tool.poe.tasks]

 dev-setup.sequence = [
-    # 3.13 is chosen because it's the version used in the latest Bonsai.
-    {cmd = "uv sync --python 3.13"},
+    {cmd = "uv sync"},
    {cmd = "uv pip install -e ./src/bsdd/"},
    {cmd = "uv pip install -e ./src/ifcopenshell-python/[advanced,dev]"},
    {cmd = "uv pip install -e ./src/ifcedit/"},
@@ -193,6 +195,7 @@ format.sequence = ["black", "ruff"]
 cmake-format = "gersemi . --in-place"

 [tool.poe.tasks.ty-ios]
+# --ignore unresolved-reference: walrus operator false positives in ty.
 cmd = """
    ty check
    nix/
@@ -210,6 +213,7 @@ cmd = """
    src/ifcpatch
    src/ifctester
    --python=src/ifcopenshell-python/.venv
+    --ignore unresolved-reference
 """

 [tool.poe.tasks.bonsai-deps]
@@ -1,5 +1,5 @@
 black==26.3.1
-ruff==0.16.0
+ruff==0.15.12
 poethepoet
-ty==0.0.63
-gersemi==0.28.0
+ty==0.0.59
+gersemi==0.26.1
@@ -188,8 +188,6 @@ class BcfClient:
                response.raise_for_status()
            return response.status_code, response.text
        except requests.exceptions.HTTPError as errh:
-            response = errh.response
-            assert response is not None
            print(f"message: {response.reason}'  '{response.status_code}, {errh}")
            return response.status_code, response.reason

@@ -208,8 +206,6 @@ class BcfClient:
                response.raise_for_status()
            return response.status_code, response.text
        except requests.exceptions.HTTPError as errh:
-            response = errh.response
-            assert response is not None
            print(f"message: {response.reason}'  '{response.status_code}, {errh}")
            return response.status_code, response.reason

@@ -226,8 +222,6 @@ class BcfClient:
                response.raise_for_status()
            return response.status_code, response.text
        except requests.exceptions.HTTPError as errh:
-            response = errh.response
-            assert response is not None
            print(f"message: {response.reason}'  '{response.status_code}, {errh}")
            return response.status_code, response.reason

@@ -24,28 +24,10 @@ a text, a tspan {  fill: blue !important;  text-decoration: underline;}
 a:hover { cursor: pointer; }
 .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; }
-/* SVG edge classification (issue #3668): see edge-classification.md. These select directly on
-   the <path> element (each classified projection edge carries its own class), so they win over
-   the inherited .projection rule above regardless of specificity. */
-path.outline { stroke: black; stroke-width: 0.35; stroke-opacity: 1; }
-path.boundary { stroke: black; stroke-width: 0.3; stroke-opacity: 0.9; }
-path.crease { stroke: black; stroke-width: 0.25; stroke-opacity: 0.85; }
-path.sharp { stroke: black; stroke-width: 0.18; stroke-opacity: 0.7; }
-path.flush { stroke: black; stroke-width: 0.1; stroke-opacity: 0.4; }
-
-/* Debug CSS for troubleshooting edge classification */
-/*
-path.outline { stroke: black; stroke-width: 0.35; stroke-opacity: 1; }
-path.boundary { stroke: orange; stroke-width: 0.3; stroke-opacity: 0.9; }
-path.crease { stroke: green; stroke-width: 0.25; stroke-opacity: 0.85; }
-path.sharp { stroke: red; stroke-width: 0.18; stroke-opacity: 0.7; }
-path.flush { stroke: blue; stroke-width: 0.1; stroke-opacity: 0.4; }
-*/
-
-.surface {fill: white; stroke-width: 0.1;}
-.annotation { fill: none; stroke: black; stroke-linecap: 'round'; stroke-width: 0.3; }
-.IfcAnnotation { fill: none; stroke: black; stroke-linecap: 'round'; stroke-width: 0.3; }
-/* .IfcGeographicElement { fill: none; stroke: rgb(150, 150, 150); stroke-linecap: 'round'; stroke-dasharray: 1, 2;} */
+.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; }
@@ -5,7 +5,7 @@ FILE_NAME('EPset_Drawing.ifc','2020-01-01T00:00:00',$,$,'EPset_Drawing','EPset_D
 FILE_SCHEMA(('IFC4'));
 ENDSEC;
 DATA;
-#1=IFCPROPERTYSETTEMPLATE('2JhNIvqZrFnAgxfhK0XVQX',$,'EPset_Drawing','',.PSET_OCCURRENCEDRIVEN.,'IfcAnnotation/DRAWING',(#23,#22,#27,#24,#29,#30,#19,#12,#26,#9,#8,#7,#6,#4,#18,#11,#5,#20,#25,#14,#10,#17,#28,#16,#3,#21,#13,#15,#2,#31,#32,#33,#34,#35,#36,#37));
+#1=IFCPROPERTYSETTEMPLATE('2JhNIvqZrFnAgxfhK0XVQX',$,'EPset_Drawing','',.PSET_OCCURRENCEDRIVEN.,'IfcAnnotation/DRAWING',(#23,#22,#27,#24,#29,#30,#19,#12,#26,#9,#8,#7,#6,#4,#18,#11,#5,#20,#25,#14,#10,#17,#28,#16,#3,#21,#13,#15,#2));
 #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.);
@@ -35,12 +35,5 @@ DATA;
 #28=IFCSIMPLEPROPERTYTEMPLATE('1YSnFzurrEyRNtoLdmmddP',$,'BringToFront','The objects with these SVG classes will render in front of all other objects.Ex: IfcBeam, IfcColumn',.P_SINGLEVALUE.,'IfcText',$,$,$,$,$,.READWRITE.);
 #29=IFCSIMPLEPROPERTYTEMPLATE('0lP6Y8q9v2QhDnR4sT7uVx',$,'PerspectiveShiftX','Horizontal perspective camera shift stored as drawing metadata using Blender camera shift units.',.P_SINGLEVALUE.,'IfcReal',$,$,$,$,$,.READWRITE.);
 #30=IFCSIMPLEPROPERTYTEMPLATE('2mR8b1NcW5EoFyG7hJ9kLp',$,'PerspectiveShiftY','Vertical perspective camera shift stored as drawing metadata using Blender camera shift units.',.P_SINGLEVALUE.,'IfcReal',$,$,$,$,$,.READWRITE.);
-#31=IFCSIMPLEPROPERTYTEMPLATE('1cFVJnqT13m8ItkMHaI1tp',$,'UseEdgeClassification','Enable the boundary/outline/sharp/crease/flush SVG edge classification scheme (issue #3668). When false, drawings use the original unclassified linework.',.P_SINGLEVALUE.,'IfcBoolean',$,$,$,$,$,.READWRITE.);
-#32=IFCSIMPLEPROPERTYTEMPLATE('2kB$mxBgnBUvhjh0Ti0c4P',$,'RenderCreases','Whether to render ''crease'' (concave) edges. Only relevant when UseEdgeClassification is enabled.',.P_SINGLEVALUE.,'IfcBoolean',$,$,$,$,$,.READWRITE.);
-#33=IFCSIMPLEPROPERTYTEMPLATE('3MSIJNW$T8r9Hl12kk0BY$',$,'ValleyAngleMinDegrees','Minimum concave dihedral deviation from flat, in degrees, for a projection edge to be classified as ''crease'' rather than ''flush''.',.P_SINGLEVALUE.,'IfcReal',$,$,$,$,$,.READWRITE.);
-#34=IFCSIMPLEPROPERTYTEMPLATE('2epSGfC4bFM9gb1X7zBIp4',$,'RenderSharp','Whether to render ''sharp'' (convex) edges. Only relevant when UseEdgeClassification is enabled.',.P_SINGLEVALUE.,'IfcBoolean',$,$,$,$,$,.READWRITE.);
-#35=IFCSIMPLEPROPERTYTEMPLATE('3TZwsEjkr5WRDKcgrYzSIA',$,'RidgeAngleMinDegrees','Minimum convex dihedral deviation from flat, in degrees, for a projection edge to be classified as ''sharp'' rather than ''flush''.',.P_SINGLEVALUE.,'IfcReal',$,$,$,$,$,.READWRITE.);
-#36=IFCSIMPLEPROPERTYTEMPLATE('2Jua$lO754vgZOkBoHM2gA',$,'RenderFlush','Whether to render ''flush'' edges (dihedral deviation below both ridge/valley thresholds). Only relevant when UseEdgeClassification is enabled.',.P_SINGLEVALUE.,'IfcBoolean',$,$,$,$,$,.READWRITE.);
-#37=IFCSIMPLEPROPERTYTEMPLATE('1zM9sia2L8RQDnWZxgUwlZ',$,'JoinClasses','Comma separated list of IFC classes whose cut linework will be joined together when they meet (e.g. mitred at a corner).\X2\000A\X0\Defaults to ''IfcWall,IfcSlab'' if not set. Override to also join other classes, such as ''IfcWall,IfcSlab,IfcCovering''.',.P_SINGLEVALUE.,'IfcText',$,$,$,$,$,.READWRITE.);
 ENDSEC;
 END-ISO-10303-21;
@@ -5,7 +5,7 @@ FILE_NAME('Psets_BBIM_Annotation.ifc','2020-01-01T00:00:00',$,$,'Psets_BBIM_Anno
 FILE_SCHEMA(('IFC4'));
 ENDSEC;
 DATA;
-#1=IFCPROPERTYSETTEMPLATE('3VuPUwdCD2Qx3XDDRs0R1N',$,'EPset_Annotation','',.PSET_TYPEDRIVENOVERRIDE.,'IfcAnnotation,IfcTypeProduct',(#4,#33,#29,#32,#3,#2,#41,#42));
+#1=IFCPROPERTYSETTEMPLATE('3VuPUwdCD2Qx3XDDRs0R1N',$,'EPset_Annotation','',.PSET_TYPEDRIVENOVERRIDE.,'IfcAnnotation,IfcTypeProduct',(#4,#33,#29,#32,#3,#2));
 #2=IFCSIMPLEPROPERTYTEMPLATE('2P7JN79n96Q9pElZ83LKe4',$,'ZIndex','',.P_SINGLEVALUE.,'IfcInteger',$,$,$,$,$,.READWRITE.);
 #3=IFCSIMPLEPROPERTYTEMPLATE('1Wpx_r2xj1_9w5JpI0QRJy',$,'Symbol','',.P_SINGLEVALUE.,'IfcLabel',$,$,$,$,$,.READWRITE.);
 #4=IFCSIMPLEPROPERTYTEMPLATE('3q0oxMUKP47vZ4jnyG$dDb',$,'Classes','Classes separated 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.);
@@ -28,7 +28,7 @@ DATA;
 #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,IfcAnnotation/RADIUS,IfcAnnotation/DIAMETER,IfcAnnotation/ANGLE,IfcAnnotation/PLAN_LEVEL,IfcAnnotation/SECTION_LEVEL,IfcTypeProduct',(#25,#26,#35,#36,#27,#28,#30,#34,#37,#38,#39,#40));
+#24=IFCPROPERTYSETTEMPLATE('0I9merLinF5Ap$aZwaclgm',$,'BBIM_Dimension','',.PSET_TYPEDRIVENOVERRIDE.,'IfcAnnotation/DIMENSION,IfcAnnotation/RADIUS,IfcAnnotation/DIAMETER,IfcTypeProduct',(#25,#26,#27,#28,#30));
 #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.);
@@ -38,14 +38,5 @@ DATA;
 #31=IFCPROPERTYENUMERATION('CustomUnit',(IFCTEXT('Feet and Inches - Fractional'),IFCTEXT('Feet - Decimal'),IFCTEXT('Inches - Fractional'),IFCTEXT('Inches - Decimal'),IFCTEXT('Meters'),IFCTEXT('Decimeters'),IFCTEXT('Centimeters'),IFCTEXT('Millimeters')),$);
 #32=IFCSIMPLEPROPERTYTEMPLATE('0gjJzDYBX8P85qn1xcAOOo',$,'Reverse_List','',.P_SINGLEVALUE.,'IfcBoolean',$,$,$,$,$,.READWRITE.);
 #33=IFCSIMPLEPROPERTYTEMPLATE('22TrcxF8jFNB4buSmzjGEF',$,'List_Separator','',.P_SINGLEVALUE.,'IfcText',$,$,$,$,$,.READWRITE.);
-#34=IFCSIMPLEPROPERTYTEMPLATE('1Kx4Pm9nR8vBwZqTs2uYeL',$,'Separator','Characters placed between multiple dimension values when CustomUnit has more than one unit selected (default: '' / '')',.P_SINGLEVALUE.,'IfcLabel',$,$,$,$,$,.READWRITE.);
-#35=IFCSIMPLEPROPERTYTEMPLATE('3Nf6Qs1mT0pWxBuCvDyEzA',$,'SuppressZeroFeet','Suppress 0 feet in dimension annotation text (for example: 0'' - 3 1/2" -> 3 1/2")',.P_SINGLEVALUE.,'IfcBoolean',$,$,$,$,$,.READWRITE.);
-#36=IFCSIMPLEPROPERTYTEMPLATE('2Rg7Hn5jK4mLpNqOsVwXtY',$,'IsOrdinate','Show accumulated distance from the first vertex instead of individual segment lengths',.P_SINGLEVALUE.,'IfcBoolean',$,$,$,$,$,.READWRITE.);
-#37=IFCSIMPLEPROPERTYTEMPLATE('1XpRnKoT2sGuW7vYcZaMqb',$,'Anchors','JSON array of parametric anchor descriptors — one per polyline vertex. Each entry: {"guid": str|null, "type": "FACE"|"CIRCLE_CENTER"|"WORLD", "addr": {...}, "hint": [x,y,z]|null, "pt": [x,y,z]}',.P_SINGLEVALUE.,'IfcText',$,$,$,$,$,.READWRITE.);
-#38=IFCSIMPLEPROPERTYTEMPLATE('2YqSmLoU3tHvX8wZdaNrjc',$,'MeasureAxis','Axis along which distances are projected: X | Y | Z | TRUE | PERPENDICULAR',.P_SINGLEVALUE.,'IfcLabel',$,$,$,$,$,.READWRITE.);
-#39=IFCSIMPLEPROPERTYTEMPLATE('3Ny31Go6T5Z9fh8j4yQC0p',$,'ForcePerpendicularToFace','When enabled the polyline is constrained to follow the face normal of the first anchor vertex so the dimension measures straight-line distance perpendicular to that face',.P_SINGLEVALUE.,'IfcBoolean',$,$,$,$,$,.READWRITE.);
-#40=IFCSIMPLEPROPERTYTEMPLATE('1LoNpKqR3sTuVwXyZaBcDe',$,'LinePosition','Absolute world-space coordinate (metres) of the dimension line along the horizontal offset axis (perpendicular to the dimension direction). When set, the dimension line is held at this fixed global position even if the measured geometry moves. When absent the line sits at the anchor points.',.P_SINGLEVALUE.,'IfcLengthMeasure',$,$,$,$,$,.READWRITE.);
-#41=IFCSIMPLEPROPERTYTEMPLATE('0FauxIsAnnotFaux0001aB',$,'IsManualDrawingReference','Marks this annotation as a manually placed drawing reference, exempt from automatic drawing regeneration.',.P_SINGLEVALUE.,'IfcBoolean',$,$,$,$,$,.READWRITE.);
-#42=IFCSIMPLEPROPERTYTEMPLATE('0FauxIsDocRefFaux001aB',$,'IsDocumentReference','Marks this annotation as pointing to an external document reference (not a Bonsai drawing camera).',.P_SINGLEVALUE.,'IfcBoolean',$,$,$,$,$,.READWRITE.);
 ENDSEC;
 END-ISO-10303-21;
@@ -10,7 +10,6 @@ if bonsai_lib_path:
 import argparse
 import base64
 import json
-import urllib.parse
 import xml.etree.ElementTree as ET

 import pystache
@@ -19,53 +18,8 @@ from aiohttp import web

 sio_port = 8080  # default port

-
-def get_asset_version() -> str:
-    """A cache-busting token appended to locally served static asset URLs.
-
-    Browsers otherwise keep serving a stale cached copy of static/js and
-    static/css after Bonsai ships a code change, until the user does a hard
-    refresh. Using the Bonsai version (which includes the build's commit
-    hash) means the token changes on every shipped update.
-    """
-    if bonsai_version:
-        return urllib.parse.quote(bonsai_version, safe="")
-    # Fallback for standalone runs without BONSAI_VERSION set (e.g. running
-    # sioserver.py directly outside of Blender): derive a token from the
-    # newest mtime among the static assets, so it still changes whenever the
-    # shipped files change.
-    static_dir = os.path.join(os.path.dirname(os.path.abspath(__file__)), "static")
-    latest_mtime = 0
-    for root, _dirs, files in os.walk(static_dir):
-        for name in files:
-            latest_mtime = max(latest_mtime, int(os.path.getmtime(os.path.join(root, name))))
-    return f"dev-{latest_mtime}"
-
-
-asset_version = get_asset_version()
-
-
-@web.middleware
-async def no_cache_static_middleware(request: web.Request, handler):
-    """Force revalidation of locally served static assets.
-
-    Query-string version stamping (see `asset_version`) busts the cache for
-    the HTML-referenced entry points, but JS files that statically import
-    other local modules (e.g. cost.js/gantt.js importing utilities/costui.js)
-    reference those modules by an un-stamped relative path. Marking all
-    /static/ and /jsgantt/ responses as no-cache makes browsers always
-    revalidate with the server (a cheap conditional GET / 304 when nothing
-    changed), so nested imports also pick up shipped changes without
-    requiring a hard refresh.
-    """
-    response = await handler(request)
-    if request.path.startswith("/static/") or request.path.startswith("/jsgantt/"):
-        response.headers["Cache-Control"] = "no-cache, must-revalidate"
-    return response
-
-
 sio = socketio.AsyncServer(cors_allowed_origins="*", async_mode="aiohttp", max_http_buffer_size=10000000)
-app = web.Application(middlewares=[no_cache_static_middleware])
+app = web.Application()
 sio.attach(app)


@@ -245,28 +199,28 @@ class BlenderNamespace(socketio.AsyncNamespace):
 async def schedules(request):
    with open("templates/index.html", "r") as f:
        template = f.read()
-    html_content = pystache.render(template, {"port": sio_port, "version": bonsai_version, "v": asset_version})
+    html_content = pystache.render(template, {"port": sio_port, "version": bonsai_version})
    return web.Response(text=html_content, content_type="text/html")


 async def costing(request):
    with open("templates/costing.html", "r") as f:
        template = f.read()
-    html_content = pystache.render(template, {"port": sio_port, "version": bonsai_version, "v": asset_version})
+    html_content = pystache.render(template, {"port": sio_port, "version": bonsai_version})
    return web.Response(text=html_content, content_type="text/html")


 async def sequencing(request):
    with open("templates/gantt.html", "r") as f:
        template = f.read()
-    html_content = pystache.render(template, {"port": sio_port, "version": bonsai_version, "v": asset_version})
+    html_content = pystache.render(template, {"port": sio_port, "version": bonsai_version})
    return web.Response(text=html_content, content_type="text/html")


 async def documentation(request):
    with open("templates/drawings.html", "r") as f:
        template = f.read()
-    html_content = pystache.render(template, {"port": sio_port, "version": bonsai_version, "v": asset_version})
+    html_content = pystache.render(template, {"port": sio_port, "version": bonsai_version})
    return web.Response(text=html_content, content_type="text/html")


@@ -275,7 +229,7 @@ async def documentation(request):
 async def demo(request):
    with open("templates/demo.html", "r") as f:
        template = f.read()
-    html_content = pystache.render(template, {"port": sio_port, "version": bonsai_version, "v": asset_version})
+    html_content = pystache.render(template, {"port": sio_port, "version": bonsai_version})
    return web.Response(text=html_content, content_type="text/html")


@@ -244,7 +244,7 @@ function addGanttElement(blenderId, tasks, workSched, filename) {
      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: ["Hour", "Day", "Week", "Month", "Quarter"], // vUseSingleCell keeps Hour usable on large charts.
+      vFormatArr: ["Day", "Week", "Month", "Quarter"], // Even with setUseSingleCell using Hour format on such a large chart can cause issues in some browsers,
      vShowRes: true, // 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.
@@ -250,14 +250,6 @@ export class CostUI {
      },
    });

-    CostUI.addRibbonButton({
-      text: "Download CSV",
-      icon: "fa-solid fa-file-csv",
-      callback: () => {
-        CostUI.downloadCsv();
-      },
-    });
-
    CostUI.addRibbonButton({
      text: "Hide Schedules",
      icon: "fa-regular fa-eye-slash",
@@ -531,81 +523,6 @@ export class CostUI {
    }
  }

-  static downloadCsv() {
-    const tables = document.querySelectorAll("table[id^='cost-items-']");
-    if (tables.length === 0) {
-      alert("No cost schedule loaded to export!");
-      return;
-    }
-    tables.forEach((table) => {
-      const scheduleId = table.id.split("-").pop();
-      const csv = CostUI.tableToCsv(table);
-      if (csv === null) {
-        return;
-      }
-      const nameEl = document.querySelector(
-        "#cost-schedule-container-" + scheduleId + " .form-header span"
-      );
-      const scheduleName = nameEl
-        ? nameEl.textContent
-        : "cost_schedule_" + scheduleId;
-      CostUI.triggerCsvDownload(csv, scheduleName + ".csv");
-    });
-  }
-
-  static tableToCsv(table) {
-    const escapeCsvCell = (value) => {
-      const text = (value === null || value === undefined ? "" : value)
-        .toString()
-        .trim();
-      if (/[",\n]/.test(text)) {
-        return '"' + text.replace(/"/g, '""') + '"';
-      }
-      return text;
-    };
-
-    const cellText = (cell) => {
-      const input = cell.querySelector("input");
-      return input ? input.value : cell.innerText;
-    };
-
-    // The Actions column only holds buttons (edit/delete/etc), not data.
-    const isDataColumn = (column) => column && column !== "Actions";
-
-    const headerCells = Array.from(table.querySelectorAll("thead th")).filter(
-      (th) => isDataColumn(th.getAttribute("data-column"))
-    );
-    if (headerCells.length === 0) {
-      return null;
-    }
-
-    const rows = [headerCells.map((th) => escapeCsvCell(th.textContent)).join(",")];
-
-    table.querySelectorAll("tbody tr").forEach((row) => {
-      const cells = Array.from(row.children).filter((cell) =>
-        isDataColumn(cell.getAttribute("data-column"))
-      );
-      if (cells.length === 0) {
-        return; // e.g. the "No cost items found" placeholder row.
-      }
-      rows.push(cells.map((cell) => escapeCsvCell(cellText(cell))).join(","));
-    });
-
-    return rows.join("\n");
-  }
-
-  static triggerCsvDownload(csvContent, filename) {
-    const blob = new Blob([csvContent], { type: "text/csv;charset=utf-8;" });
-    const url = URL.createObjectURL(blob);
-    const link = document.createElement("a");
-    link.href = url;
-    link.download = filename;
-    document.body.appendChild(link);
-    link.click();
-    document.body.removeChild(link);
-    URL.revokeObjectURL(url);
-  }
-
  static createCostTable({ costSchedule, currency, callbacks }) {
    const preferences = CostUI.getColumnPreferences();
    const isScheduleOfRates = costSchedule.PredefinedType === "SCHEDULEOFRATES";
@@ -7,7 +7,7 @@
    <link
      rel="stylesheet"
      type="text/css"
-      href="/static/css/cost.css?v={{v}}"
+      href="/static/css/cost.css"
      id="index-stylesheet"
    />
    <link
@@ -21,7 +21,7 @@
    />
    <script
      type="text/javascript"
-      src="/static/js/jquery.min.js?v={{v}}"
+      src="/static/js/jquery.min.js"
    ></script>
    <script
      type="text/javascript"
@@ -34,7 +34,7 @@
    <script>
      var SOCKET_PORT = {{port}};
    </script>
-    <script type="module" defer src="./static/js/cost.js?v={{v}}"></script>
+    <script type="module" defer src="./static/js/cost.js"></script>
  </head>
  <body>
    <nav>
@@ -12,14 +12,14 @@
    />
    <!-- here we request the CSS file from the server, -->
    <!-- using registered static path in the server -->
-    <link rel="stylesheet" href="/static/css/demo.css?v={{v}}" id="demo-stylesheet" />
+    <link rel="stylesheet" href="/static/css/demo.css" id="demo-stylesheet" />
    <link
      rel="stylesheet"
      href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.6.0/css/all.min.css"
    />
    <script
      type="text/javascript"
-      src="/static/js/jquery.min.js?v={{v}}"
+      src="/static/js/jquery.min.js"
    ></script>
    <script
      type="text/javascript"
@@ -33,7 +33,7 @@
    </script>
    <!-- here we request the JS file from the server-->
    <!-- using registered static path in the server -->
-    <script defer src="./static/js/demo.js?v={{v}}"></script>
+    <script defer src="./static/js/demo.js"></script>
  </head>
  <body>
    <!-- the navigation bar at the top of the page. -->
@@ -15,7 +15,7 @@
    />
    <link
      rel="stylesheet"
-      href="/static/css/drawings.css?v={{v}}"
+      href="/static/css/drawings.css"
      id="drawings-stylesheet"
    />
    <link
@@ -24,7 +24,7 @@
    />
    <script
      type="text/javascript"
-      src="/static/js/jquery.min.js?v={{v}}"
+      src="/static/js/jquery.min.js"
    ></script>
    <script
      type="text/javascript"
@@ -45,7 +45,7 @@
    <script>
      var SOCKET_PORT = {{port}};
    </script>
-    <script defer src="./static/js/drawings.js?v={{v}}"></script>
+    <script defer src="./static/js/drawings.js"></script>
  </head>
  <body>
    <nav>
@@ -9,25 +9,25 @@
      type="image/x-icon"
      href="https://bonsaibim.org/assets/images/favicon-blender.png"
    />
-    <link rel="stylesheet" type="text/css" href="/jsgantt/jsgantt.css?v={{v}}" />
-    <link rel="stylesheet" href="/static/css/gantt.css?v={{v}}" id="gantt-stylesheet" />
+    <link rel="stylesheet" type="text/css" href="/jsgantt/jsgantt.css" />
+    <link rel="stylesheet" href="/static/css/gantt.css" id="gantt-stylesheet" />
    <link
      rel="stylesheet"
      href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.6.0/css/all.min.css"
    />
    <script
      type="text/javascript"
-      src="/static/js/jquery.min.js?v={{v}}"
+      src="/static/js/jquery.min.js"
    ></script>
    <script
      type="text/javascript"
      src="https://cdn.socket.io/4.0.0/socket.io.min.js"
    ></script>
-    <script type="text/javascript" src="./jsgantt/jsgantt.js?v={{v}}"></script>
+    <script type="text/javascript" src="./jsgantt/jsgantt.js"></script>
    <script>
      var SOCKET_PORT = {{port}};
    </script>
-    <script type="module" defer src="./static/js/gantt.js?v={{v}}"></script>
+    <script type="module" defer src="./static/js/gantt.js"></script>
  </head>
  <body>
    <nav class="no-print">
@@ -9,7 +9,7 @@
      type="image/x-icon"
      href="https://bonsaibim.org/assets/images/favicon-blender.png"
    />
-    <link rel="stylesheet" href="/static/css/index.css?v={{v}}" id="index-stylesheet" />
+    <link rel="stylesheet" href="/static/css/index.css" id="index-stylesheet" />
    <link
      rel="stylesheet"
      id="tabulator-stylesheet"
@@ -21,7 +21,7 @@
    />
    <script
      type="text/javascript"
-      src="/static/js/jquery.min.js?v={{v}}"
+      src="/static/js/jquery.min.js"
    ></script>
    <script
      type="text/javascript"
@@ -34,7 +34,7 @@
    <script>
      var SOCKET_PORT = {{port}};
    </script>
-    <script defer src="./static/js/index.js?v={{v}}"></script>
+    <script defer src="./static/js/index.js"></script>
  </head>
  <body>
    <nav>
@@ -418,10 +418,9 @@ def get_user(ifc: ifcopenshell.file) -> Union[ifcopenshell.entity_instance, None


 def viewport_shading_changed_callback(area: bpy.types.Area) -> None:
-    shading_type = area.spaces.active.shading.type
-    tool.Style.restore_material_style_types(shading_type)
-    if shading_type == "SOLID":
-        area.spaces.active.shading.color_type = "MATERIAL"
+    shading = area.spaces.active.shading.type
+    if shading == "RENDERED":
+        tool.Style.get_style_props().active_style_type = "External"


 def subscribe_to_viewport_shading_changes():
@@ -133,6 +133,10 @@ class MaterialCreator:
                if shape_has_openings and coords.is_a("IfcIndexedTextureMap"):
                    continue
                tool.Loader.load_indexed_map(coords, self.mesh)
+            elif tool.Style.get_texture_style(material):
+                # No explicit coordinate mapping (e.g. IFC2X3 has no IsMappedBy,
+                # and IFC4 COORD uses generated UVs). Bake XY→UV as fallback.
+                tool.Loader.load_generated_uv_map(self.mesh)

    def assign_material_slots_to_faces(self) -> None:
        if not self.mesh["ios_materials"]:
@@ -1099,14 +1103,12 @@ class IfcImporter:
        vertices = [[v[i], v[i + 1], v[i + 2], 1] for i in range(0, len(v), 3)]
        edges = [[e[i], e[i + 1]] for i in range(0, len(e), 2)]
        v2 = None
-        polyline = None
        for edge in edges:
            v1 = vertices[edge[0]]
            if v1 != v2:
                polyline = curve.splines.new("POLY")
                polyline.points[-1].co = mathutils.Vector(v1)
            v2 = vertices[edge[1]]
-            assert polyline is not None
            polyline.points.add(1)
            polyline.points[-1].co = mathutils.Vector(v2)
        edges_item_ids = ifcopenshell.util.shape.get_edges_representation_item_ids(geometry).tolist()
@@ -1059,7 +1059,6 @@ class AddBoundary(bpy.types.Operator, tool.Ifc.Operator):
        return tool.Ifc.get().createIfcConnectionSurfaceGeometry(surface)

    def export_surface(self, polygon, target_face_matrix):
-        ifc_file = tool.Ifc.get()
        x_axis = target_face_matrix.col[0][:3]
        z_axis = target_face_matrix.col[2][:3]
        p1 = target_face_matrix.translation
@@ -1072,20 +1071,18 @@ class AddBoundary(bpy.types.Operator, tool.Ifc.Operator):
        placement = builder.create_axis2_placement_3d([o / self.unit_scale for o in p1], z_axis, x_axis)
        surface.BasisSurface = tool.Ifc.get().create_entity("IfcPlane", placement)

-        schema = ifc_file.schema
-        if schema != "IFC2X3":
+        if tool.Ifc.get().schema != "IFC2X3":
            points = [tool.Model.convert_si_to_unit(list(co)) for co in polygon.exterior.coords]
            point_list = tool.Ifc.get().createIfcCartesianPointList2D(points)
            outer_boundary = tool.Ifc.get().createIfcIndexedPolyCurve(point_list, None, False)

-            inner_boundaries: list[ifcopenshell.entity_instance] = []
+            inner_boundaries = []
            for interior in polygon.interiors:
                points = [tool.Model.convert_si_to_unit(list(co)) for co in interior.coords]
                point_list = tool.Ifc.get().createIfcCartesianPointList2D(points)
                inner_boundaries.append(tool.Ifc.get().createIfcIndexedPolyCurve(point_list, None, False))
        else:
-            # TODO:
-            raise NotImplementedError(schema)
+            pass  # TODO

        surface.OuterBoundary = outer_boundary
        surface.InnerBoundaries = inner_boundaries
@@ -400,7 +400,6 @@ class CadOffset(bpy.types.Operator):
        [verts.update(e.verts) for e in edges]

        # Use the viewport angle to determine the offset direction
-        wp = None
        for area in bpy.context.screen.areas:
            if area.type == "VIEW_3D":
                # Don't ask me, I don't know.
@@ -410,7 +409,6 @@ class CadOffset(bpy.types.Operator):
                z = area.spaces.active.region_3d.view_rotation @ Vector((0, 0, 1))
                wp = Matrix([x, y, z, Vector((0, 0, 0))]).to_4x4().transposed()
                break
-        assert wp is not None

        rotation = Matrix.Rotation(pi / 2, 2, "Z")
        rotation_i = Matrix.Rotation(-pi / 2, 2, "Z")
@@ -478,7 +478,6 @@ class ChangeClassificationLevel(bpy.types.Operator):
    def execute(self, context):
        props = tool.Classification.get_classification_props()
        props.available_library_references.clear()
-        reference = None
        for reference in IfcStore.classification_file.by_id(self.parent_id).HasReferences:
            new = props.available_library_references.add()
            new.identification = reference.Identification or ""
@@ -486,7 +485,6 @@ class ChangeClassificationLevel(bpy.types.Operator):
            new.ifc_definition_id = reference.id()
            new.has_references = bool(reference.HasReferences)
            new.referenced_source
-        assert reference
        if reference.ReferencedSource.is_a("IfcClassificationReference"):
            props.active_library_referenced_source = reference.ReferencedSource.ReferencedSource.id()
        else:
@@ -156,8 +156,6 @@ class CostSchedulesData:
            values = root_element.CostValues
        elif root_element.is_a("IfcConstructionResource"):
            values = root_element.BaseCosts
-        else:
-            assert False, root_element
        for cost_value in values or []:
            cls._load_cost_value(root_element, data, cost_value)
            # data["CostValues"].append(cost_value.id())
@@ -32,7 +32,6 @@ classes = (
    operator.ActivateModel,
    operator.AddAnnotation,
    operator.AddAnnotationType,
-    operator.AddElevationAnnotation,
    operator.AddDrawing,
    operator.AddDrawingStyle,
    operator.AddDrawingToSheet,
@@ -48,7 +47,6 @@ classes = (
    operator.CleanWireframes,
    operator.ContractSheet,
    operator.ConvertSVGToDXF,
-    operator.CopyAnnotationToDrawing,
    operator.CopyTextToSelection,
    operator.CreateDrawing,
    operator.CreateSheets,
@@ -109,19 +107,8 @@ classes = (
    operator.SelectAssignedProduct,
    operator.SelectSimilarTextLiteralValue,
    operator.ToggleTargetView,
-    operator.ToggleDrawingCategorySelection,
    operator.OpenDocumentationWebUi,
    operator.FilterSelectedObjectsIfIntersectedByCamera,
-    operator.DrawParametricDimension,
-    operator.SetDimensionAnchor,
-    operator.RegenerateDimensions,
-    operator.DriveDimensionLength,
-    operator.RemoveDimensionAnchor,
-    operator.InsertDimensionAnchor,
-    operator.ClickNearestDimensionAnchor,
-    operator.MakeDimensionParametric,
-    operator.BakeParametricDimension,
-    operator.DebugDimensionClicks,
    prop.Variable,
    prop.Drawing,
    prop.Document,
@@ -183,19 +170,11 @@ classes = (
    gizmos.UglyDotGizmo,
    gizmos.ExtrusionGuidesGizmo,
    gizmos.ExtrusionWidget,
-    gizmos.GizmoAnchorHandle,
-    gizmos.GizmoDriveDimLabel,
-    gizmos.DimensionAnchorWidget,
-    gizmos.DimensionLinePositionWidget,
-    gizmos.DimensionDriveLabelWidget,
    workspace.LaunchAnnotationTypeManager,
    workspace.Hotkey,
 )


-_keymaps = []
-
-
 def menu_func(self, context):
    active_obj = context.active_object
    if active_obj:
@@ -215,21 +194,9 @@ def register():
    bpy.types.TextCurve.BIMTextProperties = bpy.props.PointerProperty(type=prop.BIMTextProperties)
    bpy.app.handlers.load_post.append(handler.load_post)
    bpy.app.handlers.depsgraph_update_pre.append(handler.depsgraph_update_pre_handler)
-    bpy.app.handlers.depsgraph_update_post.append(handler.depsgraph_update_post_handler)
    bpy.types.VIEW3D_MT_image_add.append(ui.add_object_button)
    bpy.types.VIEW3D_MT_object_context_menu.append(menu_func)

-    wm = bpy.context.window_manager
-    kc = wm.keyconfigs.addon
-    if kc:
-        km = kc.keymaps.new(name="3D View", space_type="VIEW_3D")
-        kmi = km.keymap_items.new("bim.click_nearest_dimension_anchor", "LEFTMOUSE", "PRESS")
-        _keymaps.append((km, kmi))
-        kmi_alt = km.keymap_items.new("bim.click_nearest_dimension_anchor", "LEFTMOUSE", "PRESS", alt=True)
-        _keymaps.append((km, kmi_alt))
-        kmi_ctrl = km.keymap_items.new("bim.click_nearest_dimension_anchor", "LEFTMOUSE", "PRESS", ctrl=True)
-        _keymaps.append((km, kmi_ctrl))
-

 def unregister():
    if not bpy.app.background:
@@ -242,10 +209,5 @@ def unregister():
    del bpy.types.TextCurve.BIMTextProperties
    bpy.app.handlers.load_post.remove(handler.load_post)
    bpy.app.handlers.depsgraph_update_pre.remove(handler.depsgraph_update_pre_handler)
-    bpy.app.handlers.depsgraph_update_post.remove(handler.depsgraph_update_post_handler)
-
-    for km, kmi in _keymaps:
-        km.keymap_items.remove(kmi)
-    _keymaps.clear()
    bpy.types.VIEW3D_MT_image_add.remove(ui.add_object_button)
    bpy.types.VIEW3D_MT_object_context_menu.remove(menu_func)
@@ -55,14 +55,6 @@ class ProductAssignmentsData:
        element = tool.Ifc.get_entity(bpy.context.active_object)
        if not element or not element.is_a("IfcAnnotation"):
            return
-        # Document-reference annotations link to an IfcDocumentInformation, not a product.
-        if tool.Drawing.is_document_reference(element):
-            for rel in element.HasAssociations:
-                if rel.is_a("IfcRelAssociatesDocument"):
-                    doc = rel.RelatingDocument
-                    if doc.is_a("IfcDocumentInformation"):
-                        return doc.Name or "Unnamed"
-            return None
        for rel in element.HasAssignments:
            if rel.is_a("IfcRelAssignsToProduct"):
                name = rel.RelatingProduct.Name or "Unnamed"
@@ -320,9 +312,6 @@ class DecoratorData:
            "StartArrowSymbol": "",
            "ShowEndArrow": True,
            "EndArrowSymbol": "",
-            "BorderOffset": 8.0,
-            "AutoStartPosition": "",
-            "AutoEndPosition": "",
        }
        obj_pset_data = ifcopenshell.util.element.get_pset(element, "BBIM_Section") or {}
        pset_data.update(obj_pset_data)
@@ -342,9 +331,6 @@ class DecoratorData:
                "symbol": end_symbol or "section-arrow",
            },
            "connect_markers": pset_data["HasConnectedSectionLine"],
-            "border_offset": float(pset_data["BorderOffset"]),
-            "auto_start_position": pset_data["AutoStartPosition"] or "",
-            "auto_end_position": pset_data["AutoEndPosition"] or "",
        }

        cls.data[obj.name] = display_data
@@ -813,24 +799,19 @@ class DecoratorData:
        pset_data = ifcopenshell.util.element.get_pset(element, "BBIM_Dimension") or {}
        show_description_only = pset_data.get("ShowDescriptionOnly", False)
        suppress_zero_inches = pset_data.get("SuppressZeroInches", False)
-        suppress_zero_feet = pset_data.get("SuppressZeroFeet", False)
-        is_ordinate = pset_data.get("IsOrdinate", False)
        text_prefix = pset_data.get("TextPrefix", None) or ""
        text_suffix = pset_data.get("TextSuffix", None) or ""
-        custom_units = list(pset_data.get("CustomUnit", None) or [])
-        separator = pset_data.get("Separator", None) or " / "
+        custom_unit_list = pset_data.get("CustomUnit", None) or ""
+        custom_unit = custom_unit_list[0] if custom_unit_list else ""

        return {
            "dimension_style": dimension_style,
            "show_description_only": show_description_only,
            "suppress_zero_inches": suppress_zero_inches,
-            "suppress_zero_feet": suppress_zero_feet,
-            "is_ordinate": is_ordinate,
            "text_prefix": text_prefix,
            "text_suffix": text_suffix,
            "fill_bg": fill_bg,
-            "custom_units": custom_units,
-            "separator": separator,
+            "custom_unit": custom_unit,
        }

    @classmethod
@@ -425,12 +425,10 @@ class BaseDecorator:

        blf.size(font_id, font_size_px)

-        w, h = None, None
        if box_alignment or center or vcenter:
            w, h = blf.dimensions(font_id, text)

        if box_alignment:
-            assert w is not None and h is not None
            box_alignment_offset = Vector((0, 0))
            if "bottom" in box_alignment:
                pass
@@ -452,12 +450,10 @@ class BaseDecorator:
        else:
            # horizontal centering
            if center:
-                assert w is not None
                pos -= Vector((cos, sin)) * w * 0.5

            # vertical centering
            if vcenter:
-                assert h is not None
                pos -= Vector((-sin, cos)) * h * 0.5

            # side-shifting
@@ -494,7 +490,7 @@ class BaseDecorator:
        self.draw_label(context, text=text, line_no=line_number_start, multiline=True, **draw_label_kwargs)

    @cache
-    def format_value(self, context, value, suppress_zero_inches=False, suppress_zero_feet=False, custom_unit=None, in_unit_length=False):
+    def format_value(self, context, value, suppress_zero_inches=False, custom_unit=None, in_unit_length=False):
        drawing_pset_data = DrawingsData.data["active_drawing_pset_data"]
        precision = drawing_pset_data.get("MetricPrecision", None)
        if not precision:
@@ -506,7 +502,6 @@ class BaseDecorator:
            precision=precision,
            decimal_places=decimal_places,
            suppress_zero_inches=suppress_zero_inches,
-            suppress_zero_feet=suppress_zero_feet,
            custom_unit=custom_unit,
            in_unit_length=in_unit_length,
        )
@@ -723,13 +718,11 @@ class DimensionDecorator(BaseDecorator):
        if not dimension_data:
            return
        show_description_only = dimension_data["show_description_only"]
-        is_ordinate = dimension_data["is_ordinate"]
        text_prefix = dimension_data["text_prefix"]
        text_suffix = dimension_data["text_suffix"]
        viewportDrawingScale = self.get_viewport_drawing_scale(context)
        text_offset_value = viewportDrawingScale * 3

-        ordinate_total = 0.0
        for i0, i1 in indices:
            v0 = Vector(vertices[i0])
            v1 = Vector(vertices[i1])
@@ -748,25 +741,16 @@ class DimensionDecorator(BaseDecorator):
                "multiline": True,
                "text_dir": text_dir,
            }
-            base_pos = p1 if is_ordinate else p0 + text_dir * 0.5
+            base_pos = p0 + text_dir * 0.5

            if not show_description_only:
-                segment_length = (v1 - v0).length
-                if is_ordinate:
-                    ordinate_total += segment_length
-                length = ordinate_total if is_ordinate else segment_length
-                units_to_format = dimension_data["custom_units"] if dimension_data["custom_units"] else [None]
-                parts = [
-                    self.format_value(
-                        context,
-                        length,
-                        suppress_zero_inches=dimension_data["suppress_zero_inches"],
-                        suppress_zero_feet=dimension_data["suppress_zero_feet"],
-                        custom_unit=unit,
-                    )
-                    for unit in units_to_format
-                ]
-                text = dimension_data["separator"].join(str(p) for p in parts)
+                length = (v1 - v0).length
+                text = self.format_value(
+                    context,
+                    length,
+                    suppress_zero_inches=dimension_data["suppress_zero_inches"],
+                    custom_unit=dimension_data["custom_unit"],
+                )
                if isinstance(self, DiameterDecorator):
                    text = "D" + text
                text = text_prefix + text + text_suffix
@@ -777,18 +761,15 @@ class DimensionDecorator(BaseDecorator):

            self.draw_label(
                text=text,
-                pos=base_pos + text_offset + (Vector((0, text_offset_value)) if is_ordinate else Vector((0, 0))),
-                box_alignment="bottom-right" if is_ordinate else "bottom-middle",
+                pos=base_pos + text_offset,
+                box_alignment="bottom-middle",
                multiline_to_bottom=False,
                **common_label_attrs,
            )

            if not show_description_only and description:
                self.draw_label(
-                    text=description,
-                    pos=base_pos - text_offset + (Vector((0, text_offset_value)) if is_ordinate else Vector((0, 0))),
-                    box_alignment="top-right" if is_ordinate else "top-middle",
-                    **common_label_attrs,
+                    text=description, pos=base_pos - text_offset, box_alignment="top-middle", **common_label_attrs
                )


@@ -984,9 +965,7 @@ class RadiusDecorator(BaseDecorator):

        def get_text():
            length = (spline_points[-1] - spline_points[-2]).length
-            units_to_format = dimension_data["custom_units"] if dimension_data["custom_units"] else [None]
-            parts = [self.format_value(context, length, suppress_zero_feet=dimension_data["suppress_zero_feet"], custom_unit=unit) for unit in units_to_format]
-            return "R" + dimension_data["separator"].join(str(p) for p in parts)
+            return "R" + self.format_value(context, length, custom_unit=dimension_data["custom_unit"])

        self.draw_dimension_text(
            context, get_text, description, dimension_data, pos=pos, text_dir=Vector((1, 0)), box_alignment="center"
@@ -1022,8 +1001,6 @@ class FallDecorator(BaseDecorator):
            O = A.copy()
            O.z = B.z
            run = (B - O).length
-
-            angle_tg = None
            if run != 0:
                angle_tg = rise / run
                angle = round(degrees(atan(angle_tg)))
@@ -1041,7 +1018,6 @@ class FallDecorator(BaseDecorator):
            elif object_type == "SLOPE_PERCENT":
                if angle == 90:
                    return "-"
-                assert angle_tg is not None
                return f"{round(angle_tg * 100)} %"
            return "NO DATA"

@@ -1273,7 +1249,6 @@ class SectionLevelDecorator(BaseDecorator):
        }

        # process edges
-        text_position, text_dir = None, None
        for edge in edges_original:
            v0, v1 = winspace_verts[edge[0]], winspace_verts[edge[1]]
            start_i = len(output_verts)
@@ -1522,20 +1497,6 @@ class ElevationDecorator(BaseDecorator):
            "output_edges": output_edges,
        }

-        # Determine the arrow direction in camera-image-plane (XY) space.
-        # The elevation tag's local -Z is intentionally parallel to the drawing
-        # camera's view direction, so projecting it always gives a near-zero XY
-        # delta.  Fall through to local +X (which is perpendicular to the view
-        # and rotates visibly when the user spins the tag).
-        view_mat = context.region_data.view_matrix
-        edge_dir_2d = Vector((1.0, 0.0))  # final fallback
-        for local_axis in (Vector((0, 0, -1)), Vector((1, 0, 0)), Vector((0, 1, 0))):
-            world_axis = obj.matrix_world.to_3x3() @ local_axis
-            cam_xy = (view_mat.to_3x3() @ world_axis).xy
-            if cam_xy.length > 1e-6:
-                edge_dir_2d = cam_xy.normalized()
-                break
-
        # process edges
        for edge in edges_original:
            v0, v1 = winspace_verts[edge[0]], winspace_verts[edge[1]]
@@ -1544,7 +1505,7 @@ class ElevationDecorator(BaseDecorator):
            circle_head = get_circle_head(circle_size)
            start_i = add_verts_sequence(add_offsets(v0, circle_head), start_i, **out_kwargs, closed=True)

-            edge_dir = edge_dir_2d.to_3d()
+            edge_dir = (v1 - v0).normalized()
            side = (edge_dir.yx * Vector((1, -1))).to_3d()
            triangle_head = get_triangle_head(side, edge_dir, triangle_length, triangle_width)
            start_i = add_verts_sequence(add_offsets(v0, triangle_head), start_i, **out_kwargs, closed=True)
@@ -1593,39 +1554,32 @@ class SectionDecorator(BaseDecorator):
            v0, v1 = winspace_verts[edge[0]], winspace_verts[edge[1]]
            start_i = len(output_verts)

-            circle_head = None
            if display_start_circle or display_end_circle:
                circle_head = get_circle_head(circle_size)

-            triangle_head, divider_offset, edge_dir_circle = None, None, None
-            display_symbol = display_start_symbol or display_end_symbol
-            if display_symbol or connect_markers:
+            if display_start_symbol or display_end_symbol or connect_markers:
                edge_dir = (v1 - v0).normalized()
                side = (edge_dir.yx * Vector((1, -1))).to_3d()
                edge_dir_circle = edge_dir * circle_size

-                if display_symbol:
-                    triangle_head = get_triangle_head(edge_dir, -side, triangle_length, triangle_width)
-                    divider_offset = []
-                    divider_offset.append(edge_dir_circle if connect_markers else edge_dir_circle * 3)
-                    divider_offset.append(edge_dir_circle)
+            if display_start_symbol or display_end_symbol:
+                triangle_head = get_triangle_head(edge_dir, -side, triangle_length, triangle_width)
+                divider_offset = []
+                divider_offset.append(edge_dir_circle if connect_markers else edge_dir_circle * 3)
+                divider_offset.append(edge_dir_circle)

            if display_start_circle:
-                assert circle_head is not None
                start_i = add_verts_sequence([v + v0 for v in circle_head], start_i, **out_kwargs, closed=True)
                # circle middle divider
                if not display_start_symbol:
-                    assert divider_offset is not None
                    start_i = add_verts_sequence(
                        [v0 + divider_offset[0], v0 - divider_offset[1]], start_i, **out_kwargs
                    )

            if display_start_symbol:
-                assert triangle_head is not None
                start_i = add_verts_sequence([v + v0 for v in triangle_head], start_i, **out_kwargs, closed=True)

            if display_end_circle:
-                assert circle_head is not None
                start_i = add_verts_sequence([v + v1 for v in circle_head], start_i, **out_kwargs, closed=True)
                # circle middle divider
                if not display_end_symbol:
@@ -1634,11 +1588,9 @@ class SectionDecorator(BaseDecorator):
                    )

            if display_end_symbol:
-                assert triangle_head is not None
                start_i = add_verts_sequence([v + v1 for v in triangle_head], start_i, **out_kwargs, closed=True)

            if connect_markers:
-                assert edge_dir_circle is not None
                gap = []
                gap.append(edge_dir_circle if display_start_symbol else Vector((0, 0, 0)))
                gap.append(edge_dir_circle if display_end_symbol else Vector((0, 0, 0)))
@@ -1725,12 +1677,6 @@ class CutDecorator:
        selected_elements_color = self.addon_prefs.decorator_color_selected
        self.fallback_colour = (0.3, 0.3, 0.3, 1)

-        # Evaluate camera movement once per redraw rather than twice per object: is_camera_moved()
-        # runs eval()/numpy on the camera matrix and, as a side effect, refreshes the stored
-        # checksum on the first True result - so calling it per object also made the second call
-        # (fill) see an already-updated checksum and skip recalculating when it shouldn't.
-        self.camera_moved = self.is_camera_moved()
-
        all_vertices = []
        all_edges = []
        selected_vertices = []
@@ -1856,35 +1802,23 @@ class CutDecorator:

        # Currently selected objects must be recalculated as they may be being moved / edited.
        # If the camera is selected, we also recalculate as the user may be moving the camera.
-        is_selected = obj.select_get()
-        recalc_cut = not has_cut_cache or is_selected or self.camera_moved
-        recalc_fill = not has_fill_cache or is_selected or self.camera_moved
-        if not (recalc_cut or recalc_fill):
-            return

-        # The intersection test builds a bmesh and scans every vertex; both recalculations need
-        # the same answer, so compute it once here rather than once in each.
-        is_intersecting = tool.Drawing.is_intersecting_camera(obj, context.scene.camera)
-        if recalc_cut:
-            self.recalculate_cut(context, obj, element, is_intersecting)
-        if recalc_fill:
-            self.recalculate_fill(context, obj, element, is_intersecting)
+        if not has_cut_cache or obj.select_get() or self.is_camera_moved():
+            self.recalculate_cut(context, obj, element)
+        if not has_fill_cache or obj.select_get() or self.is_camera_moved():
+            self.recalculate_fill(context, obj, element)

-    def recalculate_cut(
-        self, context, obj: bpy.types.Object, element: ifcopenshell.entity_instance, is_intersecting: bool
-    ) -> None:
-        if is_intersecting:
+    def recalculate_cut(self, context, obj: bpy.types.Object, element: ifcopenshell.entity_instance) -> None:
+        if tool.Drawing.is_intersecting_camera(obj, context.scene.camera):
            verts, edges = tool.Drawing.bisect_mesh(obj, context.scene.camera)
            DecoratorData.cut_cache[element.id()] = (verts, edges)
        else:
            DecoratorData.cut_cache[element.id()] = (False, False)

-    def recalculate_fill(
-        self, context, obj: bpy.types.Object, element: ifcopenshell.entity_instance, is_intersecting: bool
-    ) -> None:
+    def recalculate_fill(self, context, obj: bpy.types.Object, element: ifcopenshell.entity_instance) -> None:
        element_id = element.id()

-        if not is_intersecting:
+        if not tool.Drawing.is_intersecting_camera(obj, context.scene.camera):
            DecoratorData.fill_cache[element_id] = {}
            return

@@ -1937,8 +1871,6 @@ class CutDecorator:
            layer_set = material
            offset = 0
            sense_factor = 1
-        else:
-            assert False, material

        if len(layer_set.MaterialLayers) == 1:
            material = layer_set.MaterialLayers[0].Material
@@ -1965,8 +1897,6 @@ class CutDecorator:
            co = Vector((0.0, 0.0, offset))
            no = tool.Drawing.get_extrusion_vector(element).normalized()
            no = Vector([1.0, 0.0, 0.0])
-        else:
-            assert False, usage
        no *= sense_factor
        last_i = len(layer_set.MaterialLayers) - 1

@@ -2160,8 +2090,4 @@ class DecorationsHandler:

        object_decorators = DecoratorData.data.get("object_decorators", [])
        for obj, decorator in object_decorators:
-            try:
-                decorator.decorate(context, obj)
-            except ReferenceError:
-                DecoratorData.is_loaded = False
-                break
+            decorator.decorate(context, obj)
@@ -2297,19 +2297,6 @@ DISC = (
    (1.0, 0.0, 0),
 )

-# Anchor index currently being edited by SetDimensionAnchor (-1 = none).
-_active_anchor_idx: int = -1
-# The annotation curve object being edited (kept so the gizmo group stays
-# visible even when SetDimensionAnchor temporarily changes the active object).
-_editing_annotation_obj = None
-
-
-def set_active_anchor(idx: int, annotation_obj=None) -> None:
-    global _active_anchor_idx, _editing_annotation_obj
-    _active_anchor_idx = idx
-    _editing_annotation_obj = annotation_obj if idx >= 0 else None
-
-
 X3DISC = (
    (0.0, 0.0, 0.0),
    (1.0, 0.0, 0),
@@ -2634,370 +2621,6 @@ class ExtrusionWidget(types.GizmoGroup):
        self.handle.target_set_prop("offset", prop, "value")
        self.guides.target_set_prop("depth", prop, "value")

-
-class GizmoAnchorHandle(bpy.types.Gizmo):
-    """Visual-only dot at a parametric dimension vertex.
-
-    No draw_select/invoke — draw_select puts the gizmo in Blender's select buffer
-    and causes the gizmo system to consume clicks even without an explicit invoke,
-    blocking ClickNearestDimensionAnchor from receiving them.  All click handling
-    is done by the bim.click_nearest_dimension_anchor keymap operator.
-    """
-
-    bl_idname = "BIM_GT_anchor_handle"
-
-    __slots__ = ("anchor_index", "custom_shape")
-
-    def setup(self):
-        self.anchor_index = 0
-        self.custom_shape = self.new_custom_shape(type="TRIS", verts=X3DISC)
-
-    def draw(self, context):
-        self.draw_custom_shape(self.custom_shape)
-
-
-
-class DimensionAnchorWidget(types.GizmoGroup):
-    """Anchor handle gizmos at each vertex of the active parametric dimension.
-
-    Green dots indicate vertices that are anchored to an IFC element face;
-    orange dots are free world-point anchors.  Clicking any dot fires
-    ``bim.set_dimension_anchor`` pre-targeted at that vertex index.
-    """
-
-    bl_idname = "BIM_GGT_dimension_anchors"
-    bl_label = "Dimension Anchor Handles"
-    bl_space_type = "VIEW_3D"
-    bl_region_type = "WINDOW"
-    bl_options = {"3D", "PERSISTENT", "SHOW_MODAL_ALL"}
-
-    _DIM_TYPES = frozenset(("DIMENSION", "RADIUS", "DIAMETER", "ANGLE", "PLAN_LEVEL", "SECTION_LEVEL"))
-    _MAX_ANCHORS = 16
-
-    @classmethod
-    def poll(cls, context: bpy.types.Context) -> bool:
-        if not tool.Ifc.get():
-            return False
-        # Stay visible while SetDimensionAnchor is running (active obj may temporarily
-        # be an IFC element in the face-picking phase rather than the annotation).
-        if _active_anchor_idx >= 0 and _editing_annotation_obj is not None:
-            active = context.active_object
-            if active is _editing_annotation_obj:
-                return True  # annotation still active
-            if active is not None and tool.Ifc.get_entity(active) is not None:
-                return True  # face-picking phase: active obj is a target element
-            # Active object is None or a non-IFC object — the modal ended without
-            # calling set_active_anchor(-1).  Reset stale state and fall through.
-            set_active_anchor(-1)
-        obj = context.active_object
-        if not obj or obj.type != "CURVE":
-            return False
-        if not obj.select_get():
-            return False
-        element = tool.Ifc.get_entity(obj)
-        if not element or not element.is_a("IfcAnnotation"):
-            return False
-        import ifcopenshell.util.element as _ue
-        if _ue.get_predefined_type(element) not in cls._DIM_TYPES:
-            return False
-        pset = _ue.get_pset(element, "BBIM_Dimension")
-        return bool(pset and pset.get("Anchors"))
-
-    def setup(self, context: bpy.types.Context) -> None:
-        self._handles: list = []
-        for _ in range(self._MAX_ANCHORS):
-            gz = self.gizmos.new("BIM_GT_anchor_handle")
-            gz.scale_basis = 0.2
-            gz.use_draw_modal = True
-            gz.hide = True
-            self._handles.append(gz)
-
-    def refresh(self, context: bpy.types.Context) -> None:
-        import json
-        import ifcopenshell.util.element as _ue
-
-        obj = _editing_annotation_obj if _active_anchor_idx >= 0 and _editing_annotation_obj else context.active_object
-        if not obj or not obj.data or not getattr(obj.data, "splines", None):
-            for gz in self._handles:
-                gz.hide = True
-            return
-
-        element = tool.Ifc.get_entity(obj)
-        if not element:
-            for gz in self._handles:
-                gz.hide = True
-            return
-
-        pset = _ue.get_pset(element, "BBIM_Dimension")
-        if not pset or not pset.get("Anchors"):
-            for gz in self._handles:
-                gz.hide = True
-            return
-
-        try:
-            anchors = json.loads(pset["Anchors"])
-        except Exception:
-            for gz in self._handles:
-                gz.hide = True
-            return
-
-        spline = obj.data.splines[0]
-        n = min(len(spline.points), len(anchors), self._MAX_ANCHORS)
-
-        import ifcopenshell.util.element as _ue_gz
-        _ptype_gz = _ue_gz.get_predefined_type(element)
-        _is_elevation_gz = _ptype_gz in ("SECTION_LEVEL", "PLAN_LEVEL")
-
-        for i in range(n):
-            gz = self._handles[i]
-            if _is_elevation_gz:
-                # The object origin IS the anchor reference point (placed at face hit).
-                # Spline vertices are offset from the origin and should not be used.
-                world_co = obj.matrix_world.translation.copy()
-            else:
-                raw_co = spline.points[i].co
-                world_co = obj.matrix_world @ raw_co.to_3d()
-            gz.matrix_basis = Matrix.Translation(world_co)
-            gz.anchor_index = i
-            if i == _active_anchor_idx and obj is _editing_annotation_obj:
-                gz.color = (0.2, 0.7, 1.0)
-                gz.color_highlight = (0.4, 0.85, 1.0)
-            elif anchors[i].get("guid"):
-                gz.color = (0.2, 0.85, 0.2)
-                gz.color_highlight = (0.4, 1.0, 0.4)
-            else:
-                gz.color = (0.9, 0.6, 0.1)
-                gz.color_highlight = (1.0, 0.85, 0.2)
-            gz.alpha = 0.85
-            gz.alpha_highlight = 1.0
-            gz.hide = False
-
-        for i in range(n, self._MAX_ANCHORS):
-            self._handles[i].hide = True
-
-    def draw_prepare(self, context: bpy.types.Context) -> None:
-        self.refresh(context)
-
-
-class DimensionLinePositionWidget(types.GizmoGroup):
-    """Drag handle for the LinePosition of a parametric dimension annotation.
-
-    Shows two opposing cones at the midpoint of the dimension curve, oriented
-    along the horizontal offset axis (cross(world_Z, dim_direction)).  Dragging
-    either cone updates BBIM_Dimension.LinePosition and regenerates the curve in
-    real time.  The forward cone points in +offset_dir; the reverse cone in
-    -offset_dir — both respond to mouse movement along the shared axis so the
-    user can drag in either direction from either handle.
-    """
-
-    bl_idname = "BIM_GGT_dimension_line_position"
-    bl_label = "Dimension Line Position"
-    bl_space_type = "VIEW_3D"
-    bl_region_type = "WINDOW"
-    bl_options = {"3D", "PERSISTENT", "SHOW_MODAL_ALL"}
-
-    _DIM_TYPES = frozenset(("DIMENSION", "RADIUS", "DIAMETER", "ANGLE"))
-
-    @classmethod
-    def poll(cls, context: bpy.types.Context) -> bool:
-        if not tool.Ifc.get():
-            return False
-        obj = context.active_object
-        if not obj or obj.type != "CURVE":
-            return False
-        element = tool.Ifc.get_entity(obj)
-        if not element or not element.is_a("IfcAnnotation"):
-            return False
-        import ifcopenshell.util.element as _ue
-        if _ue.get_predefined_type(element) not in cls._DIM_TYPES:
-            return False
-        pset = _ue.get_pset(element, "BBIM_Dimension")
-        return bool(pset and pset.get("Anchors"))
-
-    # ------------------------------------------------------------------
-    # Helpers
-
-    @staticmethod
-    def _cam_dir() -> "Vector | None":
-        """Scene camera forward direction, or None."""
-        cam = bpy.context.scene.camera
-        if not cam:
-            return None
-        return (cam.matrix_world.to_3x3() @ Vector((0.0, 0.0, -1.0))).normalized()
-
-    @classmethod
-    def _offset_dir(cls, obj: bpy.types.Object) -> "Vector | None":
-        """World-space direction perpendicular to the dimension line and in the view plane.
-
-        Plan view  (camera mostly vertical): cross(world_Z, dim_dir) — preserves
-        existing stored LinePosition values.
-        Section/elevation (camera mostly horizontal): cross(cam_forward, dim_dir) —
-        keeps the offset axis inside the view plane so the gizmo moves the line
-        visually sideways (up/down in section) rather than into/out of the screen.
-        """
-        if not obj.data or not hasattr(obj.data, "splines") or not obj.data.splines:
-            return None
-        spline = obj.data.splines[0]
-        if len(spline.points) < 2:
-            return None
-        a = obj.matrix_world @ spline.points[0].co.to_3d()
-        b = obj.matrix_world @ spline.points[-1].co.to_3d()
-        dim = b - a
-        if dim.length < 1e-10:
-            return None
-        dim.normalize()
-        cam_view = cls._cam_dir()
-        cam_is_plan = (cam_view is None) or abs(cam_view.z) > 0.7
-        ref = Vector((0.0, 0.0, 1.0)) if cam_is_plan else cam_view
-        od = ref.cross(dim)
-        if od.length < 1e-6:
-            od = Vector((1.0, 0.0, 0.0)).cross(dim)
-        if od.length < 1e-6:
-            return None
-        return od.normalized()
-
-    @staticmethod
-    def _midpoint(obj: bpy.types.Object) -> "Vector":
-        spline = obj.data.splines[0]
-        pts = [obj.matrix_world @ p.co.to_3d() for p in spline.points]
-        return sum(pts, Vector()) / len(pts)
-
-    @staticmethod
-    def _basis(origin: "Vector", x_axis: "Vector") -> "Matrix":
-        """4×4 matrix with translation=origin, local-X=x_axis."""
-        ref = Vector((0.0, 0.0, 1.0)) if abs(x_axis.dot(Vector((0.0, 0.0, 1.0)))) < 0.9 else Vector((1.0, 0.0, 0.0))
-        y_ax = x_axis.cross(ref).normalized()
-        z_ax = x_axis.cross(y_ax)
-        return Matrix([
-            [x_axis.x, y_ax.x, z_ax.x, origin.x],
-            [x_axis.y, y_ax.y, z_ax.y, origin.y],
-            [x_axis.z, y_ax.z, z_ax.z, origin.z],
-            [0.0,      0.0,    0.0,    1.0],
-        ])
-
-    # ------------------------------------------------------------------
-    # Value callbacks
-
-    def _get_pos(self) -> float:
-        obj = bpy.context.active_object
-        if not obj:
-            return 0.0
-        element = tool.Ifc.get_entity(obj)
-        if not element:
-            return 0.0
-        import ifcopenshell.util.element as _ue
-        pset = _ue.get_pset(element, "BBIM_Dimension")
-        if not pset:
-            return 0.0
-        stored = pset.get("LinePosition")
-        if stored is not None:
-            return float(stored)
-        # Natural position: projection of midpoint onto offset axis
-        od = self._offset_dir(obj)
-        if od is None:
-            return 0.0
-        return self._midpoint(obj).dot(od)
-
-    def _set_pos(self, value: float) -> None:
-        bpy.ops.ed.undo_push(message="Set Line Position")
-        import json
-        import numpy as np
-        import ifcopenshell.util.element as _ue
-        import ifcopenshell.api.pset as _pset_api
-        import ifcopenshell.api.drawing as drawing_api
-        from bonsai.bim.module.drawing.operator import _update_blender_curve
-
-        obj = bpy.context.active_object
-        if not obj:
-            return
-        file = tool.Ifc.get()
-        if not file:
-            return
-        element = tool.Ifc.get_entity(obj)
-        if not element:
-            return
-        pset_data = _ue.get_pset(element, "BBIM_Dimension")
-        if not pset_data:
-            return
-
-        pset_entity = file.by_id(pset_data["id"])
-        _pset_api.edit_pset(file, pset=pset_entity, properties={"LinePosition": value})
-
-        anchors = json.loads(pset_data.get("Anchors") or "[]")
-        placement_override: dict = {}
-        for a in anchors:
-            guid = a.get("guid")
-            if not guid:
-                continue
-            try:
-                elem = file.by_guid(guid)
-                elem_obj = tool.Ifc.get_object(elem)
-                if elem_obj:
-                    placement_override[elem.id()] = np.array(elem_obj.matrix_world)
-            except Exception:
-                pass
-
-        cam_view = self._cam_dir()
-        cam_dir_tuple = tuple(cam_view) if cam_view is not None else None
-        resolved_pts = drawing_api.regenerate_dimension(
-            file, element, placement_override=placement_override, camera_dir=cam_dir_tuple
-        )
-        if resolved_pts:
-            _update_blender_curve(element, resolved_pts)
-        tool.Blender.update_viewport()
-
-    # ------------------------------------------------------------------
-    # GizmoGroup interface
-
-    def _make_cone(self, color: tuple, highlight: tuple) -> "bpy.types.Gizmo":
-        gz = self.gizmos.new("BIM_GT_gizmo_cone")
-        gz.color = color
-        gz.alpha = 0.8
-        gz.color_highlight = highlight
-        gz.alpha_highlight = 1.0
-        gz.scale_basis = 0.15
-        gz.use_draw_modal = True
-        gz.prop_name = "Line Position"
-        gz.move_get_cb = self._get_pos
-        gz.move_set_cb = self._set_pos
-        gz.gizmo_group = self
-        gz.delta_scale = 1.0
-        return gz
-
-    def setup(self, context: bpy.types.Context) -> None:
-        color = (0.9, 0.6, 0.1)
-        highlight = (1.0, 0.9, 0.2)
-        self.gz_fwd = self._make_cone(color, highlight)
-        self.gz_rev = self._make_cone(color, highlight)
-
-    def refresh(self, context: bpy.types.Context) -> None:
-        obj = context.active_object
-        if not obj:
-            self.gz_fwd.hide = self.gz_rev.hide = True
-            return
-
-        od = self._offset_dir(obj)
-        if od is None:
-            self.gz_fwd.hide = self.gz_rev.hide = True
-            return
-
-        mid = self._midpoint(obj)
-        # Lift each cone off the dimension line so the arrow base doesn't
-        # overlap anchor dots.  0.3 m gives clear separation at typical zoom.
-        _GAP = 0.15
-        fwd_origin = mid + _GAP * od
-        rev_origin = mid - _GAP * od
-
-        self.gz_fwd.matrix_basis = self._basis(fwd_origin, od)
-        self.gz_fwd.axis = od.copy()
-        self.gz_fwd.hide = False
-
-        # Reverse cone: visually points in -od; same drag axis so both cones
-        # respond identically — drag toward either tip to move the line.
-        self.gz_rev.matrix_basis = self._basis(rev_origin, -od)
-        self.gz_rev.axis = od.copy()
-        self.gz_rev.hide = False
-
    @staticmethod
    def get_scale_value(system: str, length_unit: str) -> float:
        scale_value = 1
@@ -3022,76 +2645,6 @@ class DimensionLinePositionWidget(types.GizmoGroup):
        return scale_value


-class DimensionDriveLabelWidget(types.GizmoGroup):
-    """Pen-icon gizmos at each segment midpoint of the active parametric dimension.
-
-    Clicking a pen invokes ``bim.drive_dimension_length`` for that segment,
-    opening a dialog pre-filled with the current length.
-    """
-
-    bl_idname = "BIM_GGT_dimension_drive_label"
-    bl_label = "Dimension Drive Label"
-    bl_space_type = "VIEW_3D"
-    bl_region_type = "WINDOW"
-    bl_options = {"3D", "PERSISTENT", "SHOW_MODAL_ALL"}
-
-    _DIM_TYPES = frozenset(("DIMENSION", "RADIUS", "DIAMETER", "ANGLE"))
-    _MAX_SEGMENTS = 15
-
-    @classmethod
-    def poll(cls, context: bpy.types.Context) -> bool:
-        if not tool.Ifc.get():
-            return False
-        obj = context.active_object
-        if not obj or obj.type != "CURVE":
-            return False
-        element = tool.Ifc.get_entity(obj)
-        if not element or not element.is_a("IfcAnnotation"):
-            return False
-        import ifcopenshell.util.element as _ue
-        if _ue.get_predefined_type(element) not in cls._DIM_TYPES:
-            return False
-        pset = _ue.get_pset(element, "BBIM_Dimension")
-        return bool(pset and pset.get("Anchors"))
-
-    def setup(self, context: bpy.types.Context) -> None:
-        self._labels: list = []
-        for _ in range(self._MAX_SEGMENTS):
-            gz = self.gizmos.new("BIM_GT_drive_dim_label")
-            gz.color = (0.9, 0.75, 0.1)
-            gz.color_highlight = (1.0, 0.95, 0.3)
-            gz.alpha = 0.85
-            gz.alpha_highlight = 1.0
-            gz.scale_basis = 0.18
-            gz.use_draw_modal = True
-            gz.hide = True
-            self._labels.append(gz)
-
-    def refresh(self, context: bpy.types.Context) -> None:
-        obj = context.active_object
-        if not obj or not obj.data or not getattr(obj.data, "splines", None) or not obj.data.splines:
-            for gz in self._labels:
-                gz.hide = True
-            return
-
-        spline = obj.data.splines[0]
-        pts = [obj.matrix_world @ p.co.to_3d() for p in spline.points]
-        n_segs = min(len(pts) - 1, self._MAX_SEGMENTS)
-
-        for i in range(n_segs):
-            gz = self._labels[i]
-            mid = (pts[i] + pts[i + 1]) * 0.5
-            gz.matrix_basis = Matrix.Translation(mid)
-            gz.segment_index = i
-            gz.hide = False
-
-        for i in range(n_segs, self._MAX_SEGMENTS):
-            self._labels[i].hide = True
-
-    def draw_prepare(self, context: bpy.types.Context) -> None:
-        self.refresh(context)
-
-
 # ============================================================================
 # Core Gizmo Classes
 # ============================================================================
@@ -4058,24 +3611,6 @@ class GizmoPen(StaticTrisGizmoMixin, bpy.types.Gizmo):
    )


-class GizmoDriveDimLabel(bpy.types.Gizmo):
-    """Visual-only pen icon at a parametric dimension segment midpoint.
-
-    No draw_select/invoke — click handling is done by ClickNearestDimensionAnchor,
-    which dispatches bim.drive_dimension_length on a plain LMB at a midpoint.
-    """
-
-    bl_idname = "BIM_GT_drive_dim_label"
-    __slots__ = ("segment_index", "custom_shape")
-
-    def setup(self):
-        self.segment_index = 0
-        self.custom_shape = self.new_custom_shape("TRIS", GizmoPen.tris)
-
-    def draw(self, context):
-        self.draw_custom_shape(self.custom_shape)
-
-
 class GizmoValidate(StaticTrisGizmoMixin, bpy.types.Gizmo):
    """Validate/checkmark icon gizmo for confirming edits."""

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

-import json
-
 import bpy
-import numpy as np
 from bpy.app.handlers import persistent

 import bonsai.bim.module.drawing.decoration as decoration
 import bonsai.tool as tool

-# ---------------------------------------------------------------------------
-# Parametric dimension auto-regeneration state
-# ---------------------------------------------------------------------------
-
-# Maps element GUID → list of annotation STEP IDs that reference it.
-_dim_guid_index: dict = {}
-# Persistent tessellation cache for the depsgraph handler (element id → shape).
-_dim_shape_cache: dict = {}
-# Set True whenever BBIM_Dimension anchors change or a new file loads.
-_dim_index_dirty: bool = True
-# Re-entry guard so curve updates don't trigger a second handler call.
-_dim_handler_running: bool = False
-
-
-def invalidate_dim_index() -> None:
-    """Mark the GUID index as stale so it is rebuilt on the next handler call."""
-    global _dim_index_dirty, _dim_shape_cache
-    _dim_index_dirty = True
-    _dim_shape_cache.clear()
-
-
-def _rebuild_dim_guid_index(file) -> None:
-    global _dim_guid_index, _dim_index_dirty
-    import ifcopenshell.util.element
-
-    _dim_guid_index = {}
-    for annotation in file.by_type("IfcAnnotation"):
-        pset_data = ifcopenshell.util.element.get_pset(annotation, "BBIM_Dimension")
-        if not pset_data or not pset_data.get("Anchors"):
-            continue
-        try:
-            anchors = json.loads(pset_data["Anchors"])
-        except Exception:
-            continue
-        ann_id = annotation.id()
-        for anchor in anchors:
-            guid = anchor.get("guid")
-            if not guid:
-                continue
-            ids = _dim_guid_index.setdefault(guid, [])
-            if ann_id not in ids:
-                ids.append(ann_id)
-    _dim_index_dirty = False
-
-
-def regenerate_dims_for_layer(file, layer) -> None:
-    """Regenerate all parametric dimensions anchored to elements that use *layer*."""
-    global _dim_shape_cache, _dim_index_dirty, _dim_guid_index
-
-    if _dim_index_dirty:
-        _rebuild_dim_guid_index(file)
-
-    affected_guids: set = set()
-    for layer_set in file.get_inverse(layer):
-        if not layer_set.is_a("IfcMaterialLayerSet"):
-            continue
-        for inv in file.get_inverse(layer_set):
-            if inv.is_a("IfcRelAssociatesMaterial"):
-                rels = [inv]
-            elif inv.is_a("IfcMaterialLayerSetUsage"):
-                rels = [r for r in file.get_inverse(inv) if r.is_a("IfcRelAssociatesMaterial")]
-            else:
-                continue
-            for rel in rels:
-                for element in rel.RelatedObjects:
-                    if hasattr(element, "GlobalId"):
-                        affected_guids.add(element.GlobalId)
-                        _dim_shape_cache.pop(element.id(), None)
-
-    if not affected_guids:
-        return
-
-    annotation_ids: set = set()
-    for guid in affected_guids:
-        for ann_id in _dim_guid_index.get(guid, []):
-            annotation_ids.add(ann_id)
-
-    if not annotation_ids:
-        return
-
-    import ifcopenshell.util.element
-    import ifcopenshell.api.drawing as drawing_api
-    import ifcopenshell.geom
-    from bonsai.bim.module.drawing.operator import _update_blender_curve
-
-    geom_settings = ifcopenshell.geom.settings()
-    geom_settings.set("APPLY_DEFAULT_MATERIALS", False)
-
-    cam = bpy.context.scene.camera
-    cam_dir_tuple = None
-    if cam:
-        from mathutils import Vector as _Vec
-        cam_dir_tuple = tuple((cam.matrix_world.to_3x3() @ _Vec((0, 0, -1))).normalized())
-
-    for ann_id in annotation_ids:
-        try:
-            annotation = file.by_id(ann_id)
-        except Exception:
-            continue
-        pset = ifcopenshell.util.element.get_pset(annotation, "BBIM_Dimension")
-        if not pset:
-            continue
-        placement_override: dict = {}
-        try:
-            anchors_raw = json.loads(pset.get("Anchors") or "[]")
-            for anchor in anchors_raw:
-                guid = anchor.get("guid")
-                if not guid:
-                    continue
-                try:
-                    elem = file.by_guid(guid)
-                    elem_obj = tool.Ifc.get_object(elem)
-                    if elem_obj:
-                        placement_override[elem.id()] = np.array(elem_obj.matrix_world)
-                except Exception:
-                    pass
-        except Exception:
-            pass
-        resolved_pts = drawing_api.regenerate_dimension(
-            file,
-            annotation,
-            settings=geom_settings,
-            shape_cache=_dim_shape_cache,
-            placement_override=placement_override,
-            camera_dir=cam_dir_tuple,
-        )
-        if resolved_pts:
-            _update_blender_curve(annotation, resolved_pts)
-

@persistent
 def load_post(*args):
-    invalidate_dim_index()
    props = tool.Drawing.get_document_props()
    if props.should_draw_decorations:
        decoration.DecorationsHandler.install(bpy.context)
@@ -194,193 +61,3 @@ def set_active_camera_resolution(scene: bpy.types.Scene) -> None:
        raster_x, raster_y = props.update_camera_resolution()
        scene_render.resolution_x = raster_x
        scene_render.resolution_y = raster_y
-
-
-def _sync_dimension_anchors_to_curve(file, annotation, obj) -> bool:
-    """Sync BBIM_Dimension.Anchors length to match the curve's spline point count.
-
-    Called when the user adds or removes vertices from a dimension annotation in
-    Edit Mode.  New vertices get a free WORLD-type anchor at their current world
-    position; removed tail vertices simply lose their anchor entries.
-
-    Returns True if the pset was changed.
-    """
-    import ifcopenshell.util.element
-    import ifcopenshell.api.pset
-
-    if not obj.data or not getattr(obj.data, "splines", None) or not obj.data.splines:
-        return False
-
-    pset_data = ifcopenshell.util.element.get_pset(annotation, "BBIM_Dimension")
-    if not pset_data or not pset_data.get("Anchors"):
-        return False
-
-    try:
-        anchors: list = json.loads(pset_data["Anchors"])
-    except Exception:
-        return False
-
-    spline = obj.data.splines[0]
-    spline_world = [obj.matrix_world @ p.co.to_3d() for p in spline.points]
-    n_pts = len(spline_world)
-    n_anchors = len(anchors)
-
-    if n_pts == n_anchors:
-        return False
-
-    # Match each spline point to the nearest unused anchor by proximity.
-    # This handles insertions (subdivide) and deletions correctly regardless
-    # of where in the polyline the edit happened.
-    _MATCH_THRESH_SQ = 1e-4  # 1 cm² — distinguishes existing pts from new midpoints
-    used: set = set()
-    new_anchors: list = []
-
-    for pt in spline_world:
-        best_idx, best_sq = None, float("inf")
-        for i, anc in enumerate(anchors):
-            if i in used:
-                continue
-            stored = anc.get("pt")
-            if not stored:
-                continue
-            dx, dy, dz = stored[0] - pt.x, stored[1] - pt.y, stored[2] - pt.z
-            sq = dx * dx + dy * dy + dz * dz
-            if sq < best_sq:
-                best_sq, best_idx = sq, i
-        if best_idx is not None and best_sq < _MATCH_THRESH_SQ:
-            new_anchors.append(anchors[best_idx])
-            used.add(best_idx)
-        else:
-            new_anchors.append({
-                "guid": None,
-                "type": "WORLD",
-                "addr": {},
-                "hint": None,
-                "pt": [pt.x, pt.y, pt.z],
-            })
-
-
-    pset_entity = file.by_id(pset_data["id"])
-    ifcopenshell.api.pset.edit_pset(file, pset=pset_entity, properties={"Anchors": json.dumps(new_anchors)})
-    invalidate_dim_index()
-    return True
-
-
-@persistent
-def depsgraph_update_post_handler(scene, depsgraph):
-    """Auto-regenerate parametric dimensions when referenced elements are moved."""
-    global _dim_handler_running, _dim_index_dirty, _dim_guid_index, _dim_shape_cache
-
-    if _dim_handler_running:
-        return
-
-    file = tool.Ifc.get()
-    if not file:
-        return
-
-    if _dim_index_dirty:
-        _rebuild_dim_guid_index(file)
-
-    import ifcopenshell.util.element
-
-    moved_guids: set = set()
-    edited_annotation_ids: set = set()
-
-    for update in depsgraph.updates:
-        obj = update.id
-        if not isinstance(obj, bpy.types.Object):
-            continue
-        if not (update.is_updated_transform or update.is_updated_geometry):
-            continue
-        element = tool.Ifc.get_entity(obj)
-        if element is None or not hasattr(element, "GlobalId"):
-            continue
-
-
-        if update.is_updated_geometry and obj.type == "CURVE" and element.is_a("IfcAnnotation"):
-            import ifcopenshell.util.element as _ue
-            ptype = _ue.get_predefined_type(element)
-            if ptype in ("DIMENSION", "RADIUS", "DIAMETER", "ANGLE"):
-                changed = _sync_dimension_anchors_to_curve(file, element, obj)
-                if changed:
-                    edited_annotation_ids.add(element.id())
-                continue
-
-        moved_guids.add(element.GlobalId)
-        if update.is_updated_geometry:
-            _dim_shape_cache.pop(element.id(), None)
-
-    annotation_ids: set = set(edited_annotation_ids)
-    for guid in moved_guids:
-        for ann_id in _dim_guid_index.get(guid, []):
-            annotation_ids.add(ann_id)
-
-    if not annotation_ids:
-        return
-
-    import ifcopenshell.api.drawing as drawing_api
-    import ifcopenshell.geom
-    from bonsai.bim.module.drawing.operator import _update_blender_curve, _update_elevation_marker_z
-
-    geom_settings = ifcopenshell.geom.settings()
-    geom_settings.set("APPLY_DEFAULT_MATERIALS", False)
-
-    cam = bpy.context.scene.camera
-    cam_dir_tuple = None
-    if cam:
-        from mathutils import Vector as _Vec
-        cam_dir_tuple = tuple((cam.matrix_world.to_3x3() @ _Vec((0, 0, -1))).normalized())
-
-    _dim_handler_running = True
-    try:
-        for ann_id in annotation_ids:
-            try:
-                annotation = file.by_id(ann_id)
-            except Exception:
-                continue
-
-            pset = ifcopenshell.util.element.get_pset(annotation, "BBIM_Dimension")
-            if not pset:
-                continue
-
-            placement_override: dict = {}
-            try:
-                anchors_raw = json.loads(pset.get("Anchors") or "[]")
-                for anchor in anchors_raw:
-                    guid = anchor.get("guid")
-                    if not guid:
-                        continue
-                    try:
-                        elem = file.by_guid(guid)
-                        elem_id = elem.id()
-                        if elem_id in placement_override:
-                            continue
-                        elem_obj = tool.Ifc.get_object(elem)
-                        if elem_obj:
-                            placement_override[elem_id] = np.array(elem_obj.matrix_world)
-                    except Exception:
-                        pass
-            except Exception:
-                pass
-
-            ptype = ifcopenshell.util.element.get_predefined_type(annotation)
-            if ptype in ("SECTION_LEVEL", "PLAN_LEVEL"):
-                _update_elevation_marker_z(
-                    file, annotation,
-                    settings=geom_settings,
-                    shape_cache=_dim_shape_cache,
-                    placement_override=placement_override,
-                )
-            else:
-                resolved_pts = drawing_api.regenerate_dimension(
-                    file,
-                    annotation,
-                    settings=geom_settings,
-                    shape_cache=_dim_shape_cache,
-                    placement_override=placement_override,
-                    camera_dir=cam_dir_tuple,
-                )
-                if resolved_pts:
-                    _update_blender_curve(annotation, resolved_pts)
-    finally:
-        _dim_handler_running = False
@@ -170,7 +170,6 @@ def format_distance(
    precision=None,
    decimal_places=None,
    suppress_zero_inches=False,
-    suppress_zero_feet=False,
    in_unit_length=False,
    custom_unit=None,
 ):
@@ -226,11 +225,9 @@ def format_distance(
            unit_system, unit_length, unit_fraction = unit_mapping[custom_unit]

    value *= unit_scale
-    tx_dist = None

    # Imperial Formatting
    if unit_system == "IMPERIAL":
-        toInches = None
        if in_unit_length:
            if unit_length == "INCHES":
                toInches = 1
@@ -244,7 +241,6 @@ def format_distance(
            toInches = 1550
            inPerFoot = 144

-        assert toInches is not None
        decInches = value * toInches
        decFeet = decInches / 12

@@ -320,10 +316,10 @@ def format_distance(
            tx_dist = ""
            if feet:
                tx_dist += str(feet) + "'"
-            if not feet and not add_inches and not suppress_zero_feet:
+            if not feet and not add_inches:
                tx_dist += str(feet) + "'"

-            if not feet and add_inches and unit_length != "INCHES" and not suppress_zero_feet:
+            if not feet and add_inches and unit_length != "INCHES":
                if value < 0:
                    tx_dist += "-0' - "
                else:
@@ -387,7 +383,6 @@ def format_distance(
        if precision and isinstance(precision, float):
            value = precision * round(float(value) / precision)

-        fmt = None
        if decimal_places is not None:
            fmt = "%1." + str(decimal_places) + "f"

@@ -470,7 +465,6 @@ def format_distance(
        assert f"Unexpected unit_system - '{unit_system}'."
        # tx_dist = fmt % value

-    assert tx_dist is not None
    return tx_dist


@@ -95,17 +95,6 @@ def update_diagram_scale(self: "BIMCameraProperties", context: bpy.types.Context
    ifcopenshell.api.pset.edit_pset(tool.Ifc.get(), pset=pset, properties=diagram_scale)
    self.update_camera_resolution()

-    group = tool.Drawing.get_drawing_group(element)
-    print(f"[SECTION] update_diagram_scale: camera={camera.name}, group={group}")
-    if group:
-        for annotation in tool.Drawing.get_group_elements(group) or []:
-            print(f"[SECTION] checking group member: {annotation}")
-            if annotation.is_a("IfcAnnotation") and ifcopenshell.util.element.get_predefined_type(annotation) == "SECTION":
-                ann_obj = tool.Ifc.get_object(annotation)
-                print(f"[SECTION] found SECTION annotation, ann_obj={ann_obj}")
-                if ann_obj:
-                    tool.Drawing.update_section_endpoints(ann_obj, camera)
-

 def update_is_nts(self: "BIMCameraProperties", context: bpy.types.Context) -> None:
    if not self.update_props:
@@ -420,12 +409,6 @@ class DocProperties(PropertyGroup):
        options=set(),
    )
    is_editing_drawings: BoolProperty(name="Is Editing Drawings", default=False)
-    show_drawings_on_sheets_only: BoolProperty(
-        name="Show Only Drawings on Sheets",
-        description="Only show drawings that are placed on a sheet",
-        default=False,
-        options=set(),
-    )
    is_editing_schedules: BoolProperty(name="Is Editing Schedules", default=False)
    is_editing_references: BoolProperty(name="Is Editing References", default=False)
    target_view: EnumProperty(
@@ -456,7 +439,6 @@ class DocProperties(PropertyGroup):
        should_use_annotation_cache: bool
        should_draw_linked_projects: bool
        is_editing_drawings: bool
-        show_drawings_on_sheets_only: bool
        is_editing_schedules: bool
        is_editing_references: bool
        target_view: Literal["PLAN_VIEW", "ELEVATION_VIEW", "SECTION_VIEW", "REFLECTED_PLAN_VIEW", "MODEL_VIEW"]
@@ -554,50 +536,6 @@ class BIMCameraProperties(PropertyGroup):
        default=True,
        update=get_update_layer_callback("has_annotation", "HasAnnotation"),
    )
-    use_edge_classification: BoolProperty(
-        name="Use Edge Classification",
-        description="Classify projection edges into boundary/outline/sharp/crease/flush "
-        "instead of drawing all linework identically. See edge-classification.md",
-        default=False,
-        update=get_update_layer_callback("use_edge_classification", "UseEdgeClassification"),
-    )
-    render_creases: BoolProperty(
-        name="Render Creases",
-        description="Render 'crease' (concave) projection edges",
-        default=True,
-        update=get_update_layer_callback("render_creases", "RenderCreases"),
-    )
-    valley_angle_min_degrees: FloatProperty(
-        name="Valley Angle Minimum",
-        description="Minimum concave dihedral deviation from flat, in degrees, for a projection "
-        "edge to be classified as 'crease' rather than 'flush'",
-        default=12.0,
-        min=0.0,
-        max=180.0,
-        update=get_update_layer_callback("valley_angle_min_degrees", "ValleyAngleMinDegrees"),
-    )
-    render_sharp: BoolProperty(
-        name="Render Sharp",
-        description="Render 'sharp' (convex) projection edges",
-        default=True,
-        update=get_update_layer_callback("render_sharp", "RenderSharp"),
-    )
-    ridge_angle_min_degrees: FloatProperty(
-        name="Ridge Angle Minimum",
-        description="Minimum convex dihedral deviation from flat, in degrees, for a projection "
-        "edge to be classified as 'sharp' rather than 'flush'",
-        default=45.0,
-        min=0.0,
-        max=180.0,
-        update=get_update_layer_callback("ridge_angle_min_degrees", "RidgeAngleMinDegrees"),
-    )
-    render_flush: BoolProperty(
-        name="Render Flush",
-        description="Render 'flush' projection edges (dihedral deviation below both ridge/valley "
-        "thresholds). Omitted by default",
-        default=False,
-        update=get_update_layer_callback("render_flush", "RenderFlush"),
-    )
    target_view: EnumProperty(
        name="Target View",
        default="PLAN_VIEW",
@@ -1049,182 +987,6 @@ def update_sheet_data(self, context):
    SheetsData.is_loaded = False


-def _update_force_perpendicular(self, context):
-    """Apply ForcePerpendicularToFace to all selected dimension annotations and regenerate them."""
-    import json
-    import numpy as np
-    import ifcopenshell.util.element
-    import ifcopenshell.api.pset
-    import ifcopenshell.api.drawing as drawing_api
-    import bonsai.tool as tool
-
-    file = tool.Ifc.get()
-    if not file:
-        return
-
-    new_value = self.force_perpendicular_to_face
-    _DIM_TYPES = frozenset(("DIMENSION", "RADIUS", "DIAMETER", "ANGLE"))
-
-    targets = []
-    for obj in context.selected_objects:
-        element = tool.Ifc.get_entity(obj)
-        if not element or not element.is_a("IfcAnnotation"):
-            continue
-        if ifcopenshell.util.element.get_predefined_type(element) not in _DIM_TYPES:
-            continue
-        pset_data = ifcopenshell.util.element.get_pset(element, "BBIM_Dimension")
-        if not pset_data:
-            continue
-        targets.append((obj, element, pset_data))
-
-    if not targets:
-        return
-
-    from bonsai.bim.module.drawing.operator import _update_blender_curve
-
-    for obj, element, pset_data in targets:
-        pset_entity = file.by_id(pset_data["id"])
-        ifcopenshell.api.pset.edit_pset(file, pset=pset_entity, properties={"ForcePerpendicularToFace": new_value})
-
-        anchors = json.loads(pset_data.get("Anchors") or "[]")
-        placement_override = {}
-        for a in anchors:
-            guid = a.get("guid")
-            if not guid:
-                continue
-            try:
-                elem = file.by_guid(guid)
-                elem_obj = tool.Ifc.get_object(elem)
-                if elem_obj:
-                    placement_override[elem.id()] = np.array(elem_obj.matrix_world)
-            except Exception:
-                pass
-
-        resolved_pts = drawing_api.regenerate_dimension(file, element, placement_override=placement_override)
-        if resolved_pts:
-            _update_blender_curve(element, resolved_pts)
-
-
-def _get_line_position(self) -> float:
-    """Return LinePosition from the active annotation's BBIM_Dimension pset.
-
-    Falls back to the natural anchor projection when LinePosition has not been
-    explicitly set, so the field always shows a meaningful value.
-    """
-    import math
-    import json
-    try:
-        import bpy as _bpy
-        import ifcopenshell.util.element as _ue
-        import bonsai.tool as _tool
-        obj = getattr(_bpy.context, "active_object", None)
-        if obj:
-            element = _tool.Ifc.get_entity(obj)
-            if element and element.is_a("IfcAnnotation"):
-                pset = _ue.get_pset(element, "BBIM_Dimension")
-                if pset:
-                    stored = pset.get("LinePosition")
-                    if stored is not None:
-                        return float(stored)
-                    raw = pset.get("Anchors")
-                    if raw:
-                        anchors = json.loads(raw)
-                        if len(anchors) >= 2 and anchors[0].get("pt") and anchors[1].get("pt"):
-                            a, b = anchors[0]["pt"], anchors[1]["pt"]
-                            dx, dy, dz = b[0] - a[0], b[1] - a[1], b[2] - a[2]
-                            m = math.sqrt(dx * dx + dy * dy + dz * dz)
-                            if m > 1e-10:
-                                ddx, ddy, ddz = dx / m, dy / m, dz / m
-                                cam = _bpy.context.scene.camera
-                                cam_is_plan = True
-                                cvx, cvy, cvz = 0.0, 0.0, 1.0
-                                if cam:
-                                    from mathutils import Vector as _Vec
-                                    cv = (cam.matrix_world.to_3x3() @ _Vec((0, 0, -1))).normalized()
-                                    cvx, cvy, cvz = cv.x, cv.y, cv.z
-                                    cam_is_plan = abs(cvz) > 0.7
-                                if cam_is_plan:
-                                    # cross(world_Z, dim_dir)
-                                    ox, oy, oz = -ddy, ddx, 0.0
-                                else:
-                                    # cross(cam_dir, dim_dir)
-                                    ox = cvy * ddz - cvz * ddy
-                                    oy = cvz * ddx - cvx * ddz
-                                    oz = cvx * ddy - cvy * ddx
-                                om = math.sqrt(ox * ox + oy * oy + oz * oz)
-                                if om > 1e-6:
-                                    od = (ox / om, oy / om, oz / om)
-                                    pt = anchors[0]["pt"]
-                                    return float(pt[0] * od[0] + pt[1] * od[1] + pt[2] * od[2])
-    except Exception:
-        pass
-    return 0.0
-
-
-def _set_line_position(self, value: float) -> None:
-    """Write LinePosition to all selected dimension annotations and regenerate."""
-    import json
-    import numpy as np
-    import ifcopenshell.util.element
-    import ifcopenshell.api.pset
-    import ifcopenshell.api.drawing as drawing_api
-    import bonsai.tool as tool
-
-    file = tool.Ifc.get()
-    if not file:
-        return
-
-    _DIM_TYPES = frozenset(("DIMENSION", "RADIUS", "DIAMETER", "ANGLE"))
-
-    targets = []
-    import bpy as _bpy
-    for obj in getattr(_bpy.context, "selected_objects", []):
-        element = tool.Ifc.get_entity(obj)
-        if not element or not element.is_a("IfcAnnotation"):
-            continue
-        if ifcopenshell.util.element.get_predefined_type(element) not in _DIM_TYPES:
-            continue
-        pset_data = ifcopenshell.util.element.get_pset(element, "BBIM_Dimension")
-        if not pset_data:
-            continue
-        targets.append((obj, element, pset_data))
-
-    if not targets:
-        return
-
-    from bonsai.bim.module.drawing.operator import _update_blender_curve
-
-    cam = _bpy.context.scene.camera
-    cam_dir_tuple = None
-    if cam:
-        from mathutils import Vector as _Vec
-        cam_dir_tuple = tuple((cam.matrix_world.to_3x3() @ _Vec((0, 0, -1))).normalized())
-
-    for obj, element, pset_data in targets:
-        pset_entity = file.by_id(pset_data["id"])
-        ifcopenshell.api.pset.edit_pset(file, pset=pset_entity, properties={"LinePosition": value})
-
-        anchors = json.loads(pset_data.get("Anchors") or "[]")
-        placement_override = {}
-        for a in anchors:
-            guid = a.get("guid")
-            if not guid:
-                continue
-            try:
-                elem = file.by_guid(guid)
-                elem_obj = tool.Ifc.get_object(elem)
-                if elem_obj:
-                    placement_override[elem.id()] = np.array(elem_obj.matrix_world)
-            except Exception:
-                pass
-
-        resolved_pts = drawing_api.regenerate_dimension(
-            file, element, placement_override=placement_override, camera_dir=cam_dir_tuple
-        )
-        if resolved_pts:
-            _update_blender_curve(element, resolved_pts)
-
-
 class BIMAnnotationProperties(PropertyGroup):
    object_type: bpy.props.EnumProperty(
        name="Annotation Object Type", items=annotation_classes, default="TEXT", update=update_annotation_object_type
@@ -1238,19 +1000,6 @@ class BIMAnnotationProperties(PropertyGroup):
    )
    is_adding_type: bpy.props.BoolProperty(default=False)
    type_name: bpy.props.StringProperty(name="Name", default="TYPEX")
-    force_perpendicular_to_face: bpy.props.BoolProperty(
-        name="Force ⊥ to Face",
-        description="Constrain dimension vertices to the face normal of the first anchor. When dimensions are selected, toggling this updates them all.",
-        default=False,
-        update=_update_force_perpendicular,
-    )
-    line_position: bpy.props.FloatProperty(
-        name="Line Position",
-        description="Absolute world position of the dimension line along the horizontal axis perpendicular to the dimension. The line is held at this fixed global coordinate even when the measured geometry moves. Updates all selected dimensions.",
-        unit="LENGTH",
-        get=_get_line_position,
-        set=_set_line_position,
-    )
    tag_rotation_mode: bpy.props.EnumProperty(
        name="Tag Rotation Mode",
        description="How to orient the tag relative to the tagged object",
@@ -110,14 +110,12 @@ class Scheduler:
        y = self.margin
        rows = list(sheet.iter_rows())
        total_rows = len(rows)
-        x = None
        for i, row in enumerate(rows):
            # The last row may contain only null values
            if i == (total_rows - 1) and not [c for c in row if c.value is not None]:
                continue

            x = self.margin
-            unmerged_height = None
            for cell in row:
                if isinstance(cell, openpyxl.cell.cell.MergedCell):
                    column_letter = openpyxl.utils.get_column_letter(cell.column)
@@ -232,11 +230,8 @@ class Scheduler:
                )

                x += unmerged_width
-
-            assert unmerged_height is not None
            y += unmerged_height

-        assert x is not None
        total_width = x + self.margin
        total_height = y + self.margin
        self.svg["width"] = "{}mm".format(total_width)
@@ -380,7 +375,6 @@ class Scheduler:
        tri = 0
        stop_iterating_over_rows = False
        # TODO: row spans support?
-        x = None
        for tr in table.getElementsByType(TableRow):
            if stop_iterating_over_rows:
                break
@@ -497,7 +491,6 @@ class Scheduler:
                tri += 1
                y += height

-        assert x is not None
        total_width = x + self.margin
        total_height = y + self.margin
        self.svg["width"] = "{}mm".format(total_width)
@@ -102,16 +102,16 @@ void angle_circle_head(
    in vec4 circle_start, in float circle_angle,
    in bool counterclockwise,
    out vec4 head[CIRCLE_SEGS+1], out float angle_segs) {
-
+    
    // 1 added to CIRCLE_SEGS because we're number of vertices
    // for n segments is n+1
-
+    
    float angle_d;
    angle_d = PI * 2 / CIRCLE_SEGS; // 30d
    // need to bottom clamp it to 1, otherwise it causes Blender crash at extruding the curve
    angle_segs = max(1, ceil(circle_angle / angle_d));
    angle_d = circle_angle / angle_segs;
-
+    
    for(int i = 0; i < (angle_segs + 1); i++) {
        float angle = angle_d * i;
        if (counterclockwise) {
@@ -143,7 +143,7 @@ void cross_head(in vec4 dir, in float size, out vec4 head[3]) {
 #define do_vertex(pos, e) (do_vertex_util(pos, vec2(-(e).y, (e).x) / winsize.xy))
 #define do_vertex_win(pos, e) ( do_vertex( WIN2CLIP( pos ), e ) )

-// if vertex is shared by two segments of the line still need to emit it twice
+// if vertex is shared by two segments of the line still need to emit it twice 
 // to avoid smoothing artifacts
 // don't forget to initialize `vec2 EDGE_DIR` for macro to work
 // `pos0` / `pos1` - vertex position in clip space
@@ -197,13 +197,10 @@ void do_circle_head(vec4 pos_w, vec4 head[CIRCLE_SEGS]) {

 def add_verts_sequence(verts, start_i, output_verts, output_edges, closed=False):
    """Add sequence of verts to output lists, returns next vertex index"""
-    i = None
    for i, v in enumerate(verts[:-1], start_i):
        output_verts.append(v)
        output_edges.append((i, i + 1))
    output_verts.append(verts[-1])
-    assert i is not None
-
    if closed:
        output_edges.append((i + 1, start_i))
    return i + 2
@@ -276,7 +273,7 @@ class BaseShader:
    FRAG_GLSL = """
    uniform vec4 color;
    uniform float lineWidth;
-
+    
    in float smoothline;
    out vec4 fragColor;
    void main() {
@@ -872,11 +872,7 @@ class SvgWriter:

        v1 = self.project_point_onto_camera(obj.matrix_world @ Vector((0, 0, 0)))
        v2 = self.project_point_onto_camera(obj.matrix_world @ Vector((0, 0, -1)))
-        delta = (v2 - v1).xy
-        if delta.length <= 1e-6:
-            v2 = self.project_point_onto_camera(obj.matrix_world @ Vector((1, 0, 0)))
-            delta = (v2 - v1).xy
-        angle = -math.degrees(delta.angle_signed(Vector((0, 1)))) if delta.length > 1e-6 else 90.0
+        angle = -math.degrees((v2 - v1).xy.angle_signed(Vector((0, 1))))

        transform = "rotate({}, {}, {})".format(angle, *symbol_position_svg.xy)

@@ -899,8 +895,6 @@ class SvgWriter:
        reference_id = "-"
        sheet_id = "-"
        drawing = tool.Drawing.get_annotation_element(element)
-        if not drawing:
-            return ("-", "-")
        reference = tool.Drawing.get_drawing_reference(drawing)
        if reference:
            for sheet_reference in tool.Ifc.get().by_type("IfcDocumentReference"):
@@ -1373,18 +1367,14 @@ class SvgWriter:

            def get_text():
                radius = (points[-1].co - points[-2].co).length
-                units_to_format = dimension_data["custom_units"] if dimension_data["custom_units"] else [None]
-                parts = [
-                    helper.format_distance(
-                        radius,
-                        precision=self.precision,
-                        decimal_places=self.decimal_places,
-                        suppress_zero_feet=dimension_data["suppress_zero_feet"],
-                        custom_unit=unit,
-                    )
-                    for unit in units_to_format
-                ]
-                return "R" + dimension_data["separator"].join(str(p) for p in parts)
+                radius = helper.format_distance(
+                    radius,
+                    precision=self.precision,
+                    decimal_places=self.decimal_places,
+                    custom_unit=dimension_data["custom_unit"],
+                )
+                text = f"R{radius}"
+                return text

            self.draw_dimension_text(
                get_text, tag, dimension_data, text_position=text_position, class_str="RADIUS", box_alignment="center"
@@ -1459,7 +1449,6 @@ class SvgWriter:
                    angle_tg = rise / run
                    angle = round(degrees(atan(angle_tg)))
                else:
-                    angle_tg = None
                    angle = 90

                # ues SLOPE_ANGLE as default
@@ -1473,7 +1462,6 @@ class SvgWriter:
                elif object_type == "SLOPE_PERCENT":
                    if angle == 90:
                        return "-"
-                    assert angle_tg is not None
                    return f"{round(angle_tg * 100)} %"

            tag = element.Description or get_label_text()
@@ -1511,12 +1499,10 @@ class SvgWriter:
                    text_format=lambda x: "D" + x,
                    show_description_only=dimension_data["show_description_only"],
                    suppress_zero_inches=dimension_data["suppress_zero_inches"],
-                    suppress_zero_feet=dimension_data["suppress_zero_feet"],
                    text_prefix=dimension_data["text_prefix"],
                    text_suffix=dimension_data["text_suffix"],
                    fill_bg=dimension_data["fill_bg"],
-                    custom_units=dimension_data["custom_units"],
-                    separator=dimension_data["separator"],
+                    custom_unit=dimension_data["custom_unit"],
                )

    def draw_dimension_annotations(self, obj: bpy.types.Object) -> None:
@@ -1527,15 +1513,11 @@ class SvgWriter:
        dimension_data = DecoratorData.get_dimension_data(obj)

        assert isinstance(obj.data, bpy.types.Curve)
-        is_ordinate = dimension_data["is_ordinate"]
        for spline in obj.data.splines:
            points = self.get_spline_points(spline)
-            ordinate_total = 0.0
            for i in range(len(points) - 1):
                v0_global = matrix_world @ points[i].co.xyz
                v1_global = matrix_world @ points[i + 1].co.xyz
-                if is_ordinate:
-                    ordinate_total += (v1_global - v0_global).length
                self.draw_dimension_annotation(
                    v0_global,
                    v1_global,
@@ -1543,13 +1525,10 @@ class SvgWriter:
                    dimension_text=dimension_text,
                    show_description_only=dimension_data["show_description_only"],
                    suppress_zero_inches=dimension_data["suppress_zero_inches"],
-                    suppress_zero_feet=dimension_data["suppress_zero_feet"],
                    text_prefix=dimension_data["text_prefix"],
                    text_suffix=dimension_data["text_suffix"],
                    fill_bg=dimension_data["fill_bg"],
-                    custom_units=dimension_data["custom_units"],
-                    separator=dimension_data["separator"],
-                    distance_override=ordinate_total if is_ordinate else None,
+                    custom_unit=dimension_data["custom_unit"],
                )

    def draw_measureit_arch_dimension_annotations(self) -> None:
@@ -1573,13 +1552,10 @@ class SvgWriter:
        text_format=lambda x: x,
        show_description_only=False,
        suppress_zero_inches=False,
-        suppress_zero_feet=False,
        text_prefix="",
        text_suffix="",
        fill_bg=False,
-        custom_units=None,
-        separator=" / ",
-        distance_override=None,
+        custom_unit=None,
    ) -> None:
        offset = Vector([self.raw_width, self.raw_height]) / 2
        v0 = self.project_point_onto_camera(v0_global)
@@ -1592,10 +1568,7 @@ class SvgWriter:
        sheet_dimension = (end - start).length

        # if annotation can't fit offset text to the right of marker
-        if distance_override is not None:
-            text_position = end
-        else:
-            text_position = mid if sheet_dimension > 5 else (end + (3 * vector.normalized()))
+        text_position = mid if sheet_dimension > 5 else (end + (3 * vector.normalized()))
        angle = math.degrees(vector.angle_signed(Vector((1, 0))))

        line = self.svg.line(start=start, end=end, class_=" ".join(classes))
@@ -1610,20 +1583,15 @@ class SvgWriter:
        }

        if not show_description_only:
-            dimension = distance_override if distance_override is not None else (v1_global - v0_global).length
-            units_to_format = custom_units if custom_units else [None]
-            parts = [
-                helper.format_distance(
-                    dimension,
-                    precision=self.precision,
-                    decimal_places=self.decimal_places,
-                    suppress_zero_inches=suppress_zero_inches,
-                    suppress_zero_feet=suppress_zero_feet,
-                    custom_unit=unit,
-                )
-                for unit in units_to_format
-            ]
-            text = text_prefix + separator.join(str(p) for p in parts) + text_suffix
+            dimension = (v1_global - v0_global).length
+            dimension = helper.format_distance(
+                dimension,
+                precision=self.precision,
+                decimal_places=self.decimal_places,
+                suppress_zero_inches=suppress_zero_inches,
+                custom_unit=custom_unit,
+            )
+            text = text_prefix + str(dimension) + text_suffix
        else:
            if not dimension_text:
                return
@@ -1631,8 +1599,8 @@ class SvgWriter:

        text_tags += self.create_text_tag(
            text,
-            text_position + perpendicular + (Vector((0, 1.5)) if distance_override is not None else Vector((0, 0))),
-            box_alignment="bottom-right" if distance_override is not None else "bottom-middle",
+            text_position + perpendicular,
+            box_alignment="bottom-middle",
            multiline_to_bottom=False,
            **text_tag_kwargs,
        )
@@ -1640,8 +1608,8 @@ class SvgWriter:
        if not show_description_only and dimension_text:
            text_tags += self.create_text_tag(
                dimension_text,
-                text_position - perpendicular + (Vector((0, 1.5)) if distance_override is not None else Vector((0, 0))),
-                box_alignment="top-right" if distance_override is not None else "top-middle",
+                text_position - perpendicular,
+                box_alignment="top-middle",
                multiline_to_bottom=True,
                **text_tag_kwargs,
            )
@@ -113,19 +113,6 @@ class BIM_PT_camera(Panel):
            row.prop(props, "fill_mode")
            row = self.layout.row()
            row.prop(props, "cut_mode")
-
-        row = self.layout.row()
-        row.prop(props, "use_edge_classification")
-        if props.use_edge_classification:
-            row = self.layout.row()
-            row.prop(props, "render_creases")
-            row.prop(props, "valley_angle_min_degrees")
-            row = self.layout.row()
-            row.prop(props, "render_sharp")
-            row.prop(props, "ridge_angle_min_degrees")
-            row = self.layout.row()
-            row.prop(props, "render_flush")
-
        row = self.layout.row()
        row.prop(props, "width")
        row = self.layout.row()
@@ -332,8 +319,6 @@ class BIM_PT_drawings(Panel):

                row3.separator(factor=0.5, type="SPACE")

-                row3.operator("bim.copy_annotation_to_drawing", icon="PASTEDOWN", text="")
-
                row3.operator("bim.select_all_drawings", icon="CHECKBOX_HLT", text="")
                row3.operator("bim.create_drawing", text="", icon="OUTPUT")
                row3.operator("bim.convert_svg_to_dxf", text="", icon="SEQ_PREVIEW").view = active_drawing.name
@@ -341,7 +326,6 @@ class BIM_PT_drawings(Panel):
            self.layout.template_list(
                "BIM_UL_drawinglist", "", self.props, "drawings", self.props, "active_drawing_index"
            )
-            self.layout.prop(self.props, "show_drawings_on_sheets_only")


 class BIM_PT_schedules(Panel):
@@ -555,17 +539,6 @@ class BIM_PT_product_assignments(Panel):

        assert self.layout
        assert (obj := context.active_object)
-
-        element = tool.Ifc.get_entity(obj)
-        if element and tool.Drawing.is_manual_drawing_reference(element):
-            row = self.layout.row(align=True)
-            fallback = "No Reference Assigned" if element.ObjectType == "REFERENCE" else "No Drawing Assigned"
-            row.label(
-                text=ProductAssignmentsData.data["relating_product"] or fallback, icon="IMAGE_DATA"
-            )
-            row.operator("bim.assign_manual_drawing_reference", icon="GREASEPENCIL", text="")
-            return
-
        props = tool.Drawing.get_object_assigned_product_props(obj)

        if props.is_editing_product:
@@ -583,8 +556,6 @@ class BIM_PT_product_assignments(Panel):
            col.enabled = bool(ProductAssignmentsData.data["relating_product"])


-
-
 def get_category_icon(category_name):
    """Get appropriate icon for each category"""
    icons = {
@@ -887,8 +858,8 @@ class BIM_UL_drawinglist(bpy.types.UIList):
            layout.label(text="", translate=False)
            return

+        row = layout.row(align=True)
        if item.is_drawing:
-            row = layout.row(align=True)
            row.label(text="", icon="BLANK1")
            selected_icon = "CHECKBOX_HLT" if item.is_selected else "CHECKBOX_DEHLT"
            row.prop(item, "is_selected", text="", icon=selected_icon, emboss=False)
@@ -909,9 +880,6 @@ class BIM_UL_drawinglist(bpy.types.UIList):
                    item.ifc_definition_id
                )
        else:
-            # Give category headers a distinct inset background so they stand out from drawing rows.
-            box = layout.box()
-            row = box.row(align=True)
            if item.target_view == "PLAN_VIEW":
                icon = "UV_FACESEL"
            elif item.target_view == "ELEVATION_VIEW":
@@ -932,55 +900,7 @@ class BIM_UL_drawinglist(bpy.types.UIList):
                op = row.operator("bim.toggle_target_view", text="", emboss=False, icon="DISCLOSURE_TRI_RIGHT")
                op.target_view = item.target_view
                op.option = "EXPAND"
-            group = tool.Drawing.get_visible_drawings_in_category(item.target_view)
-            all_selected = bool(group) and all(d.is_selected for d in group)
-            row.operator(
-                "bim.toggle_drawing_category_selection",
-                text="",
-                icon="CHECKBOX_HLT" if all_selected else "CHECKBOX_DEHLT",
-                emboss=False,
-            ).target_view = item.target_view
-            row.separator(factor=0.5, type="SPACE")
-            # Clicking the header name toggles expand/contract, same as the disclosure triangle.
-            op = row.operator("bim.toggle_target_view", text=item.name, icon=icon, emboss=False)
-            op.target_view = item.target_view
-            op.option = "CONTRACT" if item.is_expanded else "EXPAND"
-
-    def filter_items(self, context, data: DocProperties, propname: str):
-        drawings = getattr(data, propname)
-        helper_funcs = bpy.types.UI_UL_list
-
-        flt_flags = []
-        flt_neworder = []
-
-        if self.filter_name:
-            flt_flags = helper_funcs.filter_items_by_name(
-                self.filter_name,
-                self.bitflag_filter_item,
-                drawings,
-                "name",
-                reverse=self.use_filter_sort_reverse,
-            )
-        if not flt_flags:
-            flt_flags = [self.bitflag_filter_item] * len(drawings)
-
-        props = tool.Drawing.get_document_props()
-        if props.show_drawings_on_sheets_only:
-            ifc_file = tool.Ifc.get()
-            sheeted_ids = tool.Drawing.get_sheeted_drawing_ids()
-            # Target view headers are only shown if they contain a sheeted drawing.
-            sheeted_target_views = {
-                tool.Drawing.get_drawing_target_view(ifc_file.by_id(drawing_id)) for drawing_id in sheeted_ids
-            }
-            for i, item in enumerate(drawings):
-                if item.is_drawing:
-                    is_visible = item.ifc_definition_id in sheeted_ids
-                else:
-                    is_visible = item.target_view in sheeted_target_views
-                if not is_visible:
-                    flt_flags[i] &= ~self.bitflag_filter_item
-
-        return flt_flags, flt_neworder
+            row.prop(item, "name", text="", icon=icon, emboss=False)


 class BIM_UL_sheets(bpy.types.UIList):
@@ -1044,14 +964,14 @@ class BIM_UL_sheets(bpy.types.UIList):

        if self.filter_name:
            filter_name = self.filter_name.lower()
-            active_sheet_index = None
+            active_sheet = None
            for sheet in data.sheets:
                if sheet.is_sheet:
+                    active_sheet = sheet
                    active_sheet_index = len(flt_flags)
                if filter_name in sheet.name.lower() or filter_name in sheet.identification.lower():
                    flt_flags.append(self.bitflag_filter_item)
                    if not sheet.is_sheet:
-                        assert active_sheet_index is not None
                        flt_flags[active_sheet_index] = self.bitflag_filter_item
                else:
                    flt_flags.append(0)
@@ -114,11 +114,7 @@ class AnnotationTool(WorkSpaceTool):
    bl_description = "Gives you Annotation related superpowers"
    bl_icon = os.path.join(os.path.dirname(__file__), "ops.authoring.annotation")
    bl_widget = None
-    bl_keymap = (
-        # Before view3d.select: tool keymaps take priority over the addon keymap
-        # where ClickNearestDimensionAnchor is also registered.
-        ("bim.click_nearest_dimension_anchor", {"type": "LEFTMOUSE", "value": "PRESS"}, None),
-    ) + tool.Blender.get_default_selection_keypmap() + (
+    bl_keymap = tool.Blender.get_default_selection_keypmap() + (
        ("bim.annotation_hotkey", {"type": "A", "value": "PRESS", "shift": True}, {"properties": [("hotkey", "S_A")]}),
        ("bim.annotation_hotkey", {"type": "C", "value": "PRESS", "shift": True}, {"properties": [("hotkey", "S_C")]}),
        ("bim.annotation_hotkey", {"type": "E", "value": "PRESS", "shift": True}, {"properties": [("hotkey", "S_E")]}),
@@ -225,67 +221,10 @@ class AnnotationToolUI:
        props = tool.Drawing.get_document_props()
        row.prop(props, "should_draw_decorations", text="Viewport Annotations")

-    _DIMENSION_TYPES = frozenset(("DIMENSION", "RADIUS", "DIAMETER", "ANGLE"))
-    _ELEVATION_TYPES = frozenset(("SECTION_LEVEL", "PLAN_LEVEL"))
-
    @classmethod
    def draw_edit_object_interface(cls, context):
-        obj = bpy.context.active_object
-        if tool.Ifc.get_entity(obj) and DecoratorData.get_text_data(obj):
+        if DecoratorData.get_text_data(bpy.context.active_object):
            add_layout_hotkey_operator(cls.layout, "Edit Text", "S_E", "")
-        if bpy.ops.bim.copy_annotation_to_drawing.poll():
-            row = cls.layout.row(align=True)
-            row.operator("bim.copy_annotation_to_drawing", icon="PASTEDOWN", text="Copy To Drawing")
-
-        obj = context.active_object
-        element = tool.Ifc.get_entity(obj) if obj else None
-        if element and element.is_a("IfcAnnotation"):
-            ptype = ifcopenshell.util.element.get_predefined_type(element)
-            if ptype in cls._DIMENSION_TYPES:
-                cls.layout.separator()
-                ann_props = tool.Drawing.get_annotation_props()
-                if ann_props.force_perpendicular_to_face:
-                    row = cls.layout.row(align=True)
-                    row.prop(ann_props, "line_position")
-                cls.layout.separator()
-                row = cls.layout.row(align=True)
-                op = row.operator("bim.regenerate_dimensions", icon="FILE_REFRESH", text="Regenerate")
-                op.active_only = True
-
-        obj = context.active_object
-        element = tool.Ifc.get_entity(obj) if obj else None
-        if element and element.is_a("IfcAnnotation"):
-            ptype = ifcopenshell.util.element.get_predefined_type(element)
-            if ptype in cls._DIMENSION_TYPES:
-                cls.layout.separator()
-                ann_props = tool.Drawing.get_annotation_props()
-                if ann_props.force_perpendicular_to_face:
-                    row = cls.layout.row(align=True)
-                    row.prop(ann_props, "line_position")
-                cls.layout.separator()
-                row = cls.layout.row(align=True)
-                op = row.operator("bim.regenerate_dimensions", icon="FILE_REFRESH", text="Regenerate")
-                op.active_only = True
-
-                pset = ifcopenshell.util.element.get_pset(element, "BBIM_Dimension")
-                if pset and pset.get("Anchors"):
-                    row = cls.layout.row(align=True)
-                    row.operator("bim.bake_parametric_dimension", text="Bake to Static", icon="UNLINKED")
-                else:
-                    row = cls.layout.row(align=True)
-                    row.operator("bim.make_dimension_parametric", text="Make Parametric", icon="LINKED")
-            elif ptype in cls._ELEVATION_TYPES:
-                cls.layout.separator()
-                pset = ifcopenshell.util.element.get_pset(element, "BBIM_Dimension")
-                if pset and pset.get("Anchors"):
-                    row = cls.layout.row(align=True)
-                    op = row.operator("bim.regenerate_dimensions", icon="FILE_REFRESH", text="Regenerate")
-                    op.active_only = True
-                    row = cls.layout.row(align=True)
-                    row.operator("bim.bake_parametric_dimension", text="Bake to Static", icon="UNLINKED")
-                else:
-                    row = cls.layout.row(align=True)
-                    row.operator("bim.make_dimension_parametric", text="Make Parametric", icon="LINKED")

    @classmethod
    def draw_type_selection_interface(cls):
@@ -309,11 +248,6 @@ class AnnotationToolUI:

        add_layout_hotkey_operator(cls.layout, "Add", "S_A", "Create a new annotation")

-        _DIMENSION_TYPES = {"DIMENSION", "RADIUS", "DIAMETER", "ANGLE"}
-        if object_type in _DIMENSION_TYPES:
-            row = cls.layout.row(align=True)
-            row.prop(cls.props, "force_perpendicular_to_face")
-
        if object_type in tool.Drawing.ANNOTATION_TYPES_SUPPORT_SETUP:
            row = cls.layout.row(align=True)
            row.label(text="", icon="DRIVER_ROTATIONAL_DIFFERENCE")
@@ -396,20 +330,8 @@ class Hotkey(bpy.types.Operator, tool.Ifc.Operator):
        if created_objects:
            bpy.context.view_layer.objects.active = created_objects[-1]

-    _PARAMETRIC_DIMENSION_TYPES = frozenset(
-        ("DIMENSION", "RADIUS", "DIAMETER", "ANGLE")
-    )
-    _ELEVATION_TYPES = frozenset(("SECTION_LEVEL", "PLAN_LEVEL"))
-
    def hotkey_S_A(self):
-        props = tool.Drawing.get_annotation_props()
-        if props.object_type in self._PARAMETRIC_DIMENSION_TYPES:
-            if bpy.ops.bim.draw_parametric_dimension.poll():
-                bpy.ops.bim.draw_parametric_dimension("INVOKE_DEFAULT")
-        elif props.object_type in self._ELEVATION_TYPES:
-            if bpy.ops.bim.add_elevation_annotation.poll():
-                bpy.ops.bim.add_elevation_annotation("INVOKE_DEFAULT")
-        elif bpy.ops.bim.add_annotation.poll():
+        if bpy.ops.bim.add_annotation.poll():
            bpy.ops.bim.add_annotation()

    def hotkey_S_E(self):
@@ -75,13 +75,9 @@ class Helper:
        for face in bm.faces:
            if len(face.verts) > 4:
                potential_faces.append(face)
-
-        # TODO: replace with next(..., None)
-        face = None
        for face in potential_faces:
            if face.normal.z < -0.1:
                break
-        assert face is not None

        profile = [l.vert.index for l in face.loops]
        extrusion = self.detect_extrusion_edge(bm, face)
@@ -112,12 +108,10 @@ class Helper:
        if not potential_faces:
            potential_faces = bm.faces

-        # TODO: replace with next(..., None)
-        face = None
        for face in potential_faces:
            if face.normal.z < -0.1:
                break
-        assert face is not None
+
        profile = [l.vert.index for l in face.loops]
        extrusion = self.detect_extrusion_edge(bm, face)

@@ -151,12 +145,9 @@ class Helper:
            if total_verts > 4:
                potential_faces.append(face)

-        # TODO: replace with next(..., None)
-        face = None
        for face in potential_faces:
            if face.normal.z < -0.1:
                break
-        assert face is not None

        end_faces = []
        end_face_normal = face.normal
@@ -1325,10 +1325,6 @@ class OverrideDuplicateMove(bpy.types.Operator):
        if new_active_obj:
            context.view_layer.objects.active = new_active_obj

-        if any(e.is_a("IfcAnnotation") for e in old_to_new):
-            import bonsai.bim.module.drawing.handler as _drawing_handler
-            _drawing_handler.invalidate_dim_index()
-
        return old_to_new


@@ -3531,15 +3527,12 @@ class EditRepresentationItemShapeAspect(bpy.types.Operator, tool.Ifc.Operator):
        if props.representation_item_shape_aspect == "NEW":
            active_representation = tool.Geometry.get_active_representation(obj)
            # find IfcProductRepresentationSelect based on current representation
-            product_shape = None
            if hasattr(element, "Representation"):  # IfcProduct
                product_shape = element.Representation
            else:  # IfcTypeProduct
                for representation_map in element.RepresentationMaps:
                    if representation_map.MappedRepresentation == active_representation:
                        product_shape = representation_map
-            assert product_shape is not None
-
            previous_shape_aspect_id = props.active_item.shape_aspect_id
            # will be None if item didn't had a shape aspect
            previous_shape_aspect = tool.Ifc.get_entity_by_id(previous_shape_aspect_id)
@@ -3889,8 +3882,6 @@ class AddSweptAreaSolidItem(bpy.types.Operator, tool.Ifc.Operator):
            curve = builder.rectangle(size=Vector((0.5, 0.5)) / unit_scale)
        elif self.shape == "CYLINDER":
            curve = builder.circle(radius=0.25 / unit_scale)
-        else:
-            assert False, self.shape
        item = builder.extrude(
            curve,
            magnitude=0.5 / unit_scale,
@@ -4128,31 +4119,6 @@ class OverrideMoveSelect(bpy.types.Operator):
                self.new_active_obj = obj
            return {"FINISHED"}

-        # Get arrays
-        ifc_file = tool.Ifc.get()
-        array_parents_to_move: list[bpy.types.Object] = []
-        for obj in list(context.selected_objects):
-            element = tool.Ifc.get_entity(obj)
-            if not element:
-                continue
-            pset = ifcopenshell.util.element.get_pset(element, "BBIM_Array")
-            if not pset:
-                continue
-            parent_element = ifc_file.by_guid(pset["Parent"])
-            parent_obj = tool.Ifc.get_object(parent_element)
-            if parent_obj not in array_parents_to_move:
-                array_parents_to_move.append(parent_obj)
-            if element.GlobalId != pset["Parent"]:
-                obj.select_set(False)
-
-        if array_parents_to_move:
-            for parent_obj in array_parents_to_move:
-                parent_element = tool.Ifc.get_entity(parent_obj)
-                for array_obj in tool.Array.get_all_objects(parent_element):
-                    array_obj.select_set(True)
-                self.new_active_obj = parent_obj
-            return {"FINISHED"}
-
        # Get nests
        props = tool.Nest.get_nest_props()
        not_editing_objs = [o.obj for o in props.not_editing_objects]
@@ -163,52 +163,14 @@ class AssignGroup(bpy.types.Operator, tool.Ifc.Operator):
    def _execute(self, context):
        if not self.is_assigning:
            return bpy.ops.bim.unassign_group(group=self.group)
-        ifc_file = tool.Ifc.get()
-        group = ifc_file.by_id(self.group)
        products = [
            element
            for o in tool.Blender.get_selected_objects(include_active=False)
            if (element := tool.Ifc.get_entity(o))
        ]
-        relocated_annotations = self.unassign_from_previous_drawing(ifc_file, group, products)
-        ifcopenshell.api.group.assign_group(ifc_file, products=products, group=group)
-        self.relocate_annotations_to_drawing(relocated_annotations, group)
+        ifcopenshell.api.group.assign_group(tool.Ifc.get(), products=products, group=tool.Ifc.get().by_id(self.group))
        self.report({"INFO"}, f"Assigned {len(products)} objects to group.")

-    def unassign_from_previous_drawing(self, ifc_file, group, products) -> list[ifcopenshell.entity_instance]:
-        """Assigning an annotation to a group that represents a drawing means the
-        annotation should belong to that drawing only, so it needs to leave
-        whichever drawing it was previously part of, instead of ending up
-        visible in both at once.
-        """
-        new_drawing = tool.Drawing.get_group_drawing(group)
-        if not new_drawing:
-            return []
-        relocated = []
-        for product in products:
-            if not product.is_a("IfcAnnotation") or product.ObjectType == "DRAWING":
-                continue
-            old_drawing = tool.Drawing.get_annotation_drawing(product)
-            if not old_drawing or old_drawing.id() == new_drawing.id():
-                continue
-            if old_group := tool.Drawing.get_drawing_group(old_drawing):
-                ifcopenshell.api.group.unassign_group(ifc_file, products=[product], group=old_group)
-            relocated.append(product)
-        return relocated
-
-    def relocate_annotations_to_drawing(self, products, group) -> None:
-        """Move the relocated annotations into the new drawing's collection and
-        depth, now that they have actually been assigned to its group.
-        """
-        if not products:
-            return
-        new_drawing = tool.Drawing.get_group_drawing(group)
-        new_camera = tool.Ifc.get_object(new_drawing) or tool.Drawing.import_drawing(new_drawing)
-        for product in products:
-            if obj := tool.Ifc.get_object(product):
-                tool.Drawing.ensure_annotation_in_drawing_plane(obj, camera=new_camera)
-                tool.Collector.assign(obj)
-

 class UnassignGroup(bpy.types.Operator, tool.Ifc.Operator):
    bl_idname = "bim.unassign_group"
@@ -156,7 +156,6 @@ class RadianceRender(bpy.types.Operator):
        print(f"Quality: {quality}, Detail: {detail}, Variability: {variability}")
        print(f"Output directory: {output_dir}")

-        hdr_image_path, hdr_mask_path, sky_map_cal_path = None, None
        if use_hdr:
            hdr_image = "noon_grass_2k.hdr"
            hdr_mask = "noon_grass_2k_mask.hdr"
@@ -255,9 +254,6 @@ class RadianceRender(bpy.types.Operator):
        # 4 0 0 -1 180

        if use_hdr and choose_hdr_image == "Noon":
-            assert hdr_image_path is not None
-            assert hdr_mask_path is not None
-            assert sky_map_cal_path is not None

            with open(sky_file_path, "w") as f:
                f.write(sky_description_str)
@@ -56,7 +56,6 @@ classes = (
    operator.RemoveMaterial,
    operator.RemoveMaterialSet,
    operator.RemoveProfile,
-    operator.RenameMaterial,
    operator.ReorderMaterialSetItem,
    operator.SelectByMaterial,
    operator.SelectMaterialInMaterialsUI,
@@ -102,26 +102,6 @@ class EditMaterial(bpy.types.Operator, tool.Ifc.Operator):
        core.edit_material(tool.Ifc, tool.Material, material=tool.Ifc.get().by_id(self.material))


-class RenameMaterial(bpy.types.Operator, tool.Ifc.Operator):
-    bl_idname = "bim.rename_material"
-    bl_label = "Rename Material"
-    bl_description = "Rename an IfcMaterial"
-    bl_options = {"REGISTER", "UNDO"}
-    material: bpy.props.IntProperty()
-    name: bpy.props.StringProperty(name="Name")
-
-    def invoke(self, context, event):
-        material = tool.Ifc.get().by_id(self.material)
-        self.name = material.Name or ""
-        return context.window_manager.invoke_props_dialog(self)
-
-    def draw(self, context):
-        self.layout.prop(self, "name")
-
-    def _execute(self, context):
-        core.rename_material(tool.Ifc, tool.Material, material=tool.Ifc.get().by_id(self.material), name=self.name)
-
-
 class DisableEditingMaterial(bpy.types.Operator):
    bl_idname = "bim.disable_editing_material"
    bl_label = "Disable Editing Material"
@@ -834,8 +814,6 @@ class EditMaterialSetItem(bpy.types.Operator, tool.Ifc.Operator):
            )
            slab.DumbSlabPlaner().regenerate_from_layer(layer)
            wall.DumbWallPlaner().regenerate_from_layer(layer)
-            from bonsai.bim.module.drawing.handler import regenerate_dims_for_layer
-            regenerate_dims_for_layer(self.file, layer)
        elif material.is_a("IfcMaterialProfileSet"):
            profile_def = None
            if mprops.profiles:
@@ -564,7 +564,6 @@ class SelectAllArrayObjects(bpy.types.Operator):
                    except RuntimeError:
                        self.report({"ERROR"}, f"Objects that don't have an array parent, were deselected.")
                        object.select_set(False)
-                        continue

                    array_objects = tool.Array.get_all_objects(parent_element)
                    tool.Blender.set_objects_selection(
@@ -93,30 +93,6 @@ def _stroke_lines_alpha(
    gpu.state.blend_set("NONE")


-def _connected_components(
-    vertex_groups: dict[int, list[bmesh.types.BMVert]],
-) -> list[list[bmesh.types.BMVert]]:
-    """Split each vertex group's members into their connected components,
-    since a duplicated arc/circle loop shares its source loop's group index."""
-    components = []
-    for verts in vertex_groups.values():
-        remaining = set(verts)
-        while remaining:
-            seed = remaining.pop()
-            stack = [seed]
-            component = [seed]
-            while stack:
-                v = stack.pop()
-                for edge in v.link_edges:
-                    other = edge.other_vert(v)
-                    if other in remaining:
-                        remaining.discard(other)
-                        stack.append(other)
-                        component.append(other)
-            components.append(component)
-    return components
-
-
 class ProfileDecorator:
    installed = None

@@ -289,7 +265,7 @@ class ProfileDecorator:
        # Draw arcs
        arc_centroids = []
        arc_segments = []
-        for arc in _connected_components(arcs):
+        for arc in arcs.values():
            if len(arc) != 3:
                continue
            sorted_arc = [None, None, None]
@@ -316,7 +292,7 @@ class ProfileDecorator:
        # Draw circles
        circle_centroids = []
        circle_segments = []
-        for circle in _connected_components(circles):
+        for circle in circles.values():
            if len(circle) != 2:
                continue
            p1 = obj.matrix_world @ circle[0].co
@@ -796,8 +772,6 @@ class PolylineDecorator(tool.Blender.ViewportDecorator):
        rv3d = region.data

        polyline_props = tool.Model.get_polyline_props()
-        if not polyline_props.snap_mouse_point:
-            return
        snap_prop = polyline_props.snap_mouse_point[0]
        mouse_point = Vector((snap_prop.x, snap_prop.y, snap_prop.z))

@@ -865,8 +839,6 @@ class PolylineDecorator(tool.Blender.ViewportDecorator):
        gpu.state.point_size_set(6)

        polyline_props = tool.Model.get_polyline_props()
-        if not polyline_props.snap_mouse_point:
-            return
        snap_prop = polyline_props.snap_mouse_point[0]
        # Point related to the mouse
        mouse_point = [Vector((snap_prop.x, snap_prop.y, snap_prop.z))]
@@ -408,8 +408,6 @@ class MEPGenerator:
                    compare = tool.Cad.is_x(requested_value, fitting_value, compare_precision)
                elif isinstance(fitting_value, list):
                    compare = tool.Cad.are_vectors_equal(requested_value, Vector(fitting_value), precision)
-                else:
-                    assert False, f"{key} {second_key}"
                return compare

            ignore_keys = []
@@ -478,13 +476,11 @@ class MEPGenerator:
            if predefined_type == "OBSTRUCTION":
                return packed_data

-            start_port = None
            for port in ports:
                port_local_position = V(*port.ObjectPlacement.RelativePlacement.Location.Coordinates)
                if tool.Cad.is_x(port_local_position.length, 0.0):
                    start_port = port
                    break
-            assert start_port is not None

            connected_port = tool.System.get_connected_port(start_port)
            connected_element = tool.System.get_port_relating_element(connected_port)
@@ -462,26 +462,14 @@ class PolylineOperator:
        self.tool_state.axis_method = None
        self.tool_state.plane_method = None
        self.tool_state.mode = "Mouse"
-        # Do not call clear_snap_objs() here — create_snap_obj() validates stale
-        # entries per-object (vertex count + position check), so the BVH cache can
-        # safely persist across invocations. Clearing it caused an 11-second stall
-        # on every Shift+A because SnapObj rebuilds a pure-Python BVH tree.
+        tool.Raycast.clear_snap_objs()
        self.visible_objs = tool.Raycast.get_visible_objects(context)
        for obj in self.visible_objs:
            if bbox_2d := tool.Raycast.get_on_screen_2d_bounding_boxes(context, obj):
                self.objs_2d_bbox.append(bbox_2d)
-        self._init_snapping_points(context, event)
+        detected_snaps = tool.Snap.detect_snapping_points(context, event, self.objs_2d_bbox, self.tool_state)
+        self.snapping_points = tool.Snap.select_snapping_points(context, event, self.tool_state, detected_snaps)
        tool.Polyline.calculate_distance_and_angle(context, self.input_ui, self.tool_state)

        tool.Blender.update_viewport()
        context.window_manager.modal_handler_add(self)
-
-    def _init_snapping_points(self, context: bpy.types.Context, event: bpy.types.Event) -> None:
-        """Populate self.snapping_points at operator start.
-
-        Override in subclasses to skip the full BVH snap detection when a cheap
-        placeholder is sufficient.  The default runs the full detection pass.
-        """
-        detected_snaps = tool.Snap.detect_snapping_points(context, event, self.objs_2d_bbox, self.tool_state)
-        self.snapping_points = tool.Snap.select_snapping_points(context, event, self.tool_state, detected_snaps)
-
@@ -325,7 +325,7 @@ class AddOccurrence(bpy.types.Operator, tool.Ifc.Operator):
        if self.from_invoke and str(self.relating_type_id) in AuthoringData.data["relating_type_id"]:
            props.relating_type_id = str(self.relating_type_id)

-        building_obj, building_element = None, None
+        building_obj = None
        if len(context.selected_objects) == 1 and context.active_object:
            building_obj = context.active_object
            building_element = tool.Ifc.get_entity(building_obj)
@@ -593,8 +593,6 @@ class DumbProfileJoiner:
            axisl = (profile2.matrix_world.inverted() @ axis1[1]) - (profile2.matrix_world.inverted() @ axis1[0])
        elif connection1 == "ATSTART":
            axisl = (profile2.matrix_world.inverted() @ axis1[0]) - (profile2.matrix_world.inverted() @ axis1[1])
-        else:
-            assert False, connection1
        xy_angle = degrees(Vector((1, 0)).angle_signed(axisl.normalized().to_2d()))
        if xy_angle >= -135 and xy_angle <= -45:
            closest_plane = "bottom"
@@ -619,8 +617,6 @@ class DumbProfileJoiner:
                axisl = (profile1.matrix_world.inverted() @ axis2[1]) - (profile1.matrix_world.inverted() @ axis2[0])
            elif connection2 == "ATSTART":
                axisl = (profile1.matrix_world.inverted() @ axis2[0]) - (profile1.matrix_world.inverted() @ axis2[1])
-            else:
-                assert False, connection2
            xy_angle2 = degrees(Vector((1, 0)).angle_signed(axisl.normalized().to_2d()))
            if xy_angle2 >= -135 and xy_angle2 <= -45:
                closest_plane2 = "bottom"
@@ -848,8 +844,6 @@ class DumbProfileJoiner:
            else:
                y_axis = obj.matrix_world.to_quaternion() @ Vector((0, 1, 0))
                z_axis = obj.matrix_world.to_quaternion() @ Vector((-1, 0, 0))
-        else:
-            assert False, plane
        return self.create_matrix(p, x_axis, y_axis, z_axis)

    def create_matrix(self, p: Vector, x: Vector, y: Vector, z: Vector) -> Matrix:
@@ -508,7 +508,6 @@ class EditSketchExtrusionProfile(bpy.types.Operator, tool.Ifc.Operator):
        converter.run()

        profile = tool.Ifc.get().createIfcArbitraryClosedProfileDef("AREA")
-        curve = None
        for path in converter.paths:
            points = []
            lines = path[0]
@@ -518,7 +517,6 @@ class EditSketchExtrusionProfile(bpy.types.Operator, tool.Ifc.Operator):
                points.append(tool.Ifc.get().createIfcCartesianPoint(local_point))
            points.append(points[0])
            curve = tool.Ifc.get().createIfcPolyline(points)
-        assert curve
        profile.OuterCurve = curve

        old_profile = extrusion.SweptArea
@@ -1577,7 +1577,6 @@ class DumbWallJoiner:
        # Get the ATEND connection from wall1 to use it in wall2
        relating_element = None
        connections = element1.ConnectedTo
-        relating_connection, description = ..., ...
        for conn in connections:
            if conn.is_a("IfcRelConnectsPathElements") and conn.RelatingConnectionType == "ATEND":
                relating_element = conn.RelatedElement
@@ -1592,7 +1591,6 @@ class DumbWallJoiner:
                description = conn.Description
                bonsai.core.geometry.remove_connection(tool.Geometry, connection=conn)
        if relating_element:
-            assert relating_connection is not ... and description is not ...
            ifcopenshell.api.geometry.connect_path(
                tool.Ifc.get(),
                relating_element=relating_element,
@@ -162,7 +162,7 @@ class ProjectLibraryData:
        library_file = IfcStore.library_file
        if library_file is None or library_file.schema == "IFC2X3":
            return results
-        root = library_file.by_type("IfcProject")[0]
+        root = tool.Project.get_root_context(library_file)
        results.append((str(root.id()), f"{root.is_a()} {root.Name or 'Unnamed'}", root.Description or ""))
        for library_id, data in cls.data["project_libraries"].items():
            results.append((str(library_id), data["Name"] or "Unnamed", data["Description"] or ""))
@@ -281,7 +281,7 @@ class RefreshLibrary(bpy.types.Operator):
        elements = {e for e in elements if not tool.Project.is_element_assigned_to_project_library(e, rels)}
        self.props.add_library_project_library("Unassigned", len(elements), 0, False)

-        root_context = library_file.by_type("IfcProject")[0]
+        root_context = tool.Project.get_root_context(library_file)
        hierarchy = tool.Project.get_project_hierarchy(library_file)
        tool.Project.load_project_libraries_to_ui(root_context, hierarchy)
        return {"FINISHED"}
@@ -714,8 +714,6 @@ class AppendLibraryElement(bpy.types.Operator, tool.Ifc.Operator):
            representations = element.RepresentationMaps or []
        elif element.is_a("IfcProduct"):
            representations = [element.Representation] if element.Representation else []
-        else:
-            assert False, element
        for representation in representations or []:
            for element in self.file.traverse(representation):
                if not element.is_a("IfcRepresentationItem") or not element.StyledByItem:
@@ -761,22 +759,21 @@ class EditProjectLibrary(bpy.types.Operator):
        attributes = bonsai.bim.helper.export_attributes(props.project_library_attributes)
        ifcopenshell.api.attribute.edit_attributes(library_file, project_library, attributes)

-        # Update parent library. Tear down the old IfcRelDeclares/IfcRelNests before
-        # creating the new one; a library must have exactly one of the two, never both.
+        # Update parent library.
        previous_parent_library = tool.Project.get_parent_library(project_library)
        new_parent_library = library_file.by_id(int(props.parent_library))
        if previous_parent_library != new_parent_library:
-            if previous_parent_library is not None:
-                if previous_parent_library.is_a("IfcProject"):
-                    ifcopenshell.api.project.unassign_declaration(
-                        library_file, [project_library], previous_parent_library
-                    )
-                else:
-                    ifcopenshell.api.nest.unassign_object(library_file, [project_library])
-            if new_parent_library.is_a("IfcProject"):
-                ifcopenshell.api.project.assign_declaration(library_file, [project_library], new_parent_library)
-            else:
+            if previous_parent_library is None:
+                # Edited library was a root in a library-only file; nest it under the new parent.
                ifcopenshell.api.nest.assign_object(library_file, [project_library], new_parent_library)
+            elif previous_parent_library.is_a("IfcProject"):
+                # Then new one is IfcProjectLibrary.
+                ifcopenshell.api.nest.assign_object(library_file, [project_library], new_parent_library)
+            else:  # Previous is IfcProjectLibrary.
+                ifcopenshell.api.nest.unassign_object(library_file, [project_library])
+                # If new one is IfcProject, then it's already assigned by default.
+                if new_parent_library.is_a("IfcProjectLibrary"):
+                    ifcopenshell.api.nest.assign_object(library_file, [project_library], new_parent_library)

        props.is_editing_project_library = False
        bpy.ops.bim.refresh_library()
@@ -810,9 +807,12 @@ class AddProjectLibrary(bpy.types.Operator):
        props = tool.Project.get_project_props()
        library_file = IfcStore.library_file
        assert library_file
-        root_context = library_file.by_type("IfcProject")[0]
+        root_context = tool.Project.get_root_context(library_file)
        project_library = ifcopenshell.api.root.create_entity(library_file, "IfcProjectLibrary")
-        ifcopenshell.api.project.assign_declaration(library_file, [project_library], root_context)
+        if root_context.is_a("IfcProject"):
+            ifcopenshell.api.project.assign_declaration(library_file, [project_library], root_context)
+        else:
+            ifcopenshell.api.nest.assign_object(library_file, [project_library], root_context)
        ProjectLibraryData.load()  # Update enum.
        props.selected_project_library = str(project_library.id())
        props.is_editing_project_library = True
@@ -1299,10 +1299,6 @@ class LoadProjectElements(bpy.types.Operator):
        tool.Project.set_default_modeling_dimensions()
        tool.Root.reload_grid_decorator()
        bonsai.bim.handler.refresh_ui_data()
-        for screen in bpy.data.screens:
-            for area in screen.areas:
-                if area.type == "VIEW_3D":
-                    bonsai.bim.handler.viewport_shading_changed_callback(area)
        return {"FINISHED"}

    def get_decomposition_elements(self) -> set[ifcopenshell.entity_instance]:
@@ -1580,13 +1576,10 @@ class LoadLink(bpy.types.Operator, tool.Ifc.Operator):
        json_filepath = self.filepath_.with_suffix(".ifc.cache.json")

        def should_clear_cache() -> bool:
-            # Nothing to clear if the cache file was never created (e.g. a
-            # fresh link). Check this first so os.remove below is never
-            # called on a non-existent path, regardless of use_cache.
-            if not blend_filepath.exists():
-                return False
            if not self.use_cache:
                return True
+            if not blend_filepath.exists():
+                return False
            data = json.loads(json_filepath.read_text())
            # Empty 'query' - model loaded without custom query.
            # Missing 'query' - model was loaded before custom queries were introduced in Bonsai.
@@ -2036,7 +2029,6 @@ class ExportIFC(bpy.types.Operator, ExportHelper):
        project_props = tool.Project.get_project_props()
        prefs = tool.Blender.get_addon_preferences()
        project_props.use_relative_project_path = self.use_relative_path
-        old_history_size, old_undo_steps = None, None
        if prefs.should_disable_undo_on_save:
            old_history_size = tool.Ifc.get().history_size
            old_undo_steps = context.preferences.edit.undo_steps
@@ -2044,7 +2036,6 @@ class ExportIFC(bpy.types.Operator, ExportHelper):
            context.preferences.edit.undo_steps = 0
        IfcStore.execute_ifc_operator(self, context)
        if prefs.should_disable_undo_on_save:
-            assert old_history_size is not None and old_undo_steps is not None
            tool.Ifc.get().history_size = old_history_size
            context.preferences.edit.undo_steps = old_undo_steps
        return {"FINISHED"}
@@ -88,44 +88,6 @@ class DisablePsetEditing(bpy.types.Operator, tool.Ifc.Operator):
        props.active_pset_type = "-"


-def _regenerate_parametric_dimension(file, annotation):
-    """Regenerate a single parametric dimension annotation after a pset edit."""
-    try:
-        import json
-        import numpy as np
-        import ifcopenshell.util.element
-        import ifcopenshell.api.drawing as drawing_api
-        import bonsai.tool as _tool
-        from bonsai.bim.module.drawing.operator import _update_blender_curve
-
-        pset_data = ifcopenshell.util.element.get_pset(annotation, "BBIM_Dimension")
-        if not pset_data or not pset_data.get("Anchors"):
-            return
-
-        anchors = json.loads(pset_data["Anchors"])
-        placement_override = {}
-        for a in anchors:
-            guid = a.get("guid")
-            if not guid:
-                continue
-            try:
-                elem = file.by_guid(guid)
-                elem_obj = _tool.Ifc.get_object(elem)
-                if elem_obj:
-                    placement_override[elem.id()] = np.array(elem_obj.matrix_world)
-            except Exception:
-                pass
-
-        resolved_pts = drawing_api.regenerate_dimension(
-            file, annotation, placement_override=placement_override
-        )
-        if resolved_pts:
-            _update_blender_curve(annotation, resolved_pts)
-    except Exception:
-        import traceback
-        traceback.print_exc()
-
-
 class EditPset(bpy.types.Operator, tool.Ifc.Operator):
    bl_idname = "bim.edit_pset"
    bl_label = "Edit Pset"
@@ -151,8 +113,6 @@ class EditPset(bpy.types.Operator, tool.Ifc.Operator):
        elif props.active_pset_type == "QTO":
            pset = ifcopenshell.api.pset.add_qto(self.file, product=element, name=props.active_pset_name)
            props.active_pset_id = pset.id()
-        else:
-            assert False

        if self.properties:
            properties = json.loads(self.properties)
@@ -190,12 +150,7 @@ class EditPset(bpy.types.Operator, tool.Ifc.Operator):
            )
            if tool.Cost.has_schedules():
                tool.Cost.update_cost_items(pset=pset)
-        is_bbim_dimension = props.active_pset_name == "BBIM_Dimension" and element.is_a("IfcAnnotation")
-
        bpy.ops.bim.disable_pset_editing(obj=self.obj, obj_type=self.obj_type)
-        if is_bbim_dimension:
-            _regenerate_parametric_dimension(self.file, element)
-
        tool.Blender.update_viewport()


@@ -228,8 +228,6 @@ def get_qto_name(self: "PsetProperties", context: bpy.types.Context) -> tool.Ble
    if "bpy.data.objects" in pset_type:
        if prop_type == "PsetProperties":
            results = get_object_qto_name(self, context)
-        else:
-            assert False
    elif prop_type == "TaskPsetProperties":
        results = get_task_qto_names(self, context)
    elif prop_type == "ResourcePsetProperties":
@@ -480,7 +480,6 @@ class BIM_PT_material_psets(Panel):
    def draw(self, context):
        assert self.layout
        props = tool.Material.get_material_props()
-        ifc_definition_id = None
        if material := props.active_material:
            ifc_definition_id = material.ifc_definition_id

@@ -104,7 +104,7 @@ def get_footing_length(o: bpy.types.Object) -> float:
        return get_length(o)
    if predefined_type == "FOOTING_BEAM" or predefined_type == "STRIP_FOOTING":
        return get_z(o)
-    elif predefined_type == "PAD_FOOTING" or predefined_type == "PILE_CAP":
+    elif predefined_type == "PAD_FOOTING":
        return max(get_x(o), get_y(o))
    else:
        return get_length(o)
@@ -197,26 +197,12 @@ def get_footing_height(o: bpy.types.Object) -> float:
        return get_height(o)
    if predefined_type == "FOOTING_BEAM" or predefined_type == "STRIP_FOOTING":
        return get_y(o)
-    elif predefined_type == "PAD_FOOTING" or predefined_type == "PILE_CAP":
+    elif predefined_type == "PAD_FOOTING":
        return get_z(o)
    else:
        return get_height(o)


-def get_footing_width(o: bpy.types.Object) -> float:
-    element = tool.Ifc.get_entity(o)
-    assert element
-    predefined_type = ifcopenshell.util.element.get_predefined_type(element)
-    if not predefined_type:
-        return get_width(o)
-    if predefined_type == "FOOTING_BEAM" or predefined_type == "STRIP_FOOTING":
-        return get_x(o)
-    elif predefined_type == "PAD_FOOTING" or predefined_type == "PILE_CAP":
-        return get_width(o)
-    else:
-        return get_width(o)
-
-
 def get_height(o: bpy.types.Object) -> float:
    """_summary_: Returns the height of the object bounding box

@@ -239,7 +225,7 @@ def get_opening_depth(obj: bpy.types.Object) -> float:
    if is_opening_horizontal(obj):
        return get_height(obj)
    else:
-        return get_y(obj)
+        return get_width(obj)


 def get_opening_mapping_area(obj: bpy.types.Object) -> float:
@@ -27,7 +27,6 @@ import ifcopenshell.api.material
 import ifcopenshell.api.pset
 import ifcopenshell.api.root
 import ifcopenshell.util.element
-import ifcopenshell.util.representation
 import ifcopenshell.util.schema
 import ifcopenshell.util.shape_builder
 import ifcopenshell.util.type
@@ -130,25 +129,13 @@ class ReassignClass(bpy.types.Operator, tool.Ifc.Operator):
            same_ifc_product = element.is_a(ifc_product)

            if not same_ifc_product:
-                # A spatial element (e.g. IfcSite) anchors the containment
-                # hierarchy, so only allow reassigning it to another family when
-                # it actually carries geometry - i.e. it's a real modelled thing
-                # (a bench dropped onto IfcSite -> IfcFurniture) rather than an
-                # empty spatial container we'd be turning into a loose element.
-                # IfcSpatialStructureElement covers IFC2X3, which has no
-                # IfcSpatialElement supertype.
-                is_spatial = element.is_a("IfcSpatialElement") or element.is_a("IfcSpatialStructureElement")
-                if is_spatial:
-                    has_geometry = (
-                        next(ifcopenshell.util.representation.get_representations_iter(element), None) is not None
+                if not (element.is_a("IfcElement") and ifc_product == "IfcElementType") and not (
+                    element.is_a("IfcElementType") and ifc_product == "IfcElement"
+                ):
+                    self.report(
+                        {"ERROR"}, f"Not supported class reassignment for object '{obj.name}' -> {ifc_product}."
                    )
-                    if not has_geometry:
-                        self.report(
-                            {"ERROR"},
-                            f"Cannot reassign '{obj.name}' ({element.is_a()}) to {ifc_product}: "
-                            "a spatial element can only be reassigned to another class when it has geometry.",
-                        )
-                        return {"CANCELLED"}
+                    return {"CANCELLED"}

            props = tool.Blender.get_object_bim_props(obj)
            props.is_reassigning_class = False
@@ -413,13 +400,12 @@ class UnlinkObject(bpy.types.Operator, tool.Ifc.Operator):
    skip_invoke: bpy.props.BoolProperty(default=False, options={"SKIP_SAVE"})

    def _execute(self, context):
-        objects: list[bpy.types.Object]
        if self.obj:
-            requested_obj = bpy.data.objects.get(self.obj)
-            objects = [requested_obj] if requested_obj is not None else []
+            objects = [bpy.data.objects.get(self.obj)]
        else:
            objects = context.selected_objects

+        objects: list[bpy.types.Object]
        for obj in objects:
            was_active_object = obj == context.active_object

@@ -631,13 +617,10 @@ class AddElement(bpy.types.Operator, tool.Ifc.Operator):
                    local_z = wall_matrix.to_3x3() @ Vector((0, 0, 1))
                    direction_sense = getattr(usage, "DirectionSense", "POSITIVE")

-                    layer_set_direction = usage.LayerSetDirection
-                    if layer_set_direction == "AXIS2":
+                    if usage.LayerSetDirection == "AXIS2":
                        z_axis = tuple(local_y) if direction_sense == "POSITIVE" else tuple(-local_y)
-                    elif layer_set_direction == "AXIS3":
+                    elif usage.LayerSetDirection == "AXIS3":
                        z_axis = tuple(local_z) if direction_sense == "POSITIVE" else tuple(-local_z)
-                    else:
-                        assert False, layer_set_direction

                    item = builder.extrude(
                        profile,
@@ -767,8 +750,6 @@ class AddElement(bpy.types.Operator, tool.Ifc.Operator):
                        WebThickness=default_web_thickness / unit_scale,
                        FlangeThickness=default_flange_thickness / unit_scale,
                    )
-                else:
-                    assert False, representation_template

            rel = ifcopenshell.api.material.assign_material(
                tool.Ifc.get(), products=[element], type="IfcMaterialProfileSet"
@@ -132,12 +132,5 @@ class SelectSimilarData:
            if pset.endswith("Common"):
                keys.extend([f'/.*Common/."{name}"' for name in properties.keys() if name != "id"])
            else:
-                pset_part = f'"{pset}"' if " " in pset else pset
-                keys.extend(
-                    [
-                        f'{pset_part}."{name}"' if " " in name else f"{pset_part}.{name}"
-                        for name in properties.keys()
-                        if name != "id"
-                    ]
-                )
+                keys.extend([f"{pset}.{name}" for name in properties.keys() if name != "id"])
        return [(k, k, "") for k in keys]
@@ -1009,7 +1009,6 @@ class ColourByProperty(Operator):
        palette = props.palette
        is_qualitative = palette in ("tab10", "paired")

-        colours = None
        if is_qualitative:
            colours = tool.Search.get_qualitative_palette(palette)

@@ -1036,7 +1035,6 @@ class ColourByProperty(Operator):
                if value in colourscheme:
                    colourscheme[value]["total"] += 1
                else:
-                    assert colours is not None
                    colourscheme[value] = {"colour": next(colours)[0:3], "total": 1}
                obj.color = (*colourscheme[value]["colour"], 1)
            else:
@@ -1141,7 +1139,6 @@ class SelectByProperty(Operator):

        is_qualitative = palette in ("tab10", "paired")

-        values = None
        if not is_qualitative:
            values = []
            for colour in props.colourscheme:
--- a/Show More
+++ b/Show More