removed unnecessary code

Co-authored-by: Bruno Perdigão <57102715+brunoperdigao@users.noreply.github.com>

.clang-format

@@ -1,24 +0,0 @@
-# We'll use defaults from the LLVM style with modifications
-BasedOnStyle: LLVM
-ColumnLimit: 0 # we do not enforce column lenght, please format responsibly
-IndentWidth: 4
----
-Language: Cpp
-AllowShortEnumsOnASingleLine: false
-AlwaysBreakTemplateDeclarations: Yes
-BinPackArguments: false
-BinPackParameters: false
-BraceWrapping:
-    SplitEmptyFunction: false
-    SplitEmptyRecord: false
-    SplitEmptyNamespace: false
-IncludeBlocks: Regroup
-InsertBraces: true
-InsertNewlineAtEOF: true
-PackConstructorInitializers: CurrentLine
-PointerAlignment: Left
-ReflowComments: false # keep licenze comment blocks
-SortIncludes: CaseInsensitive
-SpacesInLineCommentPrefix:
-    Maximum: 1
-TabWidth: 4

.clang-tidy

@@ -1,5 +0,0 @@
-Checks:          'bugprone-*,cert-*,clang-analyzer-*,readability-*'
-WarningsAsErrors: ''
-HeaderFilterRegex: ''
-AnalyzeTemporaryDtors: false
-FormatStyle: none

.github/workflows/cd.yml

@@ -1,10 +1,8 @@
-name: ci-ifcopenshell-docker
+name: CD
 
 on: 
-  workflow_dispatch:
   push:
-      tags:
-        - v0.**
+
 
 jobs:
 
@@ -31,7 +29,7 @@ jobs:
         sudo apt-get install --no-install-recommends \
         git cmake gcc g++ libboost-all-dev python3-all-dev swig libpcre3-dev libxml2-dev \
         libocct-foundation-dev libocct-modeling-algorithms-dev libocct-modeling-data-dev libocct-ocaf-dev libocct-visualization-dev libocct-data-exchange-dev \
-        libhdf5-dev libcgal-dev nlohmann-json3-dev libeigen3-dev
+        libhdf5-dev libcgal-dev nlohmann-json3-dev
 
     -
       name: ccache
@@ -52,8 +50,8 @@ jobs:
          -DOCC_INCLUDE_DIR=/usr/include/opencascade \
          -DOCC_LIBRARY_DIR=/usr/lib/x86_64-linux-gnu \
          -DPYTHON_EXECUTABLE:FILEPATH=/usr/bin/python3 \
-         -DPYTHON_INCLUDE_DIR:PATH=/usr/include/python3.10 \
-         -DPYTHON_LIBRARY:FILEPATH=/usr/lib/x86_64-linux-gnu/libpython3.10.so \
+         -DPYTHON_INCLUDE_DIR:PATH=/usr/include/python3.8 \
+         -DPYTHON_LIBRARY:FILEPATH=/usr/lib/x86_64-linux-gnu/libpython3.8.so \
          -DCOLLADA_SUPPORT=Off \
          -DLIBXML2_INCLUDE_DIR=/usr/include/libxml2 \
          -DLIBXML2_LIBRARIES=/usr/lib/x86_64-linux-gnu/libxml2.so \
@@ -65,7 +63,6 @@ jobs:
          -DHDF5_INCLUDE_DIR=/usr/include/hdf5/serial \
          -DGLTF_SUPPORT=On \
          -DJSON_INCLUDE_DIR=/usr/include \
-         -DEIGEN_DIR=/usr/include/eigen3 \
          ../cmake
         make -j $(nproc)
         make install

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

@@ -1,8 +1,24 @@
 name: ci-bcf-pypi
 
 on:
+  schedule:
+    #         ┌───────────── minute (0 - 59)
+    #         │  ┌───────────── hour (0 - 23)
+    #         │  │ ┌───────────── day of the month (1 - 31)
+    #         │  │ │ ┌───────────── month (1 - 12 or JAN-DEC)
+    #         │  │ │ │ ┌───────────── day of the week (0 - 6 or SUN-SAT)
+    #         *  * * * *
+    - cron: "0 0 18 * *"
+  push:
+    paths:
+      - '.github/workflows/ci-bcf-pypi.yml'
   workflow_dispatch:
 
+env:
+  major: 0
+  minor: 0
+  name: ifcopenshell
+
 jobs:
   activate:
     runs-on: ubuntu-latest
@@ -32,10 +48,10 @@ jobs:
         run: |
           pip install build
           cd src/bcf &&
-          make dist IS_STABLE=TRUE
+          make dist
       - name: Publish a Python distribution to PyPI
         uses: ortega2247/pypi-upload-action@master
         with:
           user: __token__
           password: ${{ secrets.PYPI_API_TOKEN }}
-          packages_dir: src/bcf/dist
+          packages_dir: src/bcf/dist

.github/workflows/ci-black-formatting.yml

@@ -1,12 +0,0 @@
-name: ci-black-formatting
-
-on:
-  push:
-  pull_request:
-
-jobs:
-  lint-formatting:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: psf/black@stable

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

@@ -0,0 +1,92 @@
+name: Publish-blenderbim-chocolatey package
+
+on:
+  schedule:
+    #         ┌───────────── minute (0 - 59)
+    #         │  ┌───────────── hour (0 - 23)
+    #         │  │ ┌───────────── day of the month (1 - 31)
+    #         │  │ │ ┌───────────── month (1 - 12 or JAN-DEC)
+    #         │  │ │ │ ┌───────────── day of the week (0 - 6 or SUN-SAT)
+    #         *  * * * *
+    - cron:  "30 0 * * *" # 30min past utc midnight
+
+env:
+  major: 0
+  minor: 0
+  name: blenderbim
+  choco_version: 1.1.0
+  CHOCO_TOKEN:   ${{ secrets.CHOCO_TOKEN }}
+
+jobs:
+  activate:
+    runs-on: ubuntu-latest
+    if: |
+      github.repository == 'IfcOpenShell/IfcOpenShell'
+    steps:
+    - name: Set env
+      run: echo ok go
+
+  build:
+    needs: activate
+    name: ${{ matrix.config.name }}-${{ matrix.pyver }}
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        pyver: [py310]
+        config:
+          - {
+            name: "Windows Build",
+            short_name: win,
+          }
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
+        with:
+          python-version: '3.10.9' # Version range or exact version of a Python version to use, using SemVer's version range syntax
+          architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified
+      - run: echo ${{ env.DATE }}
+
+      - name: Check in published releases if we should do a choco release
+        id: do_choco
+        run: |
+          echo "::set-output name=choco_release::$(python3 /home/runner/work/IfcOpenShell/IfcOpenShell/choco/blenderbim/check_repo_infos.py --do_choco_release?)"
+
+      - name: Fill chocolatey scripts on win with latest blender python
+        if: ${{steps.do_choco.outputs.choco_release}} == 'do_choco_release'
+        run: |
+          yesterday_non_iso="$(date  --date='yesterday' +'%y%m%d' | tr -d '\n')" &&
+          target_os=${{ matrix.config.short_name }} &&
+          latest_blender_python_version_maj_min=$(python3 /home/runner/work/IfcOpenShell/IfcOpenShell/choco/blenderbim/check_repo_infos.py --latest_blender_python_version_maj_min?) &&
+          echo "latest_blender_python_version_maj_min?: $latest_blender_python_version_maj_min" &&
+          pyver=$(python3 /home/runner/work/IfcOpenShell/IfcOpenShell/choco/blenderbim/check_repo_infos.py --pyver?) &&
+          export latest_blender_version_maj_min=$(python3 /home/runner/work/IfcOpenShell/IfcOpenShell/choco/blenderbim/check_repo_infos.py --latest_blender_release_maj_min?) &&
+          export latest_blender_version_maj_min_pat=$(python3 /home/runner/work/IfcOpenShell/IfcOpenShell/choco/blenderbim/check_repo_infos.py --latest_blender_release_maj_min_pat?) &&
+          echo   latest_blender_version_maj_min_pat?: $latest_blender_version_maj_min_pat &&
+          export blenderbim_build_version="${{ env.major }}.${{ env.minor }}.$yesterday_non_iso" &&
+          export url_blenderbim_py310_win_zip="https://github.com/IfcOpenShell/IfcOpenShell/releases/download/blenderbim-$yesterday_non_iso/blenderbim-$yesterday_non_iso-$pyver-$target_os.zip" &&
+          wget $url_blenderbim_py310_win_zip --no-verbose &&
+          export sha256sum_blenderbim_py310_win_zip=$( sha256sum blenderbim-$yesterday_non_iso-$pyver-$target_os.zip  --tag | cut -d ' ' -f 4  | tr -d '\n') &&
+          echo   sha256sum_blenderbim_py310_win_zip: $sha256sum_blenderbim_py310_win_zip &&
+          python3 choco/blenderbim/fill_dynamic_parameters.py &&
+          echo __build choco with mono &&
+          wget "https://github.com/chocolatey/choco/archive/refs/tags/$choco_version.tar.gz" --quiet &&
+          tar -xzf "$choco_version.tar.gz" &&
+          cd choco-$choco_version &&
+          chmod +x build.sh zip.sh &&
+          ./build.sh &&
+          cp -r build_output/chocolatey /opt/chocolatey &&
+          cd /home/runner/work/IfcOpenShell/IfcOpenShell/choco/blenderbim/ &&
+          echo __choco pack &&
+          mono /opt/chocolatey/choco.exe --version &&
+          mono /opt/chocolatey/choco.exe pack --allow-unofficial &&
+          echo __choco set apiKey &&
+          mono /opt/chocolatey/choco.exe setapikey --key="$CHOCO_TOKEN" --source="https://push.chocolatey.org/" --allow-unofficial # &&
+          echo __choco push &&
+          mono /opt/chocolatey/choco.exe push --source="https://push.chocolatey.org/" --key="$CHOCO_TOKEN" --allow-unofficial --verbose
+
+      - name: Inform user about not packaging
+        if: ${{steps.do_choco.outputs.choco_release}} != 'do_choco_release'
+        run: |
+          echo "no releases found today ${{ env.DATE }}, therefore choco packaging is skipped."
+

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

@@ -0,0 +1,83 @@
+name: Publish-blenderbim-multiplatform
+
+on:
+  push:
+    paths:
+      - '.github/workflows/ci-blenderbim-matrix.yml'
+      - 'src/blenderbim/**'
+      - 'src/ifcopenshell-python/ifcopenshell/**'
+      - 'src/bcf/src/bcf/**'
+      - 'src/ifcclash/ifcclash/**'
+      - 'src/ifccobie/**'
+      - 'src/ifcdiff/**'
+      - 'src/ifccsv/**'
+      - 'src/ifcpatch/ifcpatch/**'
+      - 'src/ifc4d/ifc4d/**'
+      - 'src/ifc5d/ifc5d/**'
+      - 'src/ifccityjson/**'
+    branches:
+      - v0.7.0
+
+env:
+  major: 0
+  minor: 0
+  name: blenderbim
+
+jobs:
+  activate:
+    runs-on: ubuntu-latest
+    if: |
+      github.repository == 'IfcOpenShell/IfcOpenShell'
+    steps:
+    - name: Set env
+      run: echo ok go
+
+  build:
+    needs: activate
+    name: ${{ matrix.config.name }}-${{ matrix.pyver }}
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        pyver: [py39, py310, py311]
+        config:
+          - {
+            name: "Windows Build",
+            short_name: win,
+          }
+          - {
+            name: "Linux Build",
+            short_name: linux
+          }
+          - {
+            name: "MacOS Build",
+            short_name: macos
+          }
+          - {
+            name: "MacOS ARM Build",
+            short_name: macosm1
+          }
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
+        with:
+          architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified
+          python-version: '3.11'
+      - run: echo ${{ env.DATE }}
+      - name: Get current date
+        id: date
+        run: echo "::set-output name=date::$(date +'%y%m%d')"
+      - name: Compile
+        run: |
+          cp -r src/blenderbim src/blenderbim_${{ matrix.config.short_name }}_${{ matrix.pyver }} &&
+          cd src/blenderbim_${{ matrix.config.short_name }}_${{ matrix.pyver }} &&
+          make dist PLATFORM=${{ matrix.config.short_name }} PYVERSION=${{ matrix.pyver }}
+      - name: Upload Zip file to release
+        uses: svenstaro/upload-release-action@v2
+        with:
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          file: src/blenderbim_${{ matrix.config.short_name }}_${{ matrix.pyver }}/dist/blenderbim-${{steps.date.outputs.date}}-${{ matrix.pyver }}-${{ matrix.config.short_name }}.zip
+          asset_name: blenderbim-${{steps.date.outputs.date}}-${{ matrix.pyver }}-${{ matrix.config.short_name }}.zip
+          tag: "blenderbim-${{steps.date.outputs.date}}"
+          overwrite: true
+          body: "Daily developer testing build blenderbim-${{steps.date.outputs.date}}"

.github/workflows/ci-bonsai-choco.yml

@@ -1,47 +0,0 @@
-name: ci-bonsai-choco
-
-on:
-  schedule:
-    #         ┌───────────── minute (0 - 59)
-    #         │  ┌───────────── hour (0 - 23)
-    #         │  │ ┌───────────── day of the month (1 - 31)
-    #         │  │ │ ┌───────────── month (1 - 12 or JAN-DEC)
-    #         │  │ │ │ ┌───────────── day of the week (0 - 6 or SUN-SAT)
-    #         *  * * * *
-    - cron:  "30 0 * * *" # 30min past utc midnight
-  workflow_dispatch:
-
-env:
-  major: 0
-  minor: 0
-  name: bonsai
-  choco_version: 1.1.0
-  CHOCO_TOKEN:   ${{ secrets.CHOCO_TOKEN }}
-
-jobs:
-  activate:
-    runs-on: ubuntu-latest
-    if: |
-      github.repository == 'IfcOpenShell/IfcOpenShell'
-    steps:
-    - name: Set env
-      run: echo ok go
-
-  build:
-    needs: activate
-    name: "choco_release"
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-tags: true
-          fetch-depth: 0
-      - run: echo ${{ env.DATE }}
-      - name: Check in release tags if we should do a choco release and perform the release if needed
-        id: do_choco_release
-        run: |
-          pip install pygithub
-          cd /home/runner/work/IfcOpenShell/IfcOpenShell/choco/bonsai/ &&
-          python3 choco_release.py

.github/workflows/ci-bonsai-daily.yml

@@ -1,155 +0,0 @@
-name: ci-bonsai-daily
-
-on:
-  push:
-    paths:
-      - '.github/workflows/ci-bonsai-daily.yml'
-      - 'src/bonsai/**'
-      - 'src/ifcopenshell-python/ifcopenshell/**'
-      - 'src/bcf/bcf/**'
-      - 'src/ifcclash/ifcclash/**'
-      - 'src/ifccobie/**'
-      - 'src/ifcdiff/**'
-      - 'src/ifccsv/**'
-      - 'src/ifcpatch/ifcpatch/**'
-      - 'src/ifc4d/ifc4d/**'
-      - 'src/ifc5d/ifc5d/**'
-      - 'src/ifccityjson/**'
-    branches:
-      - v0.8.0
-  workflow_dispatch:
-
-jobs:
-  activate:
-    runs-on: ubuntu-latest
-    if: |
-      github.repository == 'IfcOpenShell/IfcOpenShell'
-    steps:
-    - name: Set env
-      run: echo ok go
-
-  build:
-    needs: activate
-    name: ${{ matrix.config.name }}-${{ matrix.pyver }}
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        pyver: [py311, py312]
-        config:
-          - {
-            name: "Windows Build",
-            short_name: win,
-          }
-          - {
-            name: "Linux Build",
-            short_name: linux,
-          }
-          - {
-            name: "MacOS Build",
-            short_name: macos,
-          }
-          - {
-            name: "MacOS ARM Build",
-            short_name: macosm1,
-          }
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
-        with:
-          architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified
-          python-version: '3.11'
-      - name: Get current version
-        id: version
-        run: echo "version=$(cat VERSION)" >> $GITHUB_OUTPUT
-      - name: Get current date
-        id: date
-        run: echo "date=$(date +'%y%m%d')" >> $GITHUB_OUTPUT
-      - name: Compile
-        run: |
-          cd src/bonsai && make dist PLATFORM=${{ matrix.config.short_name }} PYVERSION=${{ matrix.pyver }}
-      - name: Find zip file name
-        id: find_zip
-        run: |
-          filepath=$(ls src/bonsai/dist/bonsai_*.zip)
-          echo "filepath=$filepath" >> $GITHUB_OUTPUT
-          echo "filename=$(basename $filepath)" >> $GITHUB_OUTPUT
-      - name: Upload zip file to release
-        uses: svenstaro/upload-release-action@v2
-        with:
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: ${{ steps.find_zip.outputs.filepath }}
-          asset_name: ${{ steps.find_zip.outputs.filename }}
-          release_name: "bonsai-${{steps.version.outputs.version}}-alpha${{steps.date.outputs.date}} (unstable)"
-          tag: "bonsai-${{steps.version.outputs.version}}-alpha${{steps.date.outputs.date}}"
-          overwrite: true
-          body: "See README in https://github.com/IfcOpenShell/bonsai_unstable_repo/ on how to setup autoupdates for daily Bonsai builds."
-
-  update-extensions-repo-and-run-tests:
-    needs: [build]
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout bonsai_unstable_repo repository
-        uses: actions/checkout@v2
-        with:
-          repository: IfcOpenShell/bonsai_unstable_repo
-          token: ${{ secrets.IOS_TO_BLENDER_REPO }}
-          path: bonsai_unstable_repo
-
-      - name: Update index.json on extensions repo
-        run: |
-          set -x -e
-
-          # Download Blender.
-          wget -q -O blender.tar.xz https://ftp.nluug.nl/pub/graphics/blender/release/Blender4.2/blender-4.2.0-linux-x64.tar.xz
-          tar -xf blender.tar.xz
-
-          # Setup Blender.
-          BLENDER_PATH=$(find blender-*/ -maxdepth 0 -exec readlink -f {} \;)
-          export PATH="$PATH:$BLENDER_PATH"
-          blender --version
-
-          cd bonsai_unstable_repo
-          pip install -r requirements.txt
-          python setup_extensions_repo.py --last-tag
-          git config --global user.name 'IfcOpenBot'
-          git config --global user.email 'IfcOpenBot@users.noreply.github.com'
-          git add index.json
-          git add readme.md
-          git commit -m "Update index.json"
-          git push
-      - name: Run bonsai tests
-        run: |
-          set -x -e
-          BLENDER_PATH=$(find blender-*/ -maxdepth 0 -exec readlink -f {} \;)
-          export PATH="$PATH:$BLENDER_PATH"
-          bonsai_zip="$(pwd)/$(ls bonsai_unstable_repo/bonsai_py311*-linux-x64.zip)"
-          blender --version
-          blender --command extension install-file -r user_default -e $bonsai_zip
-          blender --command extension list
-
-          wget -q -O sverchok.zip https://github.com/nortikin/sverchok/archive/refs/heads/master.zip
-          # ifcsverchok expecting sverchok to be named "sverchok" and not "sverchok-master".
-          unzip -q sverchok.zip
-          mv sverchok-master sverchok
-          zip -q -r sverchok.zip sverchok
-          rm -r sverchok
-          blender --command extension install-file -r user_default sverchok.zip
-
-          git clone https://github.com/IfcOpenShell/IfcOpenShell.git IfcOpenShell
-          cd IfcOpenShell/src/ifcsverchok
-          make dist
-          sverchok_zip="$(pwd)/dist/$(ls dist)"
-          blender --command extension install-file -r user_default $sverchok_zip
-
-          # Install Sun Position extension.
-          blender --online-mode --command extension sync
-          blender --online-mode --background --python-expr "import bpy; \
-          bpy.ops.extensions.package_install(repo_index=0, pkg_id='sun_position'); \
-          bpy.ops.preferences.addon_enable(module='bl_ext.blender_org.sun_position'); bpy.ops.wm.save_userpref()"
-
-          cd ../bonsai
-          pip install pytest-blender
-          blender --background --python scripts/setup_pytest.py
-          blender --python-expr "import bonsai; print(bonsai.bbim_semver); import ifcopenshell; print(ifcopenshell.version)" --background
-          make test

.github/workflows/ci-bonsai.yml

@@ -1,72 +0,0 @@
-name: ci-bonsai
-
-# Differences from ci-bonsai-daily.yml:
-# - make has IS_STABLE=TRUE
-# - action is never triggered and executed only manually
-# - doesn't add a current date to the release and tag
-
-on:
-  workflow_dispatch:
-
-jobs:
-  activate:
-    runs-on: ubuntu-latest
-    if: |
-      github.repository == 'IfcOpenShell/IfcOpenShell'
-    steps:
-    - name: Set env
-      run: echo ok go
-
-  build:
-    needs: activate
-    name: ${{ matrix.config.name }}-${{ matrix.pyver }}
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        pyver: [py310, py311, py312]
-        config:
-          - {
-            name: "Windows Build",
-            short_name: win,
-          }
-          - {
-            name: "Linux Build",
-            short_name: linux
-          }
-          - {
-            name: "MacOS Build",
-            short_name: macos
-          }
-          - {
-            name: "MacOS ARM Build",
-            short_name: macosm1
-          }
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
-        with:
-          architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified
-          python-version: '3.11'
-      - name: Get current version
-        id: version
-        run: echo "version=$(cat VERSION)" >> $GITHUB_OUTPUT
-      - name: Compile
-        run: |
-          cd src/bonsai &&
-          make dist PLATFORM=${{ matrix.config.short_name }} PYVERSION=${{ matrix.pyver }} IS_STABLE=TRUE
-      - name: Find zip file name
-        id: find_zip
-        run: |
-          filepath=$(ls src/bonsai/dist/bonsai_*.zip)
-          echo "filepath=$filepath" >> $GITHUB_OUTPUT
-          echo "filename=$(basename $filepath)" >> $GITHUB_OUTPUT
-      - name: Upload zip file to release
-        uses: svenstaro/upload-release-action@v2
-        with:
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: ${{ steps.find_zip.outputs.filepath }}
-          asset_name: ${{ steps.find_zip.outputs.filename }}
-          release_name: "bonsai-${{steps.version.outputs.version}}"
-          tag: "bonsai-${{steps.version.outputs.version}}"
-          overwrite: true

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

@@ -1,8 +1,21 @@
 name: ci-bsdd-pypi
 
 on:
+  schedule:
+    #         ┌───────────── minute (0 - 59)
+    #         │  ┌───────────── hour (0 - 23)
+    #         │  │ ┌───────────── day of the month (1 - 31)
+    #         │  │ │ ┌───────────── month (1 - 12 or JAN-DEC)
+    #         │  │ │ │ ┌───────────── day of the week (0 - 6 or SUN-SAT)
+    #         *  * * * *
+    - cron: "0 0 18 * *"
   workflow_dispatch:
 
+env:
+  major: 0
+  minor: 0
+  name: ifcopenshell
+
 jobs:
   activate:
     runs-on: ubuntu-latest
@@ -26,7 +39,7 @@ jobs:
         run: |
           pip install build
           cd src/bsdd &&
-          make dist IS_STABLE=TRUE
+          make dist
       - name: Publish a Python distribution to PyPI
         uses: ortega2247/pypi-upload-action@master
         with:

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

@@ -1,35 +0,0 @@
-name: ci-ifc4d-pypi
-
-on:
-  workflow_dispatch:
-
-jobs:
-  activate:
-    runs-on: ubuntu-latest
-    if: |
-      github.repository == 'IfcOpenShell/IfcOpenShell'
-    steps:
-    - name: Set env
-      run: echo ok go
-
-  build:
-    needs: activate
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
-        with:
-          python-version: '3.11' # Version range or exact version of a Python version to use, using SemVer's version range syntax
-      - name: Compile
-        run: |
-          pip install build
-          cd src/ifc4d &&
-          make dist IS_STABLE=TRUE
-      - name: Publish a Python distribution to PyPI
-        uses: ortega2247/pypi-upload-action@master
-        with:
-          user: __token__
-          password: ${{ secrets.PYPI_API_TOKEN }}
-          packages_dir: src/ifc4d/dist

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

@@ -1,35 +0,0 @@
-name: ci-ifc5d-pypi
-
-on:
-  workflow_dispatch:
-
-jobs:
-  activate:
-    runs-on: ubuntu-latest
-    if: |
-      github.repository == 'IfcOpenShell/IfcOpenShell'
-    steps:
-    - name: Set env
-      run: echo ok go
-
-  build:
-    needs: activate
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
-        with:
-          python-version: '3.11' # Version range or exact version of a Python version to use, using SemVer's version range syntax
-      - name: Compile
-        run: |
-          pip install build
-          cd src/ifc5d &&
-          make dist IS_STABLE=TRUE
-      - name: Publish a Python distribution to PyPI
-        uses: ortega2247/pypi-upload-action@master
-        with:
-          user: __token__
-          password: ${{ secrets.PYPI_API_TOKEN }}
-          packages_dir: src/ifc5d/dist

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

@@ -1,35 +0,0 @@
-name: ci-ifccityjson-pypi
-
-on:
-  workflow_dispatch:
-
-jobs:
-  activate:
-    runs-on: ubuntu-latest
-    if: |
-      github.repository == 'IfcOpenShell/IfcOpenShell'
-    steps:
-    - name: Set env
-      run: echo ok go
-
-  build:
-    needs: activate
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
-        with:
-          python-version: '3.11' # Version range or exact version of a Python version to use, using SemVer's version range syntax
-      - name: Compile
-        run: |
-          pip install build
-          cd src/ifccityjson &&
-          make dist IS_STABLE=TRUE
-      - name: Publish a Python distribution to PyPI
-        uses: ortega2247/pypi-upload-action@master
-        with:
-          user: __token__
-          password: ${{ secrets.PYPI_API_TOKEN }}
-          packages_dir: src/ifccityjson/dist

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

@@ -1,8 +1,21 @@
 name: ci-ifcclash-pypi
 
 on:
+  schedule:
+    #         ┌───────────── minute (0 - 59)
+    #         │  ┌───────────── hour (0 - 23)
+    #         │  │ ┌───────────── day of the month (1 - 31)
+    #         │  │ │ ┌───────────── month (1 - 12 or JAN-DEC)
+    #         │  │ │ │ ┌───────────── day of the week (0 - 6 or SUN-SAT)
+    #         *  * * * *
+    - cron: "0 0 18 * *"
   workflow_dispatch:
 
+env:
+  major: 0
+  minor: 0
+  name: ifcopenshell
+
 jobs:
   activate:
     runs-on: ubuntu-latest
@@ -26,7 +39,7 @@ jobs:
         run: |
           pip install build
           cd src/ifcclash &&
-          make dist IS_STABLE=TRUE
+          make dist
       - name: Publish a Python distribution to PyPI
         uses: ortega2247/pypi-upload-action@master
         with:

.github/workflows/ci-ifcconvert.yml

@@ -1,65 +0,0 @@
-name: ci-ifcconvert
-
-on:
-  workflow_dispatch:
-
-jobs:
-  activate:
-    runs-on: ubuntu-latest
-    if: |
-      github.repository == 'IfcOpenShell/IfcOpenShell'
-    steps:
-    - name: Set env
-      run: echo ok go
-
-  build:
-    needs: activate
-    name: ${{ matrix.config.name }}-${{ matrix.pyver }}
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        config:
-          - {
-            name: "Windows 64bit",
-            short_name: win64,
-          }
-          - {
-            name: "Windows 32bit",
-            short_name: win32,
-          }
-          - {
-            name: "Linux 64bit",
-            short_name: linux64
-          }
-          - {
-            name: "MacOS Intel 64bit",
-            short_name: macos64
-          }
-          - {
-            name: "MacOS Silicon 64bit",
-            short_name: macosm164
-          }
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
-        with:
-          python-version: '3.11' # Version range or exact version of a Python version to use, using SemVer's version range syntax
-          architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified
-      - run: echo ${{ env.DATE }}
-      - name: Get current version
-        id: version
-        run: echo "version=$(cat VERSION)" >> $GITHUB_OUTPUT
-      - name: Compile
-        run: |
-          cd src/ifcopenshell-python &&
-          make zip-ifcconvert PLATFORM=${{ matrix.config.short_name }}
-      - name: Upload zip file to release
-        uses: svenstaro/upload-release-action@v2
-        with:
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: src/ifcopenshell-python/dist/ifcconvert-${{ steps.version.outputs.version }}-${{ matrix.config.short_name }}.zip
-          asset_name: ifcconvert-${{ steps.version.outputs.version }}-${{ matrix.config.short_name }}.zip
-          release_name: "ifcconvert-${{steps.version.outputs.version}}"
-          tag: "ifcconvert-${{steps.version.outputs.version}}"
-          overwrite: true

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

@@ -1,8 +1,21 @@
 name: ci-ifccsv-pypi
 
 on:
+  schedule:
+    #         ┌───────────── minute (0 - 59)
+    #         │  ┌───────────── hour (0 - 23)
+    #         │  │ ┌───────────── day of the month (1 - 31)
+    #         │  │ │ ┌───────────── month (1 - 12 or JAN-DEC)
+    #         │  │ │ │ ┌───────────── day of the week (0 - 6 or SUN-SAT)
+    #         *  * * * *
+    - cron: "0 0 18 * *"
   workflow_dispatch:
 
+env:
+  major: 0
+  minor: 0
+  name: ifcopenshell
+
 jobs:
   activate:
     runs-on: ubuntu-latest
@@ -26,7 +39,7 @@ jobs:
         run: |
           pip install build
           cd src/ifccsv &&
-          make dist IS_STABLE=TRUE
+          make dist
       - name: Publish a Python distribution to PyPI
         uses: ortega2247/pypi-upload-action@master
         with:

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

@@ -1,35 +0,0 @@
-name: ci-ifcdiff-pypi
-
-on:
-  workflow_dispatch:
-
-jobs:
-  activate:
-    runs-on: ubuntu-latest
-    if: |
-      github.repository == 'IfcOpenShell/IfcOpenShell'
-    steps:
-    - name: Set env
-      run: echo ok go
-
-  build:
-    needs: activate
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
-        with:
-          python-version: '3.11' # Version range or exact version of a Python version to use, using SemVer's version range syntax
-      - name: Compile
-        run: |
-          pip install build
-          cd src/ifcdiff &&
-          make dist IS_STABLE=TRUE
-      - name: Publish a Python distribution to PyPI
-        uses: ortega2247/pypi-upload-action@master
-        with:
-          user: __token__
-          password: ${{ secrets.PYPI_API_TOKEN }}
-          packages_dir: src/ifcdiff/dist

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

@@ -1,35 +0,0 @@
-name: ci-ifcfm-pypi
-
-on:
-  workflow_dispatch:
-
-jobs:
-  activate:
-    runs-on: ubuntu-latest
-    if: |
-      github.repository == 'IfcOpenShell/IfcOpenShell'
-    steps:
-    - name: Set env
-      run: echo ok go
-
-  build:
-    needs: activate
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
-        with:
-          python-version: '3.11' # Version range or exact version of a Python version to use, using SemVer's version range syntax
-      - name: Compile
-        run: |
-          pip install build
-          cd src/ifcfm &&
-          make dist IS_STABLE=TRUE
-      - name: Publish a Python distribution to PyPI
-        uses: ortega2247/pypi-upload-action@master
-        with:
-          user: __token__
-          password: ${{ secrets.PYPI_API_TOKEN }}
-          packages_dir: src/ifcfm/dist

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

@@ -1,104 +0,0 @@
-name: ci-ifcopenshell-conda-daily-cleaner
-
-on:
-  workflow_dispatch:
-  schedule:
-  #         ┌───────────── minute (0 - 59)
-  #         │  ┌───────────── hour (0 - 23)
-  #         │  │ ┌───────────── day of the month (1 - 31)
-  #         │  │ │ ┌───────────── month (1 - 12 or JAN-DEC)
-  #         │  │ │ │ ┌───────────── day of the week (0 - 6 or SUN-SAT)
-  #         *  * * * *
-  - cron: "00 23 * * *" # 11min before utc midnight every day
-
-env:
-  ANACONDA_TOKEN: ${{ secrets.ANACONDA_TOKEN }}
-  NUM_SUPPORTED_VERSIONS: 5
-
-jobs:
-  activate:
-    runs-on: ubuntu-latest
-    defaults:
-      run:
-        shell: bash -l {0}
-    if: |
-      github.repository == 'IfcOpenShell/IfcOpenShell'
-    steps:
-      - uses: mamba-org/setup-micromamba@v1 # https://github.com/mamba-org/setup-micromamba
-        with:
-          environment-name: test-env
-          create-args: >-
-            python=3.11
-            anaconda-client=1.12.3
-
-      - name: Run conda cleaner
-        run: |
-          python - << EOF
-          
-          import os
-          from datetime import datetime, timedelta
-          from binstar_client.utils import get_server_api
-          from binstar_client.errors import BinstarError
-          
-          # Configuration
-          api_token = os.environ.get('ANACONDA_TOKEN')
-          pkg_name = 'ifcopenshell'
-          channel_name = 'ifcopenshell'
-          
-          # Authenticate with Anaconda
-          aserver_api = get_server_api(token=api_token)
-          
-          
-          # Get the list of packages in the channel
-          def get_package(filter_package_name: str = None):
-              try:
-                  user_packages = aserver_api.user_packages(channel_name)
-                  if filter_package_name:
-                      user_packages = [pkg for pkg in user_packages if pkg['name'] == filter_package_name]
-                  if len(user_packages) == 0:
-                      print(f"No packages found for {filter_package_name}.")
-                  if len(user_packages) > 1:
-                      raise ValueError(f"Found {len(user_packages)} package for {filter_package_name}. Will only support 1 package.")
-          
-                  return user_packages[0]
-              except BinstarError as err:
-                  raise ValueError(f"Failed to fetch packages: {err}")
-          
-          
-          # Delete a package version
-          def delete_package(package_name, version):
-              try:
-                  aserver_api.remove_release(channel_name, package_name, version)
-                  print(f"Deleted {package_name} version {version}")
-              except BinstarError as err:
-                  print(f"Failed to delete {package_name} version {version}: {err}")
-          
-          
-          # Main logic
-          def main():
-              package = get_package(pkg_name)
-              if not package:
-                  print("No packages found.")
-                  return
-          
-              number_of_supported_versions = ${{ env.NUM_SUPPORTED_VERSIONS }}
-          
-              package_name = package['name']
-              versions = package["versions"]
-              if len(versions) <= number_of_supported_versions:
-                  print(f"Number of versions {len(versions)} is less than or equal to {number_of_supported_versions}.")
-                  return
-          
-              # sort the versions in descending order
-              print(f"Before reversal: {versions=}")
-              versions.reverse()
-              print(f"After reversal: {versions=}")
-          
-              releases = versions[number_of_supported_versions:]
-          
-              for release in releases:
-                  delete_package(package_name, release)
-          
-          main()
-          
-          EOF

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

@@ -1,4 +1,4 @@
-name: ci-ifcopenshell-conda-daily-v0.8.0
+name: ci-ifcopenshell-conda-daily
 
 on:
   workflow_dispatch:
@@ -12,35 +12,8 @@ on:
   - cron: "49 23 * * *" # 11min before utc midnight every day
 
 jobs:
-  activate:
-    runs-on: ubuntu-latest
-    if: |
-      github.repository == 'IfcOpenShell/IfcOpenShell'
-    outputs:
-      version: ${{ steps.version.outputs.version }}
-      date: ${{ steps.date.outputs.date }}
-      verdate: ${{ steps.verdate.outputs.verdate }}
-    steps:
-      - uses: actions/checkout@v4
-      - name: Set env
-        run: echo ok go
-      
-      - name: Get current version
-        id: version
-        run: echo "version=$(cat VERSION)" >> $GITHUB_OUTPUT
-      
-      - name: Get current date
-        id: date
-        run: echo "date=$(date +'%y%m%d')" >> $GITHUB_OUTPUT
-
-      - name: Version + date str
-        id: verdate
-        run: echo "verdate='${{ steps.version.outputs.version }}alpha${{ steps.date.outputs.date }}'" >> $GITHUB_OUTPUT
-
-      
   test:
     name: ${{ matrix.platform.distver }}-${{ matrix.pyver.name }}-${{ matrix.variant }}
-    needs: activate
     runs-on: ${{ matrix.platform.distver }}
     defaults:
       run:
@@ -48,57 +21,47 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        variant: [novtk, all]
         pyver: [
-#          { name: py311, distver: '3.11'},
+          { name: py311, distver: '3.11'},
           { name: py312, distver: '3.12'}
         ]
         platform: [
-          { name: win, distver: windows-latest, pkg_dir: 'win-64' },
-          { name: linux, distver: ubuntu-latest, pkg_dir: 'linux-64' },
-          { name: macOS, distver: macos-latest, pkg_dir: 'osx-64' }
+          { name: Windows, distver: windows-2022, upload: 'true' },
+          { name: Linux, distver: ubuntu-22.04,  upload: 'true' },
+          { name: macOS, distver: macos-12, upload: 'true' }
+        ]
+        variant: [
+          'novtk',
+#          'all'
         ]
     steps:
-      - name: Set up swap space
-        if: runner.os == 'Linux'
-        uses: pierotofy/set-swap-space@v1.0
-        with:
-          swap-size-gb: 10
-
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
         with:
           submodules: recursive
 
-      - name: Download and extract MacOSX SDK
-        if: ${{ runner.os == 'macOS' }}
+      - name: Download MacOSX SDK
+        if: ${{ matrix.platform.name == 'macOS' }}
         run: |
-          curl -L https://github.com/phracker/MacOSX-SDKs/releases/download/11.3/MacOSX10.13.sdk.tar.xz | tar -xvJf - -C /Users/runner/work/
+          curl -o MacOSX10.13.sdk.tar.xz -L https://github.com/phracker/MacOSX-SDKs/releases/download/11.3/MacOSX10.13.sdk.tar.xz && \
+          tar xf MacOSX10.13.sdk.tar.xz && \
+          sudo mv -v MacOSX10.13.sdk /opt/ && \
+          ls /opt/
 
       - uses: mamba-org/setup-micromamba@v1 # https://github.com/mamba-org/setup-micromamba
         with:
-          environment-name: test-env
+          environment-name: build-env
+          cache-environment: true
+          condarc: |
+            channels:
+              - conda-forge
+            channel_priority: strict
           create-args: >-
             python=3.11
             anaconda-client
             boa
 
-      - name: create conda package dist dir
+      - name: build, test and upload ifcopenshell
+        if: ${{ matrix.platform.upload == 'true' }}
         run: |
-          mkdir -p ${{ github.workspace }}/dist
-
-      - name: build & test ifcopenshell
-        run: |
-          conda mambabuild . --python ${{ matrix.pyver.distver }} --no-remove-work-dir --output-folder '${{ github.workspace }}/dist' --variants='{variant: ${{ matrix.variant }}}'
+          conda mambabuild . --python ${{ matrix.pyver.distver }} -c conda-forge --variants "{variant: ${{ matrix.variant }}}" --token ${{ secrets.ANACONDA_TOKEN }} --user ifcopenshell
         working-directory: ./conda
-        env:
-          VERSION_OVERRIDE: ${{ needs.activate.outputs.verdate }}
-
-      - name: upload to anaconda
-        if: ${{ matrix.platform.name == 'win' }}
-        run: |
-          anaconda -t ${{ secrets.ANACONDA_TOKEN }} upload --force --user ifcopenshell '${{ github.workspace }}/dist/${{ matrix.platform.pkg_dir }}/*.tar.bz2'
-
-      - name: upload to anaconda
-        if: ${{ matrix.platform.name != 'win' }}
-        run: |
-          anaconda -t ${{ secrets.ANACONDA_TOKEN }} upload --force --user ifcopenshell ${{ github.workspace }}/dist/${{ matrix.platform.pkg_dir }}/*.tar.bz2

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

@@ -1,7 +1,19 @@
-name: ci-ifcopenshell-python-pypi
+name: ci-ifcopenshell-pypi
 
 on:
   workflow_dispatch:
+  schedule:
+    #         ┌───────────── minute (0 - 59)
+    #         │  ┌───────────── hour (0 - 23)
+    #         │  │ ┌───────────── day of the month (1 - 31)
+    #         │  │ │ ┌───────────── month (1 - 12 or JAN-DEC)
+    #         │  │ │ │ ┌───────────── day of the week (0 - 6 or SUN-SAT)
+    #         *  * * * *
+    - cron: "0 0 18 * *"
+  push:
+    paths:
+      - '.github/workflows/ci-ifcopenshell-pypi.yml'
+
 
 env:
   major: 0
@@ -27,20 +39,20 @@ jobs:
         pyver: [py39, py310, py311, py312]
         config:
           - {
-            name: "Windows 64bit",
-            short_name: win64,
+            name: "Windows Build",
+            short_name: win,
           }
           - {
-            name: "Linux 64bit",
-            short_name: linux64
+            name: "Linux Build",
+            short_name: linux
           }
           - {
-            name: "MacOS Intel 64bit",
-            short_name: macos64
+            name: "MacOS Build",
+            short_name: macos
           }
           - {
-            name: "MacOS Silicon 64bit",
-            short_name: macosm164
+            name: "MacOS ARM Build",
+            short_name: macosm1
           }
     steps:
       - uses: actions/checkout@v2
@@ -57,7 +69,7 @@ jobs:
           pip install build
           cp -r src/ifcopenshell-python src/ifcopenshell_${{ matrix.config.short_name }}_${{ matrix.pyver }} &&
           cd src/ifcopenshell_${{ matrix.config.short_name }}_${{ matrix.pyver }} &&
-          make dist PLATFORM=${{ matrix.config.short_name }} PYVERSION=${{ matrix.pyver }} IS_STABLE=TRUE
+          make dist PLATFORM=${{ matrix.config.short_name }} PYVERSION=${{ matrix.pyver }}
       - name: Publish a Python distribution to PyPI
         uses: ortega2247/pypi-upload-action@master
         with:

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

@@ -1,67 +0,0 @@
-name: ci-ifcopenshell-python
-
-on:
-  workflow_dispatch:
-
-jobs:
-  activate:
-    runs-on: ubuntu-latest
-    if: |
-      github.repository == 'IfcOpenShell/IfcOpenShell'
-    steps:
-    - name: Set env
-      run: echo ok go
-
-  build:
-    needs: activate
-    name: ${{ matrix.config.name }}-${{ matrix.pyver }}
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        pyver: [py39, py310, py311, py312]
-        config:
-          - {
-            name: "Windows 64bit",
-            short_name: win64,
-          }
-          - {
-            name: "Windows 32bit",
-            short_name: win32,
-          }
-          - {
-            name: "Linux 64bit",
-            short_name: linux64
-          }
-          - {
-            name: "MacOS Intel 64bit",
-            short_name: macos64
-          }
-          - {
-            name: "MacOS Silicon 64bit",
-            short_name: macosm164
-          }
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
-        with:
-          python-version: '3.11' # Version range or exact version of a Python version to use, using SemVer's version range syntax
-          architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified
-      - run: echo ${{ env.DATE }}
-      - name: Get current version
-        id: version
-        run: echo "version=$(cat VERSION)" >> $GITHUB_OUTPUT
-      - name: Compile
-        run: |
-          cp -r src/ifcopenshell-python src/ifcopenshell_${{ matrix.config.short_name }}_${{ matrix.pyver }} &&
-          cd src/ifcopenshell_${{ matrix.config.short_name }}_${{ matrix.pyver }} &&
-          make zip PLATFORM=${{ matrix.config.short_name }} PYVERSION=${{ matrix.pyver }}
-      - name: Upload zip file to release
-        uses: svenstaro/upload-release-action@v2
-        with:
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: src/ifcopenshell_${{ matrix.config.short_name }}_${{ matrix.pyver }}/dist/ifcopenshell-python-${{ steps.version.outputs.version }}-${{ matrix.pyver }}-${{ matrix.config.short_name }}.zip
-          asset_name: ifcopenshell-python-${{ steps.version.outputs.version }}-${{ matrix.pyver }}-${{ matrix.config.short_name }}.zip
-          release_name: "ifcopenshell-python-${{steps.version.outputs.version}}"
-          tag: "ifcopenshell-python-${{steps.version.outputs.version}}"
-          overwrite: true

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

@@ -1,8 +1,21 @@
 name: ci-ifcpatch-pypi
 
 on:
+  schedule:
+    #         ┌───────────── minute (0 - 59)
+    #         │  ┌───────────── hour (0 - 23)
+    #         │  │ ┌───────────── day of the month (1 - 31)
+    #         │  │ │ ┌───────────── month (1 - 12 or JAN-DEC)
+    #         │  │ │ │ ┌───────────── day of the week (0 - 6 or SUN-SAT)
+    #         *  * * * *
+    - cron: "0 0 18 * *"
   workflow_dispatch:
 
+env:
+  major: 0
+  minor: 0
+  name: ifcopenshell
+
 jobs:
   activate:
     runs-on: ubuntu-latest
@@ -26,7 +39,7 @@ jobs:
         run: |
           pip install build
           cd src/ifcpatch &&
-          make dist IS_STABLE=TRUE
+          make dist
       - name: Publish a Python distribution to PyPI
         uses: ortega2247/pypi-upload-action@master
         with:

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

@@ -1,13 +1,17 @@
-name: ci-ifcsverchok-daily
+name: Publish-ifcsverchok
 
 on:
-  workflow_dispatch:
   push:
     paths:
       - '.github/workflows/ci-ifcsverchok-build.yml'
       - 'src/ifcsverchok/*'
     branches:
-      - v0.8.0
+      - v0.7.0
+
+env:
+  major: 0
+  minor: 0
+  name: ifcsverchok
 
 jobs:
   activate:
@@ -30,22 +34,20 @@ jobs:
         with:
           architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified
           python-version: '3.11'
-      - name: Get current version
-        id: version
-        run: echo "version=$(cat VERSION)" >> $GITHUB_OUTPUT
+      - run: echo ${{ env.DATE }}
       - name: Get current date
         id: date
-        run: echo "date=$(date +'%y%m%d')" >> $GITHUB_OUTPUT
+        run: echo "::set-output name=date::$(date +'%y%m%d')"
       - name: Compile
         run: |
           cd src/ifcsverchok
           make dist
-      - name: Upload zip file to release
+      - name: Upload Zip file to release
         uses: svenstaro/upload-release-action@v2
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: src/ifcsverchok/dist/ifcsverchok-${{steps.version.outputs.version}}.${{steps.date.outputs.date}}.zip
-          asset_name: ifcsverchok-${{steps.version.outputs.version}}.${{steps.date.outputs.date}}.zip
-          release_name: "ifcsverchok-${{steps.version.outputs.version}}.${{steps.date.outputs.date}} (unstable)"
-          tag: "ifcsverchok-${{steps.version.outputs.version}}.${{steps.date.outputs.date}}"
+          file: src/ifcsverchok/dist/ifcsverchok-${{steps.date.outputs.date}}.zip
+          asset_name: ifcsverchok-${{steps.date.outputs.date}}.zip
+          tag: "ifcsverchok-${{steps.date.outputs.date}}"
           overwrite: true
+          body: "ifcsverchok build for ${{steps.date.outputs.date}}"

.github/workflows/ci-ifcsverchok.yml

@@ -1,42 +0,0 @@
-name: ci-ifcsverchok
-
-on:
-  workflow_dispatch:
-
-jobs:
-  activate:
-    runs-on: ubuntu-latest
-    if: |
-      github.repository == 'IfcOpenShell/IfcOpenShell'
-    steps:
-    - name: Set env
-      run: echo ok go
-
-  build:
-    needs: activate
-    name: ifcsverchok
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
-        with:
-          architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified
-          python-version: '3.11'
-      - name: Get current version
-        id: version
-        run: echo "version=$(cat VERSION)" >> $GITHUB_OUTPUT
-      - name: Compile
-        run: |
-          cd src/ifcsverchok
-          make dist IS_STABLE=TRUE
-      - name: Upload zip file to release
-        uses: svenstaro/upload-release-action@v2
-        with:
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: src/ifcsverchok/dist/ifcsverchok-${{steps.version.outputs.version}}.zip
-          asset_name: ifcsverchok-${{steps.version.outputs.version}}.zip
-          release_name: "ifcsverchok-${{steps.version.outputs.version}}"
-          tag: "ifcsverchok-${{steps.version.outputs.version}}"
-          overwrite: true

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

@@ -1,8 +1,21 @@
 name: ci-ifctester-pypi
 
 on:
+  schedule:
+    #         ┌───────────── minute (0 - 59)
+    #         │  ┌───────────── hour (0 - 23)
+    #         │  │ ┌───────────── day of the month (1 - 31)
+    #         │  │ │ ┌───────────── month (1 - 12 or JAN-DEC)
+    #         │  │ │ │ ┌───────────── day of the week (0 - 6 or SUN-SAT)
+    #         *  * * * *
+    - cron: "0 0 18 * *"
   workflow_dispatch:
 
+env:
+  major: 0
+  minor: 0
+  name: ifcopenshell
+
 jobs:
   activate:
     runs-on: ubuntu-latest
@@ -26,7 +39,7 @@ jobs:
         run: |
           pip install build
           cd src/ifctester &&
-          make dist IS_STABLE=TRUE
+          make dist
       - name: Publish a Python distribution to PyPI
         uses: ortega2247/pypi-upload-action@master
         with:

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

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

.github/workflows/ci.yml

@@ -46,8 +46,7 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install xmlschema xsdata numpy lxml pytest isodate lark networkx tabulate python-dateutil shapely
-          pip install mathutils
+          pip install xmlschema xsdata numpy lxml pytest isodate lark networkx tabulate python-dateutil
           pip install src/bcf --no-deps
           pip install https://github.com/Andrej730/aud/archive/refs/heads/master-reduced-size.zip
 
@@ -66,7 +65,7 @@ jobs:
           swig libpcre3-dev libxml2-dev \
           libtbb-dev nlohmann-json3-dev \
           libocct-foundation-dev libocct-modeling-algorithms-dev libocct-modeling-data-dev libocct-ocaf-dev libocct-visualization-dev libocct-data-exchange-dev \
-          libhdf5-dev libcgal-dev libeigen3-dev
+          libhdf5-dev libcgal-dev
           
       - name: ccache
         uses: hendrikmuhs/ccache-action@v1
@@ -91,7 +90,7 @@ jobs:
                -DPYTHON_INCLUDE_DIR:PATH=${{ env.pythonLocation }}/include/python3.11 \
                -DPYTHON_LIBRARY:FILEPATH=${{ env.pythonLocation }}/lib/libpython3.11.so \
                -DCOLLADA_SUPPORT=Off \
-               "-DSCHEMA_VERSIONS=2x3;4;4x3_add2" \
+               "-DSCHEMA_VERSIONS=2x3;4;4x3_add1" \
                -DGLTF_SUPPORT=On \
                -DJSON_INCLUDE_DIR=/usr/include \
                -DCGAL_INCLUDE_DIR=/usr/include \
@@ -100,14 +99,13 @@ jobs:
                -DGMP_LIBRARY_DIR=/usr/lib/x86_64-linux-gnu \
                -DMPFR_LIBRARY_DIR=/usr/lib/x86_64-linux-gnu \
                -DHDF5_INCLUDE_DIR=/usr/include/hdf5/serial \
-               -DEIGEN_DIR=/usr/include/eigen3 \
              ../cmake
           sudo make -j $(nproc)
           sudo make install
 
       - name: Run IfcConvert on Sample files
         run: |
-          (find test/input src/bonsai/test/files -name '*.ifc' | while read i; do \
+          (find test/input src/blenderbim/test/files -name '*.ifc' | while read i; do \
             echo $i | tee -a log; \
             timeout 1m "$(which IfcConvert)" -yv "$i" "$i.obj" --validate >> log 2>&1; \
             echo $i $? >> statuses; \
@@ -126,11 +124,4 @@ jobs:
           python tests.py
           cd ../src/ifcopenshell-python
           mv ifcopenshell ifcopenshell-local # Force testing on installed module
-          make test
-          cd ../bcf && make test
-          pip install requests
-          cd ../bsdd && make test
-          pip install deepdiff
-          cd ../ifcdiff && make test
-          cd ../ifcpatch && make test
-          cd ../ifctester && make test
+          make test-safe

.github/workflows/release.yml

@@ -8,12 +8,12 @@ on:
 jobs:
   activate:
     if: github.repository == 'IfcOpenShell/IfcOpenShell'
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     steps:
     - run: echo ok go
   build:
     needs: activate
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -52,8 +52,8 @@ jobs:
            -DOCC_INCLUDE_DIR=/usr/include/opencascade \
            -DOCC_LIBRARY_DIR=/usr/lib/x86_64-linux-gnu \
            -DPYTHON_EXECUTABLE:FILEPATH=/usr/bin/python3 \
-           -DPYTHON_INCLUDE_DIR:PATH=/usr/include/python3.10 \
-           -DPYTHON_LIBRARY:FILEPATH=/usr/lib/x86_64-linux-gnu/libpython3.10.so \
+           -DPYTHON_INCLUDE_DIR:PATH=/usr/include/python3.8 \
+           -DPYTHON_LIBRARY:FILEPATH=/usr/lib/x86_64-linux-gnu/libpython3.8.so \
            -DLIBXML2_INCLUDE_DIR=/usr/include/libxml2 \
            -DLIBXML2_LIBRARIES=/usr/lib/x86_64-linux-gnu/libxml2.so \
            -DGLTF_SUPPORT=On \

.gitignore

@@ -73,16 +73,19 @@ src/ifcopenshell-python/test/build
 # mypy cache
 .mypy_cache
 
-# bonsai i18n
-src/bonsai/bonsai/translations.py
+# blenderbim libs
+src/blenderbim/blenderbim/libs
 
-# bonsai test temp files
-src/bonsai/test/files/temp
-src/bonsai/test/files/basic.ifc.cache.blend
-src/bonsai/test/files/basic.ifc.cache.sqlite
+# blenderbim i18n
+src/blenderbim/blenderbim/translations.py
 
-src/bonsai/drawings
-src/bonsai/layouts
+# blenderbim test temp files
+src/blenderbim/test/files/temp
+src/blenderbim/test/files/basic.ifc.cache.blend
+src/blenderbim/test/files/basic.ifc.cache.sqlite
+
+src/blenderbim/drawings
+src/blenderbim/layouts
 
 # ifcopenshell swig and compiled files
 src/ifcopenshell-python/ifcopenshell/_ifcopenshell_wrapper.so
@@ -97,4 +100,4 @@ src/ifcopenshell-python/ifcopenshell/ifcopenshell_wrapper.py
 .cache
 
 # Brickschema
-src/bonsai/bonsai/bim/schema/Brick.ttl
+src/blenderbim/blenderbim/bim/schema/Brick.ttl

.gitmodules

@@ -11,9 +11,6 @@
 [submodule "src/ifcopenshell-python/test/Sample-BIM-Files"]
 	path = src/ifcopenshell-python/test/Sample-BIM-Files
 	url = https://github.com/IfcOpenShell/ids-test-files
-[submodule "src/ifcconvert/cityjson"]
-	path = src/ifcconvert/cityjson
-	url = https://github.com/IfcOpenShell/ifc-to-cityjson
 [submodule "docs/cpp-api/assets/doxygen-awesome-css"]
 	path = docs/cpp-api/assets/doxygen-awesome-css
 	url = https://github.com/jothepro/doxygen-awesome-css.git

Dockerfile

@@ -1,6 +1,6 @@
 # -*- mode: Dockerfile -*-
 
-FROM ubuntu:22.04
+FROM ubuntu:focal
 
 ARG CHANNEL
 ENV CHANNEL=${CHANNEL:-latest}
@@ -23,7 +23,7 @@ RUN echo "deb http://archive.ubuntu.com/ubuntu focal-proposed main restricted" |
     echo "deb http://archive.ubuntu.com/ubuntu focal-proposed multiverse" |  tee -a /etc/apt/sources.list; \
     apt-get -qq update; \
     apt-get -y install tzdata dos2unix rsync; \
-    apt-get -y install python3 libxml2 libpython3.10 \
+    apt-get -y install python3 libxml2 libpython3.8 \
                     libboost-all-dev \
                     libocct-foundation-dev libocct-modeling-algorithms-dev libocct-modeling-data-dev \
                     libocct-ocaf-dev libocct-visualization-dev libocct-data-exchange-dev \

README.md

@@ -12,7 +12,7 @@ is implemented for the IFC releases [IFC2x3 TC1] and [IFC4 Add2 TC1]. Extending
 is possible at compile-time when using C++ and at run-time when using Python.
 
 In addition to a C++ and Python API, IfcOpenShell comes with an ecosystem of tools, notably including IfcConvert (an application
-to convert IFC models to other formats), the ~~BlenderBIM~~ Bonsai Add-on (an add-on to Blender providing a graphical IFC authoring platform),
+to convert IFC models to other formats), the BlenderBIM Add-on (an add-on to Blender providing a graphical IFC authoring platform),
 and many other libraries, CLI apps, and more. Support is also provided for auxiliary standards such as BCF and IDS.
 
 For more information, see:
@@ -22,49 +22,53 @@ For more information, see:
   * [IfcOpenShell C++ Installation](https://docs.ifcopenshell.org/ifcopenshell/installation.html)
   * [IfcOpenShell Python Installation](https://docs.ifcopenshell.org/ifcopenshell-python/installation.html)
   * [IfcOpenShell Python Hello World Tutorial](https://docs.ifcopenshell.org/ifcopenshell-python/hello_world.html)
-* [Bonsai Website](https://bonsaibim.org)
-* [Bonsai Documentation](https://docs.bonsaibim.org/index.html)
-  * [Add-on Installation](https://docs.bonsaibim.org/users/installation.html)
-  * [Exploring an IFC model](https://docs.bonsaibim.org/users/exploring_an_ifc_model.html)
- 
-Development is sponsored through your generous donations!
+* [BlenderBIM Add-on Website](https://blenderbim.org)
+* [BlenderBIM Add-on Documentation](https://docs.blenderbim.org/index.html)
+  * [Add-on Installation](https://docs.blenderbim.org/users/installation.html)
+  * [Exploring an IFC model](https://docs.blenderbim.org/users/exploring_an_ifc_model.html)
 
-[![Open Collective Contributors](https://img.shields.io/opencollective/all/opensourcebim?label=Sponsors&color=22ce5f)](https://opencollective.com/opensourcebim/)
+| Service                                         | Status                                                                                                                                       |
+| ----------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------- |
+| Anaconda Daily Build                            | [![Anaconda-Server Badge](https://img.shields.io/conda/vn/ifcopenshell/ifcopenshell)](https://anaconda.org/ifcopenshell/ifcopenshell)        |
+| Anaconda v0.7.0 Stable                          | [![Anaconda-Server Badge](https://img.shields.io/conda/vn/conda-forge/ifcopenshell)](https://anaconda.org/conda-forge/ifcopenshell)          |
+| PyPi Daily Build                                | [![PyPi Badge](https://img.shields.io/pypi/v/ifcopenshell)](https://pypi.org/project/ifcopenshell/)                                          |
+| ArchLinux AUR Package Stable                    | [![AUR Badge](https://img.shields.io/aur/version/ifcopenshell)](https://aur.archlinux.org/packages/ifcopenshell)                             |
+| ArchLinux AUR Package git                       | [![AUR Badge](https://img.shields.io/aur/version/ifcopenshell-git)](https://aur.archlinux.org/packages/ifcopenshell-git)                     |
+| BlenderBIM Add-on Chocolatey (under moderation) | [![Chocolatey Badge](https://img.shields.io/chocolatey/v/blenderbim-nightly)](https://community.chocolatey.org/packages/blenderbim-nightly/) |
+| Sponsor development on OpenCollective           | [![Financial Contributors](https://opencollective.com/opensourcebim/tiers/badge.svg)](https://opencollective.com/opensourcebim/)             |
+| Docker hub                                      | [![Docker Pulls](https://img.shields.io/docker/pulls/aecgeeks/ifcopenshell)](https://hub.docker.com/r/aecgeeks/ifcopenshell)                 |
 
 Contents
 --------
 
-| Name                      | Description                                                           | License             | Service |
-| ------------------------- | --------------------------------------------------------------------- | ------------------- | ------- |
-| bcf                       | Library to read and write BCF-XML and query OpenCDE BCF-API modules   | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/bcf-client?label=PyPI&color=006dad)](https://pypi.org/project/bcf-client/) |
-| ~~blenderbim~~ Bonsai     | Add-on to Blender providing a graphical native IFC authoring platform | GPL-3.0-or-later    | [![Official](https://img.shields.io/badge/BonsaiBIM.org-Download-70ba35)](https://bonsaibim.org/download.html) [![GitHub Unstable](https://img.shields.io/github/v/release/ifcopenshell/ifcopenshell?filter=blenderbim-*&label=GitHub-Unstable&color=f6f8fa)](https://github.com/IfcOpenShell/IfcOpenShell/releases?q=blenderbim&expanded=true) [![Chocolatey](https://img.shields.io/chocolatey/v/blenderbim-nightly?label=Chocolatey&color=5c9fd8)](https://community.chocolatey.org/packages/blenderbim-nightly/) |
-| bsdd                      | Library to query the bSDD API                                         | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/bsdd?label=PyPI&color=006dad)](https://pypi.org/project/bsdd/) |
-| ifc2ca                    | Utility to convert IFC structural analysis models to Code_Aster       | LGPL-3.0-or-later   |
-| ifc4d                     | Convert to and from IFC and project management software               | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/ifc4d?label=PyPI&color=006dad)](https://pypi.org/project/ifc4d/) |
-| ifc5d                     | Report and optimise cost information from IFC                         | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/ifc5d?label=PyPI&color=006dad)](https://pypi.org/project/ifc5d/) |
-| ifcbimtester              | Wrapper for Gherkin based unit testing for IFC models                 | LGPL-3.0-or-later   |
-| ifcblender                | Historic Blender IFC import add-on                                    | LGPL-3.0-or-later\* |
-| ifccityjson               | Convert CityJSON to IFC                                               | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/ifccityjson?label=PyPI&color=006dad)](https://pypi.org/project/ifccityjson/) |
-| ifcclash                  | Clash detection library and CLI app                                   | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/ifcclash?label=PyPI&color=006dad)](https://pypi.org/project/ifcclash/) |
-| ifcconvert                | CLI app to convert IFC to many other formats                          | LGPL-3.0-or-later\* | [![Official](https://img.shields.io/badge/IfcOpenShell.org-Download-70ba35)](https://docs.ifcopenshell.org/ifcconvert/installation.html) [![GitHub](https://img.shields.io/github/v/release/ifcopenshell/ifcopenshell?filter=ifcconvert-*&label=GitHub&color=f6f8fa)](https://github.com/IfcOpenShell/IfcOpenShell/releases?q=ifcconvert&expanded=true)
-| ifccsv                    | Library and CLI app to export and import schedules from IFC           | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/ifccsv?label=PyPI&color=006dad)](https://pypi.org/project/ifccsv/) |
-| ifcdiff                   | Compare changes between IFC models                                    | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/ifcdiff?label=PyPI&color=006dad)](https://pypi.org/project/ifcdiff/) |
-| ifcfm                     | Extract IFC data for FM handover requirements                         | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/ifcfm?label=PyPI&color=006dad)](https://pypi.org/project/ifcfm/) |
-| ifcmax                    | Historic extension for IFC support in 3DS Max                         | LGPL-3.0-or-later\* | [![Official](https://img.shields.io/badge/IfcOpenShell.org-Download-70ba35)](https://docs.ifcopenshell.org/ifcmax.html)
-| ifcopenshell-python       | Python library for IFC manipulation                                   | LGPL-3.0-or-later\* | [![Official](https://img.shields.io/badge/IfcOpenShell.org-Download-70ba35)](https://docs.ifcopenshell.org/ifcopenshell-python/installation.html) [![GitHub](https://img.shields.io/github/v/release/ifcopenshell/ifcopenshell?filter=ifcopenshell-python-*&label=GitHub&color=f6f8fa)](https://github.com/IfcOpenShell/IfcOpenShell/releases?q=ifcopenshell-python&expanded=true) [![PyPI](https://img.shields.io/pypi/v/ifcopenshell?label=PyPI&color=006dad)](https://pypi.org/project/ifcopenshell/) [![Anaconda](https://img.shields.io/conda/vn/conda-forge/ifcopenshell?label=Anaconda&color=43b02a)](https://anaconda.org/conda-forge/ifcopenshell) [![Anaconda](https://img.shields.io/conda/vn/ifcopenshell/ifcopenshell?label=Anaconda-Unstable&color=43b02a)](https://anaconda.org/ifcopenshell/ifcopenshell) [![Docker](https://img.shields.io/docker/pulls/aecgeeks/ifcopenshell?label=Docker&color=1D63ED)](https://hub.docker.com/r/aecgeeks/ifcopenshell) [![AUR](https://img.shields.io/aur/version/ifcopenshell?label=AUR&color=1793d1)](https://aur.archlinux.org/packages/ifcopenshell) [![AUR Unstable](https://img.shields.io/aur/version/ifcopenshell-git?label=AUR-Unstable&color=1793d1)](https://aur.archlinux.org/packages/ifcopenshell-git) |
-| ifcpatch                  | Utility to run pre-packaged scripts to manipulate IFCs                | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/ifcpatch?label=PyPI&color=006dad)](https://pypi.org/project/ifcpatch/) |
-| ifcsverchok               | Blender Add-on for visual node programming with IFC                   | GPL-3.0-or-later    | [![GitHub Unstable](https://img.shields.io/github/v/release/ifcopenshell/ifcopenshell?filter=ifcsverchok-*.*.*.*&label=GitHub-Unstable&color=f6f8fa)](https://github.com/IfcOpenShell/IfcOpenShell/releases?q=ifcsverchok&expanded=true)
-| ifctester                 | Library, CLI and webapp for IDS model auditing                        | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/ifctester?label=PyPI&color=006dad)](https://pypi.org/project/ifctester/) |
-
-The IfcOpenShell C++ codebase is split into multiple interal libraries:
+Those marked with an asterisk are part of IfcOpenShell.
 
 | Name                      | Description                                                           | License             |
 | ------------------------- | --------------------------------------------------------------------- | ------------------- |
+| bcf                       | Library to read and write BCF-XML and query OpenCDE BCF-API modules   | LGPL-3.0-or-later   |
+| blenderbim                | Add-on to Blender providing a graphical native IFC authoring platform | GPL-3.0-or-later    |
+| bsdd                      | Library to query the bSDD API                                         | LGPL-3.0-or-later   |
+| ifc2ca                    | Utility to convert IFC structural analysis models to Code_Aster       | LGPL-3.0-or-later   |
+| ifc4d                     | Convert to and from IFC and project management software               | LGPL-3.0-or-later   |
+| ifc5d                     | Report and optimise cost information from IFC                         | LGPL-3.0-or-later   |
+| ifcbimtester              | Wrapper for Gherkin based unit testing for IFC models                 | LGPL-3.0-or-later   |
+| ifcblender                | Historic Blender IFC import add-on                                    | LGPL-3.0-or-later\* |
+| ifccityjson               | Convert CityJSON to IFC                                               | LGPL-3.0-or-later   |
+| ifcclash                  | Clash detection library and CLI app                                   | LGPL-3.0-or-later   |
+| ifcconvert                | CLI app to convert IFC to many other formats                          | LGPL-3.0-or-later\* |
+| ifccsv                    | Library and CLI app to export and import schedules from IFC           | LGPL-3.0-or-later   |
+| ifcdiff                   | Compare changes between IFC models                                    | LGPL-3.0-or-later   |
+| ifcfm                     | Extract IFC data for FM handover requirements                         | LGPL-3.0-or-later   |
 | ifcgeom                   | Internal library for IfcOpenShell                                     | LGPL-3.0-or-later\* |
 | ifcgeom\_schema\_agnostic | Internal library for IfcOpenShell                                     | LGPL-3.0-or-later\* |
 | ifcgeomserver             | Internal library for IfcOpenShell                                     | LGPL-3.0-or-later\* |
 | ifcjni                    | Internal library for IfcOpenShell                                     | LGPL-3.0-or-later\* |
+| ifcmax                    | Historic extension for IFC support in 3DS Max                         | LGPL-3.0-or-later\* |
+| ifcopenshell-python       | Python library for IFC manipulation                                   | LGPL-3.0-or-later\* |
 | ifcparse                  | Internal library for IfcOpenShell                                     | LGPL-3.0-or-later\* |
+| ifcpatch                  | Utility to run pre-packaged scripts to manipulate IFCs                | LGPL-3.0-or-later   |
+| ifcsverchok               | Blender Add-on for visual node programming with IFC                   | GPL-3.0-or-later    |
+| ifctester                 | Library, CLI and webapp for IDS model auditing                        | LGPL-3.0-or-later   |
 | ifcwrap                   | Internal library for IfcOpenShell                                     | LGPL-3.0-or-later\* |
 | qtviewer                  | Internal library for IfcOpenShell                                     | LGPL-3.0-or-later\* |
 | serializers               | Internal library for IfcOpenShell                                     | LGPL-3.0-or-later\* |

VERSION

@@ -1 +0,0 @@
-0.7.11

choco/blenderbim/blenderbim.nuspec

@@ -12,10 +12,10 @@
     <projectUrl>https://github.com/IfcOpenShell/IfcOpenShell</projectUrl>
     <iconUrl>https://rawcdn.githack.com/IfcOpenShell/IfcOpenShell/c6ee1d1679d1298de0d7447ff108c22709c68e54/choco/blenderbim/blenderbim.png</iconUrl>
     <!-- <copyright>Year Software Vendor</copyright> -->
-    <licenseUrl>https://github.com/IfcOpenShell/IfcOpenShell/blob/v0.8.0/COPYING</licenseUrl>
+    <licenseUrl>https://github.com/IfcOpenShell/IfcOpenShell/blob/v0.7.0/COPYING</licenseUrl>
     <requireLicenseAcceptance>true</requireLicenseAcceptance>
     <projectSourceUrl>https://github.com/IfcOpenShell/IfcOpenShell</projectSourceUrl>
-    <docsUrl>https://docs.bonsaibim.org/</docsUrl>
+    <docsUrl>https://docs.blenderbim.org/</docsUrl>
     <!--<mailingListUrl></mailingListUrl>-->
     <bugTrackerUrl>https://github.com/IfcOpenShell/IfcOpenShell/issues</bugTrackerUrl>
     <tags>blender bim blenderbim ifc python opensource foss</tags>

choco/blenderbim/check_repo_infos.py

@@ -0,0 +1,89 @@
+import datetime
+import re
+import sys
+from urllib import request
+
+
+def request_repo_info(url: str):
+    req  = request.Request(url)
+    resp = request.urlopen(req)
+    if not resp.status == 200:
+        print(f"[ERROR] could not contact server: {url}")
+        quit(1)
+    return resp
+
+
+def get_choco_package_info() -> str:
+    resp = request_repo_info(URL_CHOCO_PACKAGE)
+    html_txt = str(resp.read())
+    return html_txt
+
+
+def get_latest_blender_version() -> list:
+    html_txt = get_choco_package_info()
+    return re.findall(RE_BLENDER_VERSION_MIN_MAJ_PAT, html_txt)
+
+
+URL_IFCOS_RELEASES = "https://github.com/IfcOpenShell/IfcOpenShell/releases"
+URL_CHOCO_PACKAGE  = "https://community.chocolatey.org/packages/blender"
+URL_BLENDER_CMAKE  = "https://raw.githubusercontent.com/blender/blender/{}/build_files/cmake/Modules/FindPythonLibsUnix.cmake"
+RE_BLENDER_VERSION_MIN_MAJ        = r"Latest Version.+<span>Blender (\d+\.\d+)\..+</span>"
+RE_BLENDER_VERSION_MIN_MAJ_PAT    = r"Latest Version.+<span>Blender (\d+\.\d+\.\d+)</span>"
+RE_BLENDER_PYTHON_VERSION_MAJ_MIN = r"(?:set|SET)\(_PYTHON_VERSION_SUPPORTED (\d+\.\d+)\)"
+
+
+if sys.argv[1] == "--do_choco_release?":
+    now = datetime.datetime.now()
+    blenderbim_date = (now - datetime.timedelta(days=1)).strftime("%y%m%d")
+    resp = request_repo_info(URL_IFCOS_RELEASES)
+    text = str(resp.read())
+    if blenderbim_date in text:
+        print("do_choco_release", end="")
+
+
+elif sys.argv[1] == "--latest_blender_release_maj_min_pat?":
+    latest_blender_version = get_latest_blender_version()
+    if latest_blender_version:
+        print(latest_blender_version[0], end="")
+    else:
+        print("[ERROR] could not determine blender_version_min_maj_pat")
+        quit(1)
+
+
+elif sys.argv[1] == "--latest_blender_release_maj_min?":
+    html_txt = get_choco_package_info()
+    blender_version_min_maj = re.findall(RE_BLENDER_VERSION_MIN_MAJ, html_txt)
+    if blender_version_min_maj:
+        print(blender_version_min_maj[0], end="")
+    else:
+        print("[ERROR] could not determine blender_version_min_maj")
+        quit(1)
+
+
+elif sys.argv[1] == "--latest_blender_python_version_maj_min?":
+    latest_blender_version = get_latest_blender_version()
+    if latest_blender_version:
+        latest_blender_version_tag = f"v{latest_blender_version[0]}"
+        resp = request_repo_info(URL_BLENDER_CMAKE.format(latest_blender_version_tag))
+        html_txt = str(resp.read())
+        found = re.findall(RE_BLENDER_PYTHON_VERSION_MAJ_MIN, html_txt)
+        if found:
+            print(found[0], end="")
+        else:
+            print("[ERROR] could not determine blender_python_version_maj_min")
+            quit(1)
+
+
+elif sys.argv[1] == "--pyver?":
+    latest_blender_version = get_latest_blender_version()
+    if latest_blender_version:
+        latest_blender_version_tag = f"v{latest_blender_version[0]}"
+        resp = request_repo_info(URL_BLENDER_CMAKE.format(latest_blender_version_tag))
+        html_txt = str(resp.read())
+        found = re.findall(RE_BLENDER_PYTHON_VERSION_MAJ_MIN, html_txt)
+        if found:
+            print(f"py{found[0].replace('.', '')}", end="")
+        else:
+            print("[ERROR] could not determine pyver")
+            quit(1)
+

choco/blenderbim/fill_dynamic_parameters.py

@@ -0,0 +1,49 @@
+import os
+from pathlib import Path
+
+
+print("[INFO] inserting dynamic chocolatey package parameters")
+HERE_DIR = Path(__file__).parent.absolute()
+# print(f"[INFO] HERE_DIR: {HERE_DIR}")
+
+topics = {
+    "spec": {
+        "path": HERE_DIR / "blenderbim.nuspec",
+        "env_vars": {
+            "latest_blender_version_maj_min_pat",
+            "blenderbim_build_version",
+        },
+    },
+    "install": {
+        "path": HERE_DIR / "tools" / "chocolateyinstall.ps1",
+        "env_vars": {
+            "url_blenderbim_py310_win_zip",
+            "sha256sum_blenderbim_py310_win_zip",
+            "latest_blender_version_maj_min",
+        },
+    },
+    "uninstall": {
+        "path": HERE_DIR / "tools" / "chocolateyuninstall.ps1",
+        "env_vars": {
+            "latest_blender_version_maj_min",
+        },
+    },
+}
+
+for topic, info in topics.items():
+    print(f"[INFO] {topic}:")
+    for env_var_name in info["env_vars"]:
+        print(f"[INFO] {env_var_name} exists?: {os.environ[env_var_name]}")
+
+    with open(info["path"], encoding="utf-8") as txt:
+        content = txt.read()
+
+    for env_var_name in info["env_vars"]:
+        # print(f"[INFO] replace: {env_var_name}")
+        content = content.replace(env_var_name, os.environ[env_var_name])
+
+    with open(info["path"], "w", encoding="utf-8") as txt:
+        txt.write(content)
+        print(f"[INFO] written: {info['path']}")
+
+print("[INFO] inserting dynamic chocolatey package parameters successful")

choco/blenderbim/tools/chocolateyinstall.ps1

@@ -1,7 +1,7 @@
 $ErrorActionPreference = 'Stop'
 
-$url64          = 'url_blenderbim_py3x_win_zip'
-$checksum64     = 'sha256sum_blenderbim_py3x_win_zip'
+$url64          = 'url_blenderbim_py310_win_zip'
+$checksum64     = 'sha256sum_blenderbim_py310_win_zip'
 $checksumType64 = 'sha256'
 
 $appDataUserDir  = [System.Environment]::GetEnvironmentVariable('appdata')

choco/bonsai/choco_release.py

@@ -1,224 +0,0 @@
-# commands to run it on a generic ubuntu 2404 oci container:
-"""
-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/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
-import pathlib
-import re
-from urllib import request
-from github import Github
-from typing import NoReturn
-
-
-def get_repo_tag_names() -> list[str]:
-    git_return = os.popen("git tag -l").read()
-    tag_names = [tag_name for tag_name in git_return.split("\n") if tag_name]
-    print(f"{len(tag_names)} tag_names found in repo")
-    return tag_names
-
-
-def request_repo_info(url: str):
-    req  = request.Request(url)
-    resp = request.urlopen(req)
-    if not resp.status == 200:
-        print(f"[ERROR] could not contact server: {url}")
-        quit(1)
-    return resp
-
-
-def get_choco_package_info() -> str:
-    resp = request_repo_info(URL_CHOCO_PACKAGE)
-    html_txt = str(resp.read())
-    return html_txt
-
-
-def get_latest_choco_blender_version() -> list:
-    html_txt = get_choco_package_info()
-    return re.findall(RE_BLENDER_VERSION_MIN_MAJ_PAT, html_txt)
-
-
-def get_file_sha256_hash(file_path: str) -> str:
-    BLOCKSIZE = 65536
-    hasher = hashlib.sha256()
-
-    with open(file_path, "rb") as input_file:
-        buffer = input_file.read(BLOCKSIZE)
-        while len(buffer) > 0:
-            hasher.update(buffer)
-            buffer = input_file.read(BLOCKSIZE)
-
-    return hasher.hexdigest()
-
-
-def quit_with_error_message(message: str) -> NoReturn:
-    print(f"ERROR: {message}")
-    quit(0)
-
-
-def get_release_zip(tag: str) -> tuple[str, str]:
-    g = Github()
-    repo = g.get_repo("IfcOpenShell/IfcOpenShell")
-    release = repo.get_release(tag)
-    for asset in release.get_assets():
-        asset_name = asset.name
-        if python_version not in asset_name:
-            continue
-        if TARGET_OS not in asset_name:
-            continue
-        return (asset_name, asset.browser_download_url)
-    raise Exception(f"Couldn't find the release matching '{python_version}' and '{TARGET_OS}' in tag '{tag}'.")
-
-
-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>"
-RE_BLENDER_PYTHON_VERSION_MAJ_MIN = r"\(_PYTHON_VERSION_SUPPORTED (\d+\.\d+)\)"
-
-BLENDERBIM_DIR = pathlib.Path("/home/runner/work/IfcOpenShell/IfcOpenShell/choco/blenderbim/")
-
-print("_____ check choco release needed?")
-
-os.chdir(BLENDERBIM_DIR)
-
-blenderbim_date_yesterday = (datetime.datetime.now() - datetime.timedelta(days=1)).strftime("%y%m%d")
-should_release = False
-target_release_tag = ""
-TARGET_OS = "windows-x64"
-
-git_status = os.popen("git status").read()
-print(git_status)
-
-for tag_name in get_repo_tag_names():
-    print(tag_name)
-    if blenderbim_date_yesterday in tag_name:
-        should_release = True
-        target_release_tag = tag_name
-        print(f"found {tag_name=} - {should_release=}")
-        break
-
-if not should_release:
-    print(f"INFO: no blenderbim release tags found for {blenderbim_date_yesterday} -> no choco release today.")
-    quit(0)
-print(f"{should_release=}")
-
-if not os.environ.get("CHOCO_TOKEN"):
-    quit_with_error_message("could retrieve CHOCO_TOKEN env var")
-choco_token = os.environ["CHOCO_TOKEN"]
-
-print("\n_____ get blender info")
-# blender_version_min_maj_pat - from chocolatey.org
-latest_blender_release_maj_min_pat = get_latest_choco_blender_version()
-if not latest_blender_release_maj_min_pat:
-    quit_with_error_message("could not determine blender_version_min_maj_pat")
-latest_blender_release_maj_min_pat = latest_blender_release_maj_min_pat[0]
-print(f"{latest_blender_release_maj_min_pat=}")
-
-# blender_version_min_maj - from chocolatey.org
-blender_version_min_maj = latest_blender_release_maj_min_pat.rsplit(".", 1)[0]
-print(f"{blender_version_min_maj=}")
-
-# blender_python_version_maj_min - from blender repo
-python_version = ""
-latest_blender_version_tag = f"v{latest_blender_release_maj_min_pat}"
-resp = request_repo_info(URL_BLENDER_CMAKE.format(latest_blender_version_tag))
-html_txt = str(resp.read())
-found = re.findall(RE_BLENDER_PYTHON_VERSION_MAJ_MIN, html_txt)
-if not found:
-    quit_with_error_message("could not determine blender_python_version_maj_min")
-
-blender_python_version_maj_min = found[0]
-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("blenderbim-", "")
-
-# url_blenderbim_py3x_win_zip
-release_zip_file_name, url_blenderbim_py3x_win_zip = get_release_zip(target_release_tag)
-os.popen(f"wget {url_blenderbim_py3x_win_zip} --no-verbose").read()
-
-# sha256sum_blenderbim_py310_win_zip
-sha256sum_blenderbim_py3x_win_zip = get_file_sha256_hash(release_zip_file_name)
-
-print("\n_____ fill dynamic chocolatey package parameters")
-HERE_DIR = pathlib.Path(__file__).parent.absolute()
-# print(f"[INFO] HERE_DIR: {HERE_DIR}")
-
-topics = {
-    "spec": {
-        "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,
-        },
-    },
-    "install": {
-        "path": HERE_DIR / "tools" / "chocolateyinstall.ps1",
-        "key_values": {
-            "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,
-        },
-    },
-    "uninstall": {
-        "path": HERE_DIR / "tools" / "chocolateyuninstall.ps1",
-        "key_values": {
-            "latest_blender_version_maj_min": blender_version_min_maj,
-        },
-    },
-}
-
-for topic, info in topics.items():
-    print(f"  {topic}:")
-    with open(info["path"], encoding="utf-8") as txt:
-        content = txt.read()
-
-    for key, value in info["key_values"].items():
-        # print(f"[INFO] replace: {env_var_name}")
-        if not key in content:
-            print(f"  {key=} not found in {info['path']}")
-        content = content.replace(key, value)
-
-    with open(info["path"], "w", encoding="utf-8") as txt:
-        txt.write(content)
-        print(f"  written: {info['path']}")
-
-print("[INFO] inserting dynamic chocolatey package parameters successful")
-
-
-print("\n_____ build choco.exe with mono")
-
-choco_version = "1.1.0"
-os.popen(f"wget https://github.com/chocolatey/choco/archive/refs/tags/{choco_version}.tar.gz --quiet").read()
-os.popen(f"tar -xzf {choco_version}.tar.gz").read()
-print("choco tar unpack successful")
-os.chdir("choco-1.1.0")
-os.popen("./build.sh").read()
-
-os.popen("cp -r build_output/chocolatey /opt/chocolatey").read()
-os.chdir(BLENDERBIM_DIR)
-
-if pathlib.Path("/opt/chocolatey/choco.exe").exists():
-    print("choco build successful")
-
-print("\n_____ build choco pack")
-
-os.popen("mono /opt/chocolatey/choco.exe pack --allow-unofficial").read()
-os.popen('mono /opt/chocolatey/choco.exe setapikey --key="{choco_token}" --source="https://push.chocolatey.org/" --allow-unofficial').read()
-
-print("\n_____ build choco push")
-os.popen('mono /opt/chocolatey/choco.exe push --source="https://push.chocolatey.org/" --key="$CHOCO_TOKEN" --allow-unofficial --verbose').read()
-
-print(f"choco push of version: {target_release_tag} successful!")
-print(f"it took: {datetime.datetime.now() - start}")

cmake/CMakeLists.txt

@@ -17,35 +17,26 @@
 #                                                                              #
 ################################################################################
 
-cmake_minimum_required(VERSION 3.21)
-set(CMAKE_CXX_STANDARD 17)
+cmake_minimum_required(VERSION 3.5)
+set(CMAKE_CXX_STANDARD 14)
 set(CMAKE_CXX_STANDARD_REQUIRED ON) # not necessary, but encouraged
-set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
-find_program(CCACHE_FOUND ccache)
-if(CCACHE_FOUND)
-    set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
-endif()
+project(IfcOpenShell VERSION 0.7.0)
 
 cmake_policy(SET CMP0048 NEW)
 cmake_policy(SET CMP0074 NEW)
 cmake_policy(SET CMP0078 OLD)
 cmake_policy(SET CMP0086 NEW)
 if (POLICY CMP0144)
-    cmake_policy(SET CMP0144 NEW) # find_package() uses upper-case <PACKAGENAME>_ROOT variables.
+cmake_policy(SET CMP0144 NEW) # find_package() uses upper-case <PACKAGENAME>_ROOT variables.
 endif()
 
 if(NOT CMAKE_BUILD_TYPE)
     set(CMAKE_BUILD_TYPE "Release")
 endif()
 
-# Include utility macros and functions
-include(utilities.cmake)
-
 # use extra version to make pre-release using eg semver
-if(NOT DEFINED EXTRA_VERSION)
-    set(EXTRA_VERSION "-alpha.3")
-endif()
+set(EXTRA_VERSION "-alpha.3")
 
 option(MINIMAL_BUILD "The build is to make a minimal version of IFC converter from OCCT into IFC." OFF)
 option(WASM_BUILD "Build a WebAssembly binary." OFF)
@@ -67,36 +58,20 @@ option(BUILD_IFCMAX "Build IfcMax, a 3ds Max plug-in, Windows-only." OFF)
 option(BUILD_QTVIEWER "Build IfcOpenShell Qt GUI Viewer" OFF) # QtViewer requires Qt6
 option(BUILD_PACKAGE "" OFF)
 
-option(WITH_OPENCASCADE "Enable geometry interpretation using Open CASCADE" ON)
-option(WITH_CGAL "Enable geometry interpretation using CGAL" ON)
 option(COLLADA_SUPPORT "Build IfcConvert with COLLADA support (requires OpenCOLLADA)." ON)
 option(GLTF_SUPPORT "Build IfcConvert with glTF support (requires json.hpp)." OFF)
 option(HDF5_SUPPORT "Enable HDF5 support (requires HDF5, zlib)" ON)
 option(WITH_PROJ "Enable output of Earth-Centered Earth-Fixed glTF output using the PROJ library" OFF)
 option(IFCXML_SUPPORT "Build IfcParse with ifcXML support (requires libxml2)." ON)
 option(USD_SUPPORT "Build IfcConvert with USD support (requires pixar's USD library)." OFF)
-option(CITYJSON_SUPPORT "Build IfcConvert with CityJSON support (requires CityJSON library)." ON)
-option(WITH_RELATIONSHIP_VALIDATION "Build IfcConvert with option to validate geometrical relationships." OFF)
 
 option(USERSPACE_PYTHON_PREFIX "Installs IfcPython for the current user only instead of system-wide." OFF)
 option(ADD_COMMIT_SHA "Add commit sha and branch in version number, warning results in many rebuilds, requires git" OFF)
-option(VERSION_OVERRIDE "Override the version defined in IfcParse.h with the file VERSION in the repository root" OFF)
-
-if (VERSION_OVERRIDE)
-    file(READ "../VERSION" "RELEASE_VERSION_")
-    string(STRIP "${RELEASE_VERSION_}" RELEASE_VERSION)
-    message(STATUS "Detected version '${RELEASE_VERSION}'")
-else()
-    set(RELEASE_VERSION "0.8.0")
-endif()
-
-project(IfcOpenShell VERSION ${RELEASE_VERSION})
 
 if(MINIMAL_BUILD)
     message(STATUS "Setting options for minimal build")
     set(BUILD_GEOMSERVER OFF)
     set(BUILD_IFCPYTHON OFF)
-    set(WITH_CGAL OFF)
     set(COLLADA_SUPPORT OFF)
     set(GLTF_SUPPORT OFF)
     set(HDF5_SUPPORT OFF)
@@ -162,11 +137,17 @@ if(BUILD_SHARED_LIBS)
     set(IFCOPENSHELL_LIBRARY_DIR "${LIBDIR}")
 endif()
 
+# Create cache entries if absent for environment variables
+macro(UNIFY_ENVVARS_AND_CACHE VAR)
+    if((NOT DEFINED ${VAR}) AND(NOT "$ENV{${VAR}}" STREQUAL ""))
+        set(${VAR} "$ENV{${VAR}}" CACHE STRING "${VAR}" FORCE)
+    endif()
+endmacro()
+
 UNIFY_ENVVARS_AND_CACHE(OCC_INCLUDE_DIR)
 UNIFY_ENVVARS_AND_CACHE(OCC_LIBRARY_DIR)
 UNIFY_ENVVARS_AND_CACHE(BOOST_ROOT)
 UNIFY_ENVVARS_AND_CACHE(BOOST_LIBRARYDIR)
-UNIFY_ENVVARS_AND_CACHE(EIGEN_DIR)
 
 if(NOT MINIMAL_BUILD)
     UNIFY_ENVVARS_AND_CACHE(OPENCOLLADA_INCLUDE_DIR)
@@ -186,14 +167,6 @@ if(NOT MINIMAL_BUILD)
     UNIFY_ENVVARS_AND_CACHE(MPFR_LIBRARY_DIR)
 endif()
 
-# Get a list of all OPTION flags from the CMakeLists.txt
-get_all_option_flags(option_flags)
-
-# Loop through the list of OPTION flags and convert the corresponding environment variables
-foreach(option_flag IN LISTS option_flags)
-    convert_env_var_to_bool("${option_flag}")
-endforeach()
-
 if(WASM_BUILD)
     # when using the nix/build-all.py build script we should not
     # look into the sysroot for most of the dependencies but rather
@@ -202,30 +175,12 @@ if(WASM_BUILD)
     set(CMAKE_FIND_ROOT_PATH "")
 endif()
 
-if(WITH_CGAL)
-    add_definitions(-DIFOPSH_WITH_CGAL)
-    set(SWIG_DEFINES ${SWIG_DEFINES} -DIFOPSH_WITH_CGAL)
-
-    if(CITYJSON_SUPPORT)
-		add_definitions(-DIFOPSH_WITH_CITYJSON)
-    endif()
-
-    list(APPEND GEOMETRY_KERNELS cgal)
-endif()
-
-if(WITH_OPENCASCADE)
-    add_definitions(-DIFOPSH_WITH_OPENCASCADE)
-    set(SWIG_DEFINES ${SWIG_DEFINES} -DIFOPSH_WITH_OPENCASCADE)
-    list(APPEND GEOMETRY_KERNELS opencascade)
-endif()
-
-if(GLTF_SUPPORT OR CITYJSON_SUPPORT)
+if(GLTF_SUPPORT AND BUILD_CONVERT)
     UNIFY_ENVVARS_AND_CACHE(JSON_INCLUDE_DIR)
-    find_path(json_header_path "nlohmann/json.hpp" HINTS ${JSON_INCLUDE_DIR})
-    set(JSON_INCLUDE_DIR ${json_header_path})
+    find_file(json_hpp "json.hpp" ${JSON_INCLUDE_DIR}/nlohmann)
 
-    if(json_header_path)
-        message(STATUS "JSON for Modern C++ header file found in ${JSON_INCLUDE_DIR}")
+    if(json_hpp)
+        message(STATUS "JSON for Modern C++ header file found")
     else()
         message(FATAL_ERROR "Unable to find JSON for Modern C++ header file, aborting")
     endif()
@@ -234,7 +189,7 @@ if(GLTF_SUPPORT OR CITYJSON_SUPPORT)
     set(SWIG_DEFINES ${SWIG_DEFINES} -DWITH_GLTF)
 endif()
 
-# Add USD support to serializers 
+# Add USD support to serializers
 if(USD_SUPPORT)
     UNIFY_ENVVARS_AND_CACHE(USD_INCLUDE_DIR)
     UNIFY_ENVVARS_AND_CACHE(USD_LIBRARY_DIR)
@@ -257,13 +212,13 @@ if(USD_SUPPORT)
     endif()
 
     set(USD_LIBRARIES
-            usd_usd 
+            usd_usd
             usd_usdGeom
-            usd_usdShade 
-            usd_usdLux 
-            usd_vt 
-            usd_sdf 
-            usd_tf 
+            usd_usdShade
+            usd_usdLux
+            usd_vt
+            usd_sdf
+            usd_tf
             usd_gf
         )
 
@@ -279,7 +234,23 @@ if(USD_SUPPORT)
 
     add_definitions(-DWITH_USD)
     set(SWIG_DEFINES ${SWIG_DEFINES} -DWITH_USD)
-endif(USD_SUPPORT)
+endif()
+
+# Set INSTALL_RPATH for target
+macro(SET_INSTALL_RPATHS _target _paths)
+    set(${_target}_rpaths "")
+
+    foreach(_path ${_paths})
+        list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${_path}" isSystemDir)
+
+        if("${isSystemDir}" STREQUAL "-1")
+            list(APPEND ${_target}_rpaths ${_path})
+        endif()
+    endforeach()
+
+    message(STATUS "Set INSTALL_RPATH for ${_target}: ${${_target}_rpaths}")
+    set_target_properties(${_target} PROPERTIES INSTALL_RPATH "${${_target}_rpaths}")
+endmacro()
 
 # Find Boost: On win32 the (hardcoded) default is to use static libraries and
 # runtime, when doing running conda-build we pick what conda prepared for us.
@@ -309,7 +280,7 @@ else()
     endif()
 endif()
 
-if(WASM_BUILD)
+if (WASM_BUILD)
     set(BOOST_COMPONENTS)
 else()
     # @todo review this, shouldn't this be all possible header-only now?
@@ -342,13 +313,50 @@ if(IFCXML_SUPPORT)
     set(SWIG_DEFINES ${SWIG_DEFINES} -DWITH_IFCXML)
 endif()
 
+# Usage:
+# set(SOME_LIRARIES foo bar)
+# add_debug_variants(SOME_LIRARIES "${SOME_LIRARIES}" d)
+# "foo bar" -> "optimized foo debug food optimized bar debug bard"
+# or
+# set(SOME_LIRARIES path/foo.lib)
+# add_debug_variants(SOME_LIRARIES "${SOME_LIRARIES}" "d")
+# "path/foo.lib" -> "optimized path/foo.lib debug path/food.lib"
+# TODO Could be refined: take the library file extension as a parameter and
+# make sure the lib variable ends with not just contains it.
+function(add_debug_variants NAME LIBRARIES POSTFIX)
+    set(LIBRARIES_STR "${LIBRARIES}")
+    set(LIBRARIES "")
+
+    # the result, "optimized <lib> debug <lib>", needs to be a list instead of a string
+    foreach(lib ${LIBRARIES_STR})
+        list(APPEND LIBRARIES optimized)
+
+        if("${lib}" MATCHES ".lib")
+            string(REPLACE ".lib" "" lib ${lib})
+            list(APPEND LIBRARIES ${lib}.lib)
+        else()
+            list(APPEND LIBRARIES ${lib})
+        endif()
+
+        list(APPEND LIBRARIES debug)
+
+        if("${lib}" MATCHES ".lib")
+            string(REPLACE ".lib" "" lib ${lib})
+            list(APPEND LIBRARIES ${lib}${POSTFIX}.lib)
+        else()
+            list(APPEND LIBRARIES ${lib}${POSTFIX})
+        endif()
+    endforeach()
+
+    set(${NAME} ${LIBRARIES} PARENT_SCOPE)
+endfunction()
+
 if(BUILD_IFCGEOM)
     if(MSVC)
         add_debug_variants(LIBXML2_LIBRARIES "${LIBXML2_LIBRARIES}" d)
     endif()
 
     # Open CASCADE
-    if(WITH_OPENCASCADE)
     if("${OCC_INCLUDE_DIR}" STREQUAL "")
         find_path(OCC_INCLUDE_DIR Standard_Version.hxx
             PATHS
@@ -380,7 +388,7 @@ if(BUILD_IFCGEOM)
         file(STRINGS ${OCC_INCLUDE_DIR}/Standard_Version.hxx OCC_MAINT
           REGEX "#define OCC_VERSION_MAINTENANCE.*"
         )
-        string(REGEX MATCH "[0-9]+" OCC_MAINT ${OCC_MAINT})
+        string(REGEX MATCH "[0-9]+" OCC_MAINT ${OCC_MAINT})     
         set(OCC_VERSION_STRING "${OCC_MAJOR}.${OCC_MINOR}.${OCC_MAINT}")
     endif(OCC_INCLUDE_DIR)
 
@@ -391,7 +399,6 @@ if(BUILD_IFCGEOM)
         # @todo investigate the exact conditions when this is necessary
         TKBin
     )
-
     if(OCC_VERSION_STRING VERSION_LESS 7.8.0)
         list(APPEND OPENCASCADE_LIBRARY_NAMES  TKIGES TKSTEPBase TKSTEPAttr TKSTEP209 TKSTEP)
     else(OCC_VERSION_STRING VERSION_LESS 7.8.0)
@@ -452,7 +459,7 @@ if(BUILD_IFCGEOM)
 
     if(OCCT_STATIC)
         find_package(Threads)
-        
+
         if(WASM_BUILD)
             set(OPENCASCADE_LIBRARIES ${OPENCASCADE_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
         else()
@@ -464,15 +471,15 @@ if(BUILD_IFCGEOM)
                 set(OPENCASCADE_LIBRARIES -Wl,--start-group ${OPENCASCADE_LIBRARIES} -Wl,--end-group ${CMAKE_THREAD_LIBS_INIT})
             endif()
         endif()
-        
-        if(NOT APPLE AND NOT WIN32)
+
+        if (NOT APPLE AND NOT WIN32)
             set(OPENCASCADE_LIBRARIES ${OPENCASCADE_LIBRARIES} "rt")
         endif()
-        if(NOT WIN32)
+        if (NOT WIN32)
             set(OPENCASCADE_LIBRARIES ${OPENCASCADE_LIBRARIES} "dl")
         endif()
     endif()
-    endif(WITH_OPENCASCADE)
+
 endif(BUILD_IFCGEOM)
 
 if(COLLADA_SUPPORT)
@@ -557,7 +564,7 @@ if(COLLADA_SUPPORT)
         message(FATAL_ERROR "COLLADA_SUPPORT enabled, but unable to find OpenCOLLADA headers. "
             "Disable COLLADA_SUPPORT or fix OpenCOLLADA paths to proceed.")
     endif()
-endif(COLLADA_SUPPORT)
+endif()
 
 if(HDF5_SUPPORT)
     if("${HDF5_INCLUDE_DIR}" STREQUAL "")
@@ -600,26 +607,32 @@ if(HDF5_SUPPORT)
         else()
             message(STATUS "Packaging hdf5 and zlib for conda distribution")
 
-            if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-                # macOS
-                set(zlib_post libz)
-                set(lib_ext dylib)
-                set(HDF5_LIBRARIES
-                "${HDF5_LIBRARY_DIR}/libhdf5_cpp.${lib_ext}"
-                "${HDF5_LIBRARY_DIR}/libhdf5.${lib_ext}"
-                "${HDF5_LIBRARY_DIR}/${zlib_post}.${lib_ext}"
-            )
+            if(WIN32)
+                # Windows
+                set(HDF5_LIBRARIES)
+                find_package(HDF5 COMPONENTS CXX)
+                if (HDF5_FOUND)
+                    set(HDF5_LIBRARIES ${HDF5_CXX_LIBRARIES})
+                endif()
+                list(APPEND HDF5_LIBRARIES
+                    "${HDF5_LIBRARY_DIR}/zlib.lib"
+                )
             else()
-                # linux and windows
-                # Find HDF5 package
-                find_package(HDF5 REQUIRED COMPONENTS C CXX)
-                # Find ZLIB package
-                find_package(ZLIB REQUIRED)
-                # Include directories
-                include_directories(${HDF5_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS})
-                # Link libraries
-                set(HDF5_LIBRARIES ${HDF5_LIBRARIES} ${ZLIB_LIBRARIES})
-                message(STATUS "HDF5 libraries: ${HDF5_LIBRARIES}")
+                if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+                    # macOS
+                    set(zlib_post libz)
+                    set(lib_ext dylib)
+                else()
+                    # linux
+                    set(zlib_post libz)
+                    set(lib_ext so)
+                endif()
+
+                set(HDF5_LIBRARIES
+                    "${HDF5_LIBRARY_DIR}/libhdf5_cpp.${lib_ext}"
+                    "${HDF5_LIBRARY_DIR}/libhdf5.${lib_ext}"
+                    "${HDF5_LIBRARY_DIR}/${zlib_post}.${lib_ext}"
+                )
             endif()
         endif()
     endif()
@@ -637,7 +650,7 @@ if(HDF5_SUPPORT)
 
     add_definitions(-DWITH_HDF5)
     set(SWIG_DEFINES ${SWIG_DEFINES} -DWITH_HDF5)
-endif(HDF5_SUPPORT)
+endif()
 
 if(WASM_BUILD)
     # reset to use sysroot
@@ -668,17 +681,15 @@ if(ENABLE_BUILD_OPTIMIZATIONS)
         set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELEASE} -O3")
     endif()
 else()
-    # @tfk I commented this out as this kind of defeats the purpose of RelWithDebInfo. For the
-    # best debugging experience simply use Debug. Note that in MSVC you can selectively toggle
-    # optimization on a specific file if you're investigating a specific issue.
-    # if(MSVC)
-    #     set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /Od")
-    # endif()
-endif(ENABLE_BUILD_OPTIMIZATIONS)
+    if(MSVC)
+        set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /Od")
+    endif()
+endif()
 
 if(MSVC)
     # warning due to virtual inheritance
     add_definitions(-wd4250)
+
     # warning due to select definitions in the schema being redundant
     add_definitions(-wd4584)
 
@@ -714,22 +725,20 @@ if(MSVC)
         add_definitions(-permissive-)
     endif()
 
-    # Link against the static VC runtime
-    # TODO Make this configurable
-    # if("$ENV{CONDA_BUILD}" STREQUAL "")
-    #     foreach(flag CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE CMAKE_CXX_FLAGS_MINSIZEREL
-    #     CMAKE_CXX_FLAGS_RELWITHDEBINFO CMAKE_C_FLAGS CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_RELEASE
-    #     CMAKE_C_FLAGS_MINSIZEREL CMAKE_C_FLAGS_RELWITHDEBINFO)
-    #         if(${flag} MATCHES "/MD")
-    #             STRING(REGEX REPLACE "/MD" "/MT" ${flag} "${${flag}}")
-    #         endif()
-    #         if(${flag} MATCHES "/MDd")
-    #             STRING(REGEX REPLACE "/MDd" "/MTd" ${flag} "${${flag}}")
-    #         endif()
-    #     endforeach()
-    # endif()
-
-	add_definitions(-D_ENABLE_EXTENDED_ALIGNED_STORAGE)
+# Link against the static VC runtime
+# TODO Make this configurable
+# IF("$ENV{CONDA_BUILD}" STREQUAL "")
+# FOREACH(flag CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE CMAKE_CXX_FLAGS_MINSIZEREL
+# CMAKE_CXX_FLAGS_RELWITHDEBINFO CMAKE_C_FLAGS CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_RELEASE
+# CMAKE_C_FLAGS_MINSIZEREL CMAKE_C_FLAGS_RELWITHDEBINFO)
+# IF(${flag} MATCHES "/MD")
+# STRING(REGEX REPLACE "/MD" "/MT" ${flag} "${${flag}}")
+# ENDIF()
+# IF(${flag} MATCHES "/MDd")
+# STRING(REGEX REPLACE "/MDd" "/MTd" ${flag} "${${flag}}")
+# ENDIF()
+# ENDFOREACH()
+# ENDIF()
 else()
     add_definitions(-Wall -Wextra)
 
@@ -748,20 +757,29 @@ else()
     if(UNIX)
         add_definitions(-fPIC)
     endif()
-endif(MSVC)
+endif()
 
 include_directories(${INCLUDE_DIRECTORIES} ${OCC_INCLUDE_DIR} ${OPENCOLLADA_INCLUDE_DIRS}
 	${Boost_INCLUDE_DIRS} ${LIBXML2_INCLUDE_DIR} ${JSON_INCLUDE_DIR} ${HDF5_INCLUDE_DIR}
-    ${EIGEN_DIR} ${CGAL_INCLUDE_DIR} ${GMP_INCLUDE_DIR} ${MPFR_INCLUDE_DIR} ${USD_INCLUDE_DIR}
-    ${TBB_INCLUDE_DIR}
+    ${USD_INCLUDE_DIR}
 )
 
+function(files_for_ifc_version IFC_VERSION RESULT_NAME)
+    set(IFC_PARSE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../src/ifcparse)
+    set(${RESULT_NAME}
+        ${IFC_PARSE_DIR}/Ifc${IFC_VERSION}.h
+        ${IFC_PARSE_DIR}/Ifc${IFC_VERSION}enum.h
+        ${IFC_PARSE_DIR}/Ifc${IFC_VERSION}.cpp
+        PARENT_SCOPE
+    )
+endfunction()
+
 if(NOT SCHEMA_VERSIONS)
     if(WASM_BUILD)
         # super arbitrarily try to keep size down at least a little bit
         set(SCHEMA_VERSIONS "2x3" "4")
     else()
-        set(SCHEMA_VERSIONS "2x3" "4" "4x1" "4x2" "4x3" "4x3_tc1" "4x3_add1" "4x3_add2")
+        set(SCHEMA_VERSIONS "2x3" "4" "4x1" "4x2" "4x3_rc1" "4x3_rc2" "4x3_rc3" "4x3_rc4" "4x3" "4x3_tc1" "4x3_add1" "4x3_add2")
     endif()
 endif()
 
@@ -834,7 +852,7 @@ if(COMPILE_SCHEMA)
             list(REMOVE_ITEM IFC_RELEASE_NOT_USED "${schema}")
         endif()
     endforeach()
-endif(COMPILE_SCHEMA)
+endif()
 
 # Boost >= 1.58 requires BOOST_OPTIONAL_USE_OLD_DEFINITION_OF_NONE to build on some Linux distros.
 if(NOT Boost_VERSION LESS 105800)
@@ -842,37 +860,22 @@ if(NOT Boost_VERSION LESS 105800)
 endif()
 
 set(IFCOPENSHELL_LIBRARIES IfcParse)
-
-if(BUILD_IFCGEOM)
+if (BUILD_IFCGEOM)
 	foreach(schema ${SCHEMA_VERSIONS})
-		set(IFCGEOM_SCHEMA_LIBRARIES ${IFCGEOM_SCHEMA_LIBRARIES} geometry_mapping_ifc${schema})
+		set(IFCGEOM_SCHEMA_LIBRARIES ${IFCGEOM_SCHEMA_LIBRARIES} IfcGeom_ifc${schema})
 	endforeach()
-	if(WASM_BUILD)
+	if (WASM_BUILD)
 	    set(IFCOPENSHELL_LIBRARIES ${IFCOPENSHELL_LIBRARIES} IfcGeom ${IFCGEOM_SCHEMA_LIBRARIES})
 	else()
-	    set(IFCOPENSHELL_LIBRARIES ${IFCOPENSHELL_LIBRARIES} IfcGeom ${IFCGEOM_SCHEMA_LIBRARIES} IfcGeom ${IFCGEOM_SCHEMA_LIBRARIES})	
+	    set(IFCOPENSHELL_LIBRARIES ${IFCOPENSHELL_LIBRARIES} IfcGeom ${IFCGEOM_SCHEMA_LIBRARIES} IfcGeom ${IFCGEOM_SCHEMA_LIBRARIES})
 	endif()
 endif()
 
-if(BUILD_CONVERT OR BUILD_IFCPYTHON)
+if (BUILD_CONVERT OR BUILD_IFCPYTHON)
 	foreach(schema ${SCHEMA_VERSIONS})
 		set(SERIALIZER_SCHEMA_LIBRARIES ${SERIALIZER_SCHEMA_LIBRARIES} Serializers_ifc${schema})
 	endforeach()
 	set(IFCOPENSHELL_LIBRARIES ${IFCOPENSHELL_LIBRARIES} Serializers ${SERIALIZER_SCHEMA_LIBRARIES})
-
-    if(WITH_OPENCASCADE)
-        foreach(schema ${SCHEMA_VERSIONS})
-            set(GEOM_SERIALIZER_SCHEMA_LIBRARIES ${GEOM_SERIALIZER_SCHEMA_LIBRARIES} GeometrySerializers_ifc${schema})
-
-            add_library(geometry_serializer_ifc${schema} STATIC ../src/ifcgeom/Serialization/schema/Serialization.cpp)
-            set_target_properties(geometry_serializer_ifc${schema} PROPERTIES COMPILE_FLAGS "-DIFC_GEOM_EXPORTS -DIfcSchema=Ifc${schema}")
-            list(APPEND geometry_serializer_libraries geometry_serializer_ifc${schema})
-        endforeach()
-
-        add_library(geometry_serializer STATIC ../src/ifcgeom/Serialization/Serialization.cpp)
-        target_link_libraries(geometry_serializer ${geometry_serializer_libraries})
-        set(IFCOPENSHELL_LIBRARIES ${IFCOPENSHELL_LIBRARIES} geometry_serializer ${geometry_serializer_libraries})
-    endif()
 endif()
 
 # IfcParse
@@ -911,70 +914,29 @@ set(IFCPARSE_FILES ${IFCPARSE_CPP_FILES} ${IFCPARSE_H_FILES})
 add_library(IfcParse ${IFCPARSE_FILES})
 set_target_properties(IfcParse PROPERTIES COMPILE_FLAGS -DIFC_PARSE_EXPORTS VERSION "${PROJECT_VERSION}" SOVERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}")
 
-if(WASM_BUILD)
+if (WASM_BUILD)
     target_link_libraries(IfcParse ${BCRYPT_LIBRARIES} ${LIBXML2_LIBRARIES})
 else()
     target_link_libraries(IfcParse ${Boost_LIBRARIES} ${BCRYPT_LIBRARIES} ${LIBXML2_LIBRARIES})
 endif()
 
 if(BUILD_IFCGEOM)
-    if(WITH_CGAL)
-        find_library(libGMP NAMES gmp mpir PATHS ${GMP_LIBRARY_DIR} NO_DEFAULT_PATH)
-        find_library(libMPFR NAMES mpfr PATHS ${MPFR_LIBRARY_DIR} NO_DEFAULT_PATH)
-        if(NOT libGMP)
-            message(FATAL_ERROR "Unable to find GMP library files, aborting")
-        endif()
-        if(NOT libMPFR)
-            message(FATAL_ERROR "Unable to find MPFR library files, aborting")
-        endif()
-
-        list(APPEND CGAL_LIBRARIES "${libMPFR}")
-        list(APPEND CGAL_LIBRARIES "${libGMP}")
-    endif()
-
-    foreach(kernel ${GEOMETRY_KERNELS})
-        string(TOUPPER ${kernel} KERNEL_UPPER)
-        file(GLOB IFCGEOM_H_FILES ../src/ifcgeom/kernels/${kernel}/*.h)
-        file(GLOB IFCGEOM_CPP_FILES ../src/ifcgeom/kernels/${kernel}/*.cpp)
-        set(IFCGEOM_FILES ${IFCGEOM_CPP_FILES} ${IFCGEOM_H_FILES})
-        
-        add_library(geometry_kernel_${kernel} ${IFCGEOM_FILES})
-        set_property(TARGET geometry_kernel_${kernel} APPEND PROPERTY COMPILE_FLAGS "-DIFC_GEOM_EXPORTS")
-        # needed?
-        # if(NOT WASM_BUILD)
-        # endif()
-        target_link_libraries(geometry_kernel_${kernel} ${${KERNEL_UPPER}_LIBRARIES})
-        list(APPEND kernel_libraries geometry_kernel_${kernel})
-        
-        if(${kernel} STREQUAL "cgal")
-            set_property(TARGET geometry_kernel_${kernel} APPEND_STRING PROPERTY COMPILE_FLAGS " -DCGAL_HAS_THREADS")
-
-            add_library(geometry_kernel_${kernel}_simple ${IFCGEOM_FILES})
-            set_target_properties(geometry_kernel_${kernel}_simple PROPERTIES COMPILE_FLAGS "-DIFC_GEOM_EXPORTS -DIFOPSH_SIMPLE_KERNEL -DCGAL_HAS_THREADS")
-            # needed?
-            # if(NOT WASM_BUILD)
-            # endif()
-            target_link_libraries(geometry_kernel_${kernel}_simple ${${KERNEL_UPPER}_LIBRARIES})
-            list(APPEND kernel_libraries geometry_kernel_${kernel}_simple)
-        endif()
-    endforeach()
-
     # IfcGeom
+    file(GLOB IFCGEOM_H_FILES ../src/ifcgeom/*.h ../src/ifcgeom/*.i)
+    file(GLOB IFCGEOM_CPP_FILES ../src/ifcgeom/*.cpp)
+    set(IFCGEOM_FILES ${IFCGEOM_CPP_FILES} ${IFCGEOM_H_FILES})
+
     foreach(schema ${SCHEMA_VERSIONS})
-        file(GLOB IFCGEOM_I_FILES ../src/ifcgeom/mapping/*.i)
-        file(GLOB IFCGEOM_H_FILES ../src/ifcgeom/mapping/*.h)
-        file(GLOB IFCGEOM_CPP_FILES ../src/ifcgeom/mapping/*.cpp)
-        set(IFCGEOM_FILES ${IFCGEOM_CPP_FILES} ${IFCGEOM_H_FILES} ${IFCGEOM_I_FILES})
-        
-        add_library(geometry_mapping_ifc${schema} STATIC ${IFCGEOM_FILES})
-        set_target_properties(geometry_mapping_ifc${schema} PROPERTIES COMPILE_FLAGS "-DIFC_GEOM_EXPORTS -DIfcSchema=Ifc${schema}")
-        target_link_libraries(geometry_mapping_ifc${schema} IfcParse)
-        list(APPEND mapping_libraries geometry_mapping_ifc${schema})
+        add_library(IfcGeom_ifc${schema} STATIC ${IFCGEOM_FILES})
+        set_target_properties(IfcGeom_ifc${schema} PROPERTIES COMPILE_FLAGS "-DIFC_GEOM_EXPORTS -DIfcSchema=Ifc${schema}")
+        if (NOT WASM_BUILD)
+            target_link_libraries(IfcGeom_ifc${schema} IfcParse ${OPENCASCADE_LIBRARIES})
+        endif()
     endforeach()
 
     # IfcGeom (schema agnostic)
-    file(GLOB SCHEMA_AGNOSTIC_H_FILES ../src/ifcgeom/*.h)
-    file(GLOB SCHEMA_AGNOSTIC_CPP_FILES ../src/ifcgeom/*.cpp)
+    file(GLOB SCHEMA_AGNOSTIC_H_FILES ../src/ifcgeom_schema_agnostic/*.h)
+    file(GLOB SCHEMA_AGNOSTIC_CPP_FILES ../src/ifcgeom_schema_agnostic/*.cpp)
     set(SCHEMA_AGNOSTIC_FILES ${SCHEMA_AGNOSTIC_H_FILES} ${SCHEMA_AGNOSTIC_CPP_FILES})
 
     add_library(IfcGeom ${SCHEMA_AGNOSTIC_FILES})
@@ -984,10 +946,10 @@ if(BUILD_IFCGEOM)
         find_package(Threads)
     endif()
 
-    if(WASM_BUILD)
-        target_link_libraries(IfcGeom ${kernel_libraries} ${mapping_libraries} ${CMAKE_THREAD_LIBS_INIT})
+    if (WASM_BUILD)
+        target_link_libraries(IfcGeom ${IFCGEOM_SCHEMA_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
     else()
-        target_link_libraries(IfcGeom IfcParse ${kernel_libraries} ${mapping_libraries} ${CMAKE_THREAD_LIBS_INIT})
+        target_link_libraries(IfcGeom IfcParse ${IFCGEOM_SCHEMA_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
     endif()
 
 endif(BUILD_IFCGEOM)
@@ -1004,8 +966,8 @@ if(BUILD_CONVERT OR BUILD_IFCPYTHON)
     foreach(schema ${SCHEMA_VERSIONS})
         add_library(Serializers_ifc${schema} STATIC ${SERIALIZERS_S_FILES})
         set_target_properties(Serializers_ifc${schema} PROPERTIES COMPILE_FLAGS "-DIFC_GEOM_EXPORTS -DIfcSchema=Ifc${schema}")
-        
-        if(WASM_BUILD)
+
+        if (WASM_BUILD)
             target_link_libraries(Serializers_ifc${schema} ${HDF5_LIBRARIES})
         else()
             target_link_libraries(Serializers_ifc${schema} IfcGeom ${OPENCASCADE_LIBRARIES} ${HDF5_LIBRARIES})
@@ -1015,61 +977,27 @@ if(BUILD_CONVERT OR BUILD_IFCPYTHON)
     add_library(Serializers ${SERIALIZERS_FILES})
     set_target_properties(Serializers PROPERTIES COMPILE_FLAGS "-DIFC_GEOM_EXPORTS" VERSION "${PROJECT_VERSION}" SOVERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}")
 
-    if(WITH_PROJ)
-        target_compile_definitions(Serializers PRIVATE "WITH_PROJ")
-        if (PROJ_STATIC)
-            target_compile_definitions(Serializers PRIVATE "PROJ_DLL=")
-        endif()
-        target_include_directories(Serializers PRIVATE ${PROJ_INCLUDE_DIR} ${SQLITE_INCLUDE_DIR})
-        target_link_libraries(Serializers ${PROJ_LIBRARIES})
-    endif()
+	if (WITH_PROJ)
+		target_compile_definitions(Serializers PRIVATE "WITH_PROJ")
+		if (PROJ_STATIC)
+			target_compile_definitions(Serializers PRIVATE "PROJ_DLL=")
+		endif()
+		target_include_directories(Serializers PRIVATE ${PROJ_INCLUDE_DIR} ${SQLITE_INCLUDE_DIR})
+		target_link_libraries(Serializers ${PROJ_LIBRARIES})
+	endif()
 
     target_link_libraries(Serializers ${SERIALIZER_SCHEMA_LIBRARIES} ${OPENCOLLADA_LIBRARIES} ${USD_LIBRARIES})
 
 endif(BUILD_CONVERT OR BUILD_IFCPYTHON)
 
 if(BUILD_CONVERT)
-    if(WITH_CGAL AND CITYJSON_SUPPORT)
-        message(STATUS "Building CityJSON support")
-        set(CITYJSON_CONVERT_FILES
-            ../src/ifcconvert/cityjson/geobim.cpp
-            ../src/ifcconvert/cityjson/global_execution_context.cpp
-            ../src/ifcconvert/cityjson/opening_collector.cpp
-            ../src/ifcconvert/cityjson/processing.cpp
-            ../src/ifcconvert/cityjson/radius_comparison.cpp
-            ../src/ifcconvert/cityjson/radius_execution_context.cpp
-            ../src/ifcconvert/cityjson/settings.cpp
-            ../src/ifcconvert/cityjson/writer.cpp
-        )
-        add_library(cityjson_converter ${CITYJSON_CONVERT_FILES})
-        target_include_directories(cityjson_converter PRIVATE ../src)
-        set(IFCOPENSHELL_LIBRARIES ${IFCOPENSHELL_LIBRARIES} cityjson_converter)
-
-        add_executable(cityjson_converter_exe ${CITYJSON_CONVERT_FILES})
-        set_target_properties(cityjson_converter_exe PROPERTIES COMPILE_FLAGS "-DCITYJSON_EXECUTABLE")
-        target_include_directories(cityjson_converter_exe PRIVATE ../src)
-        target_link_libraries(cityjson_converter_exe ${IFCOPENSHELL_LIBRARIES} ${OPENCASCADE_LIBRARIES} ${Boost_LIBRARIES} ${HDF5_LIBRARIES} ${USD_LIBRARIES})
-    endif()
-
     # IfcConvert
-	if (WITH_RELATIONSHIP_VALIDATION)
-		file(GLOB IFCCONVERT_CPP_FILES ../src/ifcconvert/*.cpp)
-		file(GLOB IFCCONVERT_H_FILES ../src/ifcconvert/*.h)
-	else()
-		file(GLOB IFCCONVERT_CPP_FILES ../src/ifcconvert/IfcConvert.cpp)
-		file(GLOB IFCCONVERT_H_FILES)
-	endif()
+    file(GLOB IFCCONVERT_CPP_FILES ../src/ifcconvert/*.cpp)
+    file(GLOB IFCCONVERT_H_FILES ../src/ifcconvert/*.h)
     set(IFCCONVERT_FILES ${IFCCONVERT_CPP_FILES} ${IFCCONVERT_H_FILES})
     add_executable(IfcConvert ${IFCCONVERT_FILES})
 
     target_link_libraries(IfcConvert ${IFCOPENSHELL_LIBRARIES} ${OPENCASCADE_LIBRARIES} ${Boost_LIBRARIES} ${HDF5_LIBRARIES} ${USD_LIBRARIES})
-	if (WITH_RELATIONSHIP_VALIDATION)
-        set_property(TARGET IfcConvert APPEND_STRING PROPERTY COMPILE_FLAGS " -DWITH_RELATIONSHIP_VALIDATION")
-    endif()
-
-    if(WITH_CGAL AND CITYJSON_SUPPORT)
-        set_property(TARGET IfcConvert APPEND_STRING PROPERTY COMPILE_FLAGS " -DIFOPSH_WITH_CITYJSON")
-    endif()
 
     if((NOT WIN32) AND BUILD_SHARED_LIBS)
         # Only set RPATHs when building shared libraries (i.e. IfcParse and
@@ -1102,32 +1030,28 @@ if(BUILD_GEOMSERVER)
         LIBRARY DESTINATION ${LIBDIR}
         RUNTIME DESTINATION ${BINDIR}
     )
-endif(BUILD_GEOMSERVER)
+endif()
 
 if(ADD_COMMIT_SHA)
     find_package(Git)
 
     if(GIT_FOUND)
-        if (VERSION_OVERRIDE)
-            set (git_branch ${RELEASE_VERSION})
-        else()
-            message("git found: ${GIT_EXECUTABLE} with version ${GIT_VERSION_STRING}")
-            execute_process(
-                COMMAND ${GIT_EXECUTABLE} branch -a --contains HEAD
-                OUTPUT_VARIABLE git_branches
-                OUTPUT_STRIP_TRAILING_WHITESPACE
-            )
-            string(REPLACE "\n" ";" git_branch_list "${git_branches}")
+        message("git found: ${GIT_EXECUTABLE} with version ${GIT_VERSION_STRING}")
+        execute_process(
+            COMMAND ${GIT_EXECUTABLE} branch -a --contains HEAD
+            OUTPUT_VARIABLE git_branches
+            OUTPUT_STRIP_TRAILING_WHITESPACE
+        )
+        string(REPLACE "\n" ";" git_branch_list "${git_branches}")
 
-            foreach(git_branch_candidate IN ITEMS ${git_branch_list})
-		        string(REPLACE "*" "" git_branch_candidate_temp "${git_branch_candidate}")
-		        string(STRIP "${git_branch_candidate_temp}" git_branch_candidate_2)
-                if(NOT git_branch_candidate_2 MATCHES "^HEAD$")
-                    string(REPLACE "/" ";" git_branch_candidate_2_list "${git_branch_candidate_2}")
-                    list(GET git_branch_candidate_2_list -1 git_branch)
-                endif()
-            endforeach()
-        endif()
+        foreach(git_branch_candidate IN ITEMS ${git_branch_list})
+		    string(REPLACE "*" "" git_branch_candidate_temp "${git_branch_candidate}")
+		    string(STRIP "${git_branch_candidate_temp}" git_branch_candidate_2)
+            if (NOT git_branch_candidate_2 MATCHES "^HEAD$")
+                string(REPLACE "/" ";" git_branch_candidate_2_list "${git_branch_candidate_2}")
+                list(GET git_branch_candidate_2_list -1 git_branch)
+            endif()
+        endforeach()
 
         execute_process(
             COMMAND ${GIT_EXECUTABLE} rev-parse --short HEAD
@@ -1139,13 +1063,6 @@ if(ADD_COMMIT_SHA)
         add_definitions(-DIFCOPENSHELL_BRANCH=${git_branch})
         add_definitions(-DIFCOPENSHELL_COMMIT=${git_sha})
     endif()
-endif(ADD_COMMIT_SHA)
-
-if(MSVC)
-    # @todo still needs to be understood better, but the cgal and cgal-simple kernel cause multiply defined boost lambda placeholders _1 ... _3
-    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /FORCE:MULTIPLE")
-    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /FORCE:MULTIPLE")
-    set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} /FORCE:MULTIPLE")
 endif()
 
 # Documentation
@@ -1166,8 +1083,8 @@ if(BUILD_IFCMAX)
     add_subdirectory(../src/ifcmax ifcmax)
 endif()
 
-if(WITH_CGAL)
-    add_subdirectory(../src/svgfill svgfill)        
+if(NOT MINIMAL_BUILD)
+    add_subdirectory(../src/svgfill svgfill)
 endif()
 
 if(BUILD_QTVIEWER)
@@ -1194,12 +1111,12 @@ if(BUILD_IFCGEOM)
         DESTINATION ${INCLUDEDIR}/ifcgeom_schema_agnostic
     )
 
-    install(TARGETS ${IFCGEOM_SCHEMA_LIBRARIES} ${kernel_libraries} IfcGeom
+    install(TARGETS ${IFCGEOM_SCHEMA_LIBRARIES} IfcGeom
         ARCHIVE DESTINATION ${LIBDIR}
         LIBRARY DESTINATION ${LIBDIR}
         RUNTIME DESTINATION ${BINDIR}
     )
-endif(BUILD_IFCGEOM)
+endif()
 
 if(BUILD_CONVERT)
     install(TARGETS Serializers ${SERIALIZER_SCHEMA_LIBRARIES}
@@ -1215,7 +1132,7 @@ if(BUILD_CONVERT)
     install(FILES ${SERIALIZERS_S_FILES}
         DESTINATION ${INCLUDEDIR}/serializers/schema_dependent
     )
-endif(BUILD_CONVERT)
+endif()
 
 # Cmake uninstall target
 if(NOT TARGET uninstall)
@@ -1230,10 +1147,9 @@ endif()
 
 # Packaging
 list(APPEND CPACK_SOURCE_IGNORE_FILES
-    "/\\\\.git"
-    "/build/"
+    .git
+    .gitignore
 )
-set(CPACK_SOURCE_INSTALLED_DIRECTORIES "${CMAKE_SOURCE_DIR}/..;/")
 set(CPACK_PACKAGE_NAME "${PROJECT_NAME}-${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}${EXTRA_VERSION}")
 set(CPACK_SOURCE_PACKAGE_FILE_NAME "${PROJECT_NAME}-${PROJECT_VERSION}${EXTRA_VERSION}")
 SET(CPACK_PACKAGE_FILE_NAME "${PROJECT_NAME}-${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}${EXTRA_VERSION}-${CMAKE_SYSTEM_NAME}")
@@ -1263,6 +1179,6 @@ set(CPACK_DEBIAN_PACKAGE_PRIORITY "optional")
 set(CPACK_DEBIAN_PACKAGE_SECTION "science")
 set(CPACK_DEBIAN_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}${EXTRA_VERSION}")
 set(CPACK_DEBIAN_ARCHITECTURE "${CMAKE_SYSTEM_PROCESSOR}")
-# set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CMAKE_SOURCE_DIR}/cmake/debian/postinst")
 
+# set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CMAKE_SOURCE_DIR}/cmake/debian/postinst")
 include(CPack)

cmake/utilities.cmake

@@ -1,124 +0,0 @@
-################################################################################
-#                                                                              #
-# This file is part of IfcOpenShell.                                           #
-#                                                                              #
-# IfcOpenShell is free software: you can redistribute it and/or modify         #
-# it under the terms of the Lesser GNU General Public License as published by  #
-# the Free Software Foundation, either version 3.0 of the License, or          #
-# (at your option) any later version.                                          #
-#                                                                              #
-# IfcOpenShell is distributed in the hope that it will be useful,              #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of               #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the                 #
-# Lesser GNU General Public License for more details.                          #
-#                                                                              #
-# You should have received a copy of the Lesser GNU General Public License     #
-# along with this program. If not, see <http://www.gnu.org/licenses/>.         #
-#                                                                              #
-################################################################################
-
-# Create a cache entry if absent for environment variables
-macro(UNIFY_ENVVARS_AND_CACHE VAR)
-    if((NOT DEFINED ${VAR}) AND(NOT "$ENV{${VAR}}" STREQUAL ""))
-        set(${VAR} "$ENV{${VAR}}" CACHE STRING "${VAR}" FORCE)
-    endif()
-endmacro()
-
-# Set INSTALL_RPATH for target with given paths
-macro(SET_INSTALL_RPATHS _target _paths)
-    set(${_target}_rpaths "")
-
-    foreach(_path ${_paths})
-        list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${_path}" isSystemDir)
-
-        if("${isSystemDir}" STREQUAL "-1")
-            list(APPEND ${_target}_rpaths ${_path})
-        endif()
-    endforeach()
-
-    message(STATUS "Set INSTALL_RPATH for ${_target}: ${${_target}_rpaths}")
-    set_target_properties(${_target} PROPERTIES INSTALL_RPATH "${${_target}_rpaths}")
-endmacro()
-
-# Get a list of all OPTION flags from the CMakeLists.txt and store in an output LIST
-function(get_all_option_flags output_list)
-    # Read the contents of the CMakeLists.txt
-    file(READ "${CMAKE_SOURCE_DIR}/CMakeLists.txt" cmake_contents)
-
-    # Find all OPTION flags using a regular expression
-    string(REGEX MATCHALL "[oO][pP][tT][iI][oO][nN]\\s*\\(\\s*([A-Za-z0-9_]+)" matches "${cmake_contents}")
-
-    # Extract the variable names from the matches
-    set(option_flags)
-    foreach(match IN LISTS matches)
-        string(REGEX REPLACE "[oO][pP][tT][iI][oO][nN]\\s*\\(\\s*([A-Za-z0-9_]+)" "\\1" option_flag "${match}")
-        list(APPEND option_flags "${option_flag}")
-    endforeach()
-
-    # Return the list of OPTION flags
-    set(${output_list} "${option_flags}" PARENT_SCOPE)
-endfunction()
-
-# Loop through a LIST of OPTION flags and convert to corresponding environment variables
-function(convert_env_var_to_bool var_name)
-    if(DEFINED ENV{${var_name}})
-        string(TOUPPER "$ENV{${var_name}}" bool_value)
-        if(bool_value STREQUAL "ON" OR bool_value STREQUAL "TRUE" OR bool_value STREQUAL "1")
-            set(${var_name} ON CACHE BOOL "${var_name} as boolean" FORCE)
-        elseif(bool_value STREQUAL "OFF" OR bool_value STREQUAL "FALSE" OR bool_value STREQUAL "0")
-            set(${var_name} OFF CACHE BOOL "${var_name} as boolean" FORCE)
-        else()
-            # Not a bool, leave it as a string
-        endif()
-    else()
-        # Not defined, leave it as a string
-    endif()
-endfunction()
-
-# Usage:
-# set(SOME_LIRARIES foo bar)
-# add_debug_variants(SOME_LIRARIES "${SOME_LIRARIES}" d)
-# "foo bar" -> "optimized foo debug food optimized bar debug bard"
-# or
-# set(SOME_LIRARIES path/foo.lib)
-# add_debug_variants(SOME_LIRARIES "${SOME_LIRARIES}" "d")
-# "path/foo.lib" -> "optimized path/foo.lib debug path/food.lib"
-# TODO Could be refined: take the library file extension as a parameter and
-# make sure the lib variable ends with not just contains it.
-function(add_debug_variants NAME LIBRARIES POSTFIX)
-    set(LIBRARIES_STR "${LIBRARIES}")
-    set(LIBRARIES "")
-
-    # the result, "optimized <lib> debug <lib>", needs to be a list instead of a string
-    foreach(lib ${LIBRARIES_STR})
-        list(APPEND LIBRARIES optimized)
-
-        if("${lib}" MATCHES ".lib")
-            string(REPLACE ".lib" "" lib ${lib})
-            list(APPEND LIBRARIES ${lib}.lib)
-        else()
-            list(APPEND LIBRARIES ${lib})
-        endif()
-
-        list(APPEND LIBRARIES debug)
-
-        if("${lib}" MATCHES ".lib")
-            string(REPLACE ".lib" "" lib ${lib})
-            list(APPEND LIBRARIES ${lib}${POSTFIX}.lib)
-        else()
-            list(APPEND LIBRARIES ${lib}${POSTFIX})
-        endif()
-    endforeach()
-
-    set(${NAME} ${LIBRARIES} PARENT_SCOPE)
-endfunction()
-
-function(files_for_ifc_version IFC_VERSION RESULT_NAME)
-    set(IFC_PARSE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../src/ifcparse)
-    set(${RESULT_NAME}
-        ${IFC_PARSE_DIR}/Ifc${IFC_VERSION}.h
-        ${IFC_PARSE_DIR}/Ifc${IFC_VERSION}enum.h
-        ${IFC_PARSE_DIR}/Ifc${IFC_VERSION}.cpp
-        PARENT_SCOPE
-    )
-endfunction()

conda/bld.bat

@@ -1,13 +1,10 @@
 mkdir build && cd build
 
-REM Remove dot from PY_VER for use in library name
-REM From https://github.com/tpaviot/pythonocc-core/blob/master/ci/conda/bld.bat
 set MY_PY_VER=%PY_VER:.=%
-
 set LIBXML2="%LIBRARY_PREFIX%/lib/libxml2.lib"
 
 cmake -G "Ninja" ^
- -D SCHEMA_VERSIONS="2x3;4;4x1;4x3_add2" ^
+ -D SCHEMA_VERSIONS="2x3;4;4x1;4x3;4x3_add1" ^
  -D CMAKE_BUILD_TYPE:STRING=Release ^
  -D CMAKE_INSTALL_PREFIX:FILEPATH="%LIBRARY_PREFIX%" ^
  -D CMAKE_PREFIX_PATH:FILEPATH="%LIBRARY_PREFIX%" ^
@@ -15,9 +12,6 @@ cmake -G "Ninja" ^
  -D OCC_INCLUDE_DIR:FILEPATH="%LIBRARY_PREFIX%\include\opencascade" ^
  -D OCC_LIBRARY_DIR:FILEPATH="%LIBRARY_PREFIX%\lib" ^
  -D CGAL_INCLUDE_DIR:FILEPATH="%LIBRARY_PREFIX%\include" ^
- -D EIGEN_DIR:FILEPATH="%LIBRARY_PREFIX%\include\eigen3" ^
- -D LIBXML2_INCLUDE_DIR=%LIBRARY_PREFIX%/include/libxml2 ^
- -D LIBXML2_LIBRARIES=%LIBRARY_PREFIX%/lib/libxml2.lib ^
  -D GMP_INCLUDE_DIR:FILEPATH="%LIBRARY_PREFIX%\include" ^
  -D GMP_LIBRARY_DIR:FILEPATH="%LIBRARY_PREFIX%\lib" ^
  -D MPFR_LIBRARY_DIR:FILEPATH="%LIBRARY_PREFIX%\lib" ^
@@ -38,14 +32,14 @@ cmake -G "Ninja" ^
  -D BUILD_CONVERT:BOOL=ON ^
  -D BUILD_IFCMAX:BOOL=OFF ^
  -D IFCXML_SUPPORT:BOOL=ON ^
- -D Boost_LIBRARY_DIR:FILEPATH="%LIBRARY_PREFIX%\lib" ^
- -D Boost_INCLUDE_DIR:FILEPATH="%LIBRARY_PREFIX%\include" ^
+ -D Boost_LIBRARYDIR:FILEPATH="%LIBRARY_PREFIX%\lib" ^
+ -D Boost_INCLUDEDIR:FILEPATH="%LIBRARY_PREFIX%\include" ^
  -D Boost_USE_STATIC_LIBS:BOOL=OFF ^
- -D CITYJSON_SUPPORT:BOOL=OFF ^
- ../cmake
- 
-if errorlevel 1 exit 1
-
-ninja install -j 1
+ %SRC_DIR%/cmake
+
+if errorlevel 1 exit 1
+
+:: Build and install
+cmake --build . -- install
 
 if errorlevel 1 exit 1

conda/build.sh

@@ -1,19 +1,19 @@
 #!/bin/bash
 
-# IF osx use file lib suffix .dylib
-# IF linux use file lib suffix .so
-# IF windows use file lib suffix .dll
+declare -a CMAKE_PLATFORM_FLAGS
 
-if [ "$(uname)" == "Darwin" ]; then
-    export FSUFFIX=dylib
-    export LDFLAGS="$LDFLAGS -Wl,-flat_namespace,-undefined,suppress"
-elif [ "$(expr substr $(uname -s) 1 5)" == "Linux" ]; then
-    export FSUFFIX=so
+if [[ ${HOST} =~ .*linux.* ]]; then
+    CMAKE_PLATFORM_FLAGS+=(-DCMAKE_TOOLCHAIN_FILE=$RECIPE_DIR/cross-linux.cmake)
 fi
 
+if [ `uname` == Darwin ]; then
+  export CFLAGS="$CFLAGS   -Wl,-flat_namespace,-undefined,suppress"
+  export CXXFLAGS="$CXXFLAGS -Wl,-flat_namespace,-undefined,suppress"
+  export LDFLAGS="$LDFLAGS  -Wl,-flat_namespace,-undefined,suppress"
+fi
 
-cmake ${CMAKE_ARGS} -G Ninja \
- -DSCHEMA_VERSIONS="2x3;4;4x1;4x3_add2" \
+cmake -G Ninja \
+ -DSCHEMA_VERSIONS="2x3;4;4x1;4x3;4x3_add1" \
  -DCMAKE_BUILD_TYPE=Release \
  -DCMAKE_INSTALL_PREFIX=$PREFIX \
   ${CMAKE_PLATFORM_FLAGS[@]} \
@@ -29,10 +29,7 @@ cmake ${CMAKE_ARGS} -G Ninja \
  -DHDF5_LIBRARY_DIR=$PREFIX/lib \
  -DJSON_INCLUDE_DIR=$PREFIX/include \
  -DCGAL_INCLUDE_DIR=$PREFIX/include \
- -DLIBXML2_INCLUDE_DIR=$PREFIX/include/libxml2 \
- -DLIBXML2_LIBRARIES=$PREFIX/lib/libxml2.$FSUFFIX \
- -DEIGEN_DIR:FILEPATH=$PREFIX/include/eigen3 \
- -DCOLLADA_SUPPORT:BOOL=OFF \
+ -DCOLLADA_SUPPORT=0 \
  -DBUILD_EXAMPLES:BOOL=OFF \
  -DIFCXML_SUPPORT:BOOL=ON \
  -DGLTF_SUPPORT:BOOL=ON \
@@ -41,9 +38,8 @@ cmake ${CMAKE_ARGS} -G Ninja \
  -DBUILD_IFCGEOM:BOOL=ON \
  -DBUILD_GEOMSERVER:BOOL=OFF \
  -DBOOST_USE_STATIC_LIBS:BOOL=OFF \
- -DCITYJSON_SUPPORT:BOOL=OFF \
  ./cmake
 
 ninja
 
-ninja install -j 1
+ninja install -j 1

conda/conda_build_config.yaml

@@ -1,58 +1,6 @@
+CONDA_BUILD_SYSROOT:
+  - /opt/MacOSX10.13.sdk       # [osx]
+
 variant:
   - novtk
-  - all
-
-occt:
-  - 7.8.1
-
-c_compiler:
-- vs2022    # [win]
-- gcc       # [linux]
-- clang     # [osx]
-c_stdlib:
-- vs        # [win]
-- sysroot   # [linux]
-- macosx_deployment_target  # [osx]
-cxx_compiler:
-- vs2022    # [win]
-- gcc       # [linux]
-- clangxx   # [osx]
-c_compiler_version:
-- '12'    # [linux]
-- '16'    # [osx]
-cxx_compiler_version:
-- '12'    # [linux]
-- '16'    # [osx]
-c_stdlib_version:
-- '2.12'    # [linux]
-- '10.13'   # [osx]
-hdf5:
-- 1.14.3
-libboost_devel:
-- '1.84'
-libxml2:
-- '2'
-mpfr:
-- '4'
-gmp:
-- '6'  # [not win]
-pin_run_as_build:
-  python:
-    min_pin: x.x
-    max_pin: x.x
-
-zlib:
-- '1'
-target_platform:
-- win-64    # [win]
-- linux-64  # [linux]
-- osx-64    # [osx]
-macos_machine:
-- x86_64-apple-darwin13.4.0
-MACOSX_DEPLOYMENT_TARGET:
-- '10.13'
-MACOSX_SDK_VERSION:
-- '10.13'
-
-CONDA_BUILD_SYSROOT:
-  - "/Users/runner/work/MacOSX10.13.sdk"  # [osx]
+  - all

conda/cross-linux.cmake

@@ -0,0 +1,16 @@
+# this one is important
+set(CMAKE_SYSTEM_NAME Linux)
+set(CMAKE_PLATFORM Linux)
+
+# specify the cross compiler
+set(CMAKE_C_COMPILER $ENV{CC})
+set(CMAKE_CXX_COMPILER $ENV{CXX})
+
+# where is the target environment
+set(CMAKE_FIND_ROOT_PATH $ENV{PREFIX} $ENV{BUILD_PREFIX}/$ENV{HOST}/sysroot)
+
+# search for programs in the build host directories
+set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+# for libraries and headers in the target directories
+set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)

conda/meta.yaml

@@ -1,303 +1,68 @@
-{% set version = environ.get('VERSION_OVERRIDE', '0.8.0') %}
-{% set build = 0 %}
+{% set name = "ifcopenshell" %}
+{% set version = "0.7.0" %}
+{% set build = 1 %}
 
 # Higher number -> Always prioritize "novtk" variant over "all" variant
 {% set build = build + 200 %}   # [variant == "novtk"]
 {% set build = build + 100 %}   # [variant == "all"]
 
 package:
-  name: ifcopenshell
+  name: {{ name }}
   version: {{ version }}
 
 source:
-  path: ../
-
+  path: ..
 
 build:
-  number: {{ build }}
-  skip: true  # [py<39]
-  binary_relocation: false  # [osx]
   string: py{{ CONDA_PY }}_{{ variant }}_h{{ PKG_HASH }}_{{ build }}
-  run_exports:
-    - {{ pin_subpackage('ifcopenshell', max_pin='x.x.x') }} *{{ variant }}*
-
+  binary_relocation: false [osx]
+  number: {{ build }}
 
 requirements:
   build:
-    - cmake
-    - ninja
-    - swig >=4.1.1
-    - {{ stdlib("c") }}
     - {{ compiler('c') }}
     - {{ compiler('cxx') }}
+    - ninja >=1.10.2
+    - cmake
+    - swig 4.1.1
+
   host:
     - python
-    - libboost-devel
-    - occt *=*{{ variant }}*
+    - boost-cpp
+    - occt 7.7.2 *{{ variant }}*
     - libxml2
     - cgal-cpp
     - hdf5
-    - eigen
     - mpfr
-    - nlohmann_json
     - gmp  # [unix]
     - mpir  # [win]
+    - nlohmann_json
     - zlib
+
   run:
     - python
-    - {{ pin_compatible('occt', max_pin='x.x.x') }} *{{ variant }}*
-    - {{ pin_compatible('cgal-cpp', max_pin='x.x') }}
-
+    - occt 7.7.2 *{{ variant }}*
+    - {{ pin_compatible('cgal-cpp', max_pin='x.x.x') }}
+    - {{ pin_compatible('boost-cpp', max_pin='x.x.x') }}
+    - {{ pin_compatible('hdf5', max_pin='x.x.x') }}
+    - libxml2
+    - mpfr
+    - gmp  # [unix]
+    - mpir  # [win]
+    - nlohmann_json
+    - zlib
 
 test:
   imports:
     - ifcopenshell
 
-
 about:
   home: https://ifcopenshell.org
   license: LGPL-3.0-or-later
   license_file: COPYING
   summary: 'IfcOpenShell is a library to support the IFC file format'
   description: |
-    IfcOpenShell
-    ============
-    
-    IfcOpenShell is an open source ([LGPL]) software library for working with Industry Foundation Classes ([IFC]). Complete
-    parsing support is provided for [IFC2x3 TC1], [IFC4 Add2 TC1], IFC4x1, IFC4x3, and IFC4x3. Extensive geometric support
-    is implemented for the IFC releases [IFC2x3 TC1] and [IFC4 Add2 TC1]. Extending with support for arbitrary IFC schemas
-    is possible at compile-time when using C++ and at run-time when using Python.
-    
-    In addition to a C++ and Python API, IfcOpenShell comes with an ecosystem of tools, notably including IfcConvert (an
-    application to convert IFC models to
-    other formats), the BlenderBIM Add-on (an add-on to Blender providing a graphical IFC authoring platform), and many
-    other libraries, CLI apps, and more. Support is also provided for auxiliary standards such as BCF and IDS.
-    
-    For more information, see:
-    
-    * [IfcOpenShell Website](http://ifcopenshell.org)
-    * [IfcOpenShell Documentation](http://bonsaibim.org/docs-python)
-    * [IfcOpenShell C++ Installation](https://bonsaibim.org/docs-python/ifcopenshell/installation.html)
-    * [IfcOpenShell Python Installation](https://bonsaibim.org/docs-python/ifcopenshell-python/installation.html)
-    * [IfcOpenShell Python Hello World Tutorial](https://bonsaibim.org/docs-python/ifcopenshell-python/hello_world.html)
-    * [Bonsai Website](https://bonsaibim.org)
-    * [Bonsai Documentation](http://bonsaibim.org/docs)
-    * [Add-on Installation](https://bonsaibim.org/docs/users/installation.html)
-    * [Exploring an IFC model](https://bonsaibim.org/docs/users/exploring_an_ifc_model.html)
-    
-    <table>
-      <thead>
-        <tr>
-          <th>Service</th>
-          <th>Status</th>
-        </tr>
-      </thead>
-      <tbody>
-        <tr>
-          <td>Anaconda Daily Build</td>
-          <td><a href="https://anaconda.org/ifcopenshell/ifcopenshell"><img src="https://img.shields.io/conda/vn/ifcopenshell/ifcopenshell" alt="Anaconda-Server Badge"></a></td>
-        </tr>
-        <tr>
-          <td>Anaconda v0.8.0 Stable</td>
-          <td><a href="https://anaconda.org/conda-forge/ifcopenshell"><img src="https://img.shields.io/conda/vn/conda-forge/ifcopenshell" alt="Anaconda-Server Badge"></a></td>
-        </tr>
-        <tr>
-          <td>PyPi Daily Build</td>
-          <td><a href="https://pypi.org/project/ifcopenshell/"><img src="https://img.shields.io/pypi/v/ifcopenshell" alt="PyPi Badge"></a></td>
-        </tr>
-        <tr>
-          <td>ArchLinux AUR Package Stable</td>
-          <td><a href="https://aur.archlinux.org/packages/ifcopenshell"><img src="https://img.shields.io/aur/version/ifcopenshell" alt="AUR Badge"></a></td>
-        </tr>
-        <tr>
-          <td>ArchLinux AUR Package git</td>
-          <td><a href="https://aur.archlinux.org/packages/ifcopenshell-git"><img src="https://img.shields.io/aur/version/ifcopenshell-git" alt="AUR Badge"></a></td>
-        </tr>
-        <tr>
-          <td>BlenderBIM Add-on Chocolatey (under moderation)</td>
-          <td><a href="https://community.chocolatey.org/packages/blenderbim-nightly/"><img src="https://img.shields.io/chocolatey/v/blenderbim-nightly" alt="Chocolatey Badge"></a></td>
-        </tr>
-        <tr>
-          <td>Sponsor development on OpenCollective</td>
-          <td><a href="https://opencollective.com/opensourcebim/"><img src="https://opencollective.com/opensourcebim/tiers/badge.svg" alt="Financial Contributors"></a></td>
-        </tr>
-        <tr>
-          <td>Docker hub</td>
-          <td><a href="https://hub.docker.com/r/aecgeeks/ifcopenshell"><img src="https://img.shields.io/docker/pulls/aecgeeks/ifcopenshell" alt="Docker Pulls"></a></td>
-        </tr>
-    
-      </tbody>
-    </table>
-    Contents
-    --------
-    
-    Those marked with an asterisk are part of IfcOpenShell.
-    <table>
-      <thead>
-        <tr>
-          <th>Name</th>
-          <th>Description</th>
-          <th>License</th>
-        </tr>
-      </thead>
-      <tbody>
-        <tr>
-          <td>bcf</td>
-          <td>Library to read and write BCF-XML and query OpenCDE BCF-API modules</td>
-          <td>LGPL-3.0-or-later</td>
-        </tr>
-        <tr>
-          <td>blenderbim</td>
-          <td>Add-on to Blender providing a graphical native IFC authoring platform</td>
-          <td>GPL-3.0-or-later</td>
-        </tr>
-        <tr>
-          <td>bsdd</td>
-          <td>Library to query the bSDD API</td>
-          <td>LGPL-3.0-or-later</td>
-        </tr>
-        <tr>
-          <td>ifc2ca</td>
-          <td>Utility to convert IFC structural analysis models to Code_Aster</td>
-          <td>LGPL-3.0-or-later</td>
-        </tr>
-        <tr>
-          <td>ifc4d</td>
-          <td>Convert to and from IFC and project management software</td>
-          <td>LGPL-3.0-or-later</td>
-        </tr>
-        <tr>
-          <td>ifc5d</td>
-          <td>Report and optimise cost information from IFC</td>
-          <td>LGPL-3.0-or-later</td>
-        </tr>
-        <tr>
-          <td>ifcbimtester</td>
-          <td>Wrapper for Gherkin based unit testing for IFC models</td>
-          <td>LGPL-3.0-or-later</td>
-        </tr>
-        <tr>
-          <td>ifcblender</td>
-          <td>Historic Blender IFC import add-on</td>
-          <td>LGPL-3.0-or-later*</td>
-        </tr>
-        <tr>
-          <td>ifccityjson</td>
-          <td>Convert CityJSON to IFC</td>
-          <td>LGPL-3.0-or-later</td>
-        </tr>
-        <tr>
-          <td>ifcclash</td>
-          <td>Clash detection library and CLI app</td>
-          <td>LGPL-3.0-or-later</td>
-        </tr>
-        <tr>
-          <td>ifccobie</td>
-          <td>Extract IFC data for COBie handover requirements</td>
-          <td>LGPL-3.0-or-later</td>
-        </tr>
-        <tr>
-          <td>ifcconvert</td>
-          <td>CLI app to convert IFC to many other formats</td>
-          <td>LGPL-3.0-or-later*</td>
-        </tr>
-        <tr>
-          <td>ifccsv</td>
-          <td>Library and CLI app to export and import schedules from IFC</td>
-          <td>LGPL-3.0-or-later</td>
-        </tr>
-    <tr>
-      <td>ifcdiff</td>
-      <td>Compare changes between IFC models</td>
-      <td>LGPL-3.0-or-later</td>
-    </tr>
-    <tr>
-      <td>ifcfm</td>
-      <td>Extract IFC data for FM handover requirements</td>
-      <td>LGPL-3.0-or-later</td>
-    </tr>
-    <tr>
-      <td>ifcgeom</td>
-      <td>Internal library for IfcOpenShell</td>
-      <td>LGPL-3.0-or-later*</td>
-    </tr>
-    <tr>
-      <td>ifcgeom_schema_agnostic</td>
-      <td>Internal library for IfcOpenShell</td>
-      <td>LGPL-3.0-or-later*</td>
-    </tr>
-    <tr>
-      <td>ifcgeomserver</td>
-      <td>Internal library for IfcOpenShell</td>
-      <td>LGPL-3.0-or-later*</td>
-    </tr>
-    <tr>
-      <td>ifcjni</td>
-      <td>Internal library for IfcOpenShell</td>
-      <td>LGPL-3.0-or-later*</td>
-    </tr>
-    <tr>
-      <td>ifcmax</td>
-      <td>Historic extension for IFC support in 3DS Max</td>
-      <td>LGPL-3.0-or-later*</td>
-    </tr>
-    <tr>
-      <td>ifcopenshell-python</td>
-      <td>Python library for IFC manipulation</td>
-      <td>LGPL-3.0-or-later*</td>
-    </tr>
-    <tr>
-      <td>ifcparse</td>
-      <td>Internal library for IfcOpenShell</td>
-      <td>LGPL-3.0-or-later*</td>
-    </tr>
-    <tr>
-      <td>ifcpatch</td>
-      <td>Utility to run pre-packaged scripts to manipulate IFCs</td>
-      <td>LGPL-3.0-or-later</td>
-    </tr>
-    <tr>
-      <td>ifcsverchok</td>
-      <td>Blender Add-on for visual node programming with IFC</td>
-      <td>GPL-3.0-or-later</td>
-    </tr>
-    <tr>
-      <td>ifctester</td>
-      <td>Library, CLI and webapp for IDS model auditing</td>
-      <td>LGPL-3.0-or-later</td>
-    </tr>
-    <tr>
-      <td>ifcwrap</td>
-      <td>Internal library for IfcOpenShell</td>
-      <td>LGPL-3.0-or-later*</td>
-    </tr>
-    <tr>
-      <td>qtviewer</td>
-      <td>Internal library for IfcOpenShell</td>
-      <td>LGPL-3.0-or-later*</td>
-    </tr>
-    <tr>
-      <td>serializers</td>
-      <td>Internal library for IfcOpenShell</td>
-      <td>LGPL-3.0-or-later*</td>
-    </tr>
-    </tbody>
-    </table>
-    
-    [LGPL]: https://github.com/IfcOpenShell/IfcOpenShell/tree/master/COPYING.LESSER "LGPL-3.0-or-later"
-    [IFC]: https://technical.buildingsmart.org/standards/ifc/ "IFC"
-    [IFC2x3 TC1]: https://standards.buildingsmart.org/IFC/RELEASE/IFC2x3/TC1/HTML/ "IFC2x3 TC1"
-    [IFC4 Add2 TC1]: https://standards.buildingsmart.org/IFC/RELEASE/IFC4/ADD2_TC1/HTML/ "IFC4 Add2 TC1"
-    [Visual Studio]: https://www.visualstudio.com/ "Visual Studio"
-    [Visual C++ Build Tools]: http://landinghub.visualstudio.com/visual-cpp-build-tools "Visual C++ Build Tools"
-    [MSYS2]: https://msys2.github.io/ "MSYS2"
-    [win/readme.md]: https://github.com/IfcOpenShell/IfcOpenShell/tree/master/win/readme.md "win/readme.md"
-    [nix/build-all.py]: https://github.com/IfcOpenShell/IfcOpenShell/tree/master/nix/build-all.py "nix/build-all.py"
+    IfcOpenShell is an open source (LGPL) software library for 
+    working with the Industry Foundation Classes (IFC) file format.
   doc_url: https://ifcopenshell.org/
   dev_url: https://github.com/IfcOpenShell/IfcOpenShell
-
-extra:
-  recipe-maintainers:
-    - adrianinsaval
-    - looooo
-    - Krande

nix/build-all.py

@@ -51,9 +51,7 @@
 ###############################################################################
 import logging
 import os
-import re
 import sys
-import glob
 import subprocess as sp
 import shutil
 import tarfile
@@ -92,8 +90,6 @@ HDF5_VERSION = "1.12.1"
 GMP_VERSION = "6.2.1"
 MPFR_VERSION = "3.1.6" # latest is 4.1.0
 CGAL_VERSION = "5.3"
-USD_VERSION = "23.05"
-TBB_VERSION = "2021.9.0"
 
 # binaries
 cp = "cp"
@@ -190,7 +186,7 @@ cecho(""" - How many compiler processes may be run in parallel.
 
 dependency_tree = {
     'IfcParse': ('boost', 'libxml2', 'hdf5'),
-    'IfcGeom': ('IfcParse', 'occ', 'json', 'cgal', 'eigen'),
+    'IfcGeom': ('IfcParse', 'occ', 'json', 'cgal'),
     'IfcConvert': ('IfcGeom',),
     'OpenCOLLADA': ('libxml2', 'pcre'),
     'IfcGeomServer': ('IfcGeom',),
@@ -204,9 +200,7 @@ dependency_tree = {
     'json': (),
     'hdf5': (),
     'cgal': (),
-    'eigen': (),
     'freetype': (),
-    # 'usd': ('boost', 'oneTBB')
 }
 
 def v(dep):
@@ -473,8 +467,6 @@ if "wasm" in flags:
 # If the linker supports GC sections, set it up to reduce binary file size
 # -fPIC is required for the shared libraries to work
 
-compiler_flags = "CFLAGS", "CXXFLAGS", "LDFLAGS"
-
 CXXFLAGS = os.environ.get("CXXFLAGS", "")
 CFLAGS = os.environ.get("CFLAGS", "")
 LDFLAGS = os.environ.get("LDFLAGS", "")
@@ -500,11 +492,7 @@ else:
         CXXFLAGS=CXXFLAGS_MINIMAL
         CFLAGS=CFLAGS_MINIMAL
     LDFLAGS = f"{LDFLAGS} {ADDITIONAL_ARGS_STR}"
-
-if "lto" in flags:
-    for f in compiler_flags:
-        locals()[f] += f" -flto={IFCOS_NUM_BUILD_PROCS}"
-
+    
 os.environ["CXXFLAGS"] = CXXFLAGS
 os.environ["CFLAGS"] = CFLAGS
 os.environ["LDFLAGS"] = LDFLAGS
@@ -514,11 +502,6 @@ os.environ["LDFLAGS"] = LDFLAGS
 # build_dependency(name="cmake-%s" % (CMAKE_VERSION,), mode="autoconf", build_tool_args=[], download_url="https://cmake.org/files/v%s" % (CMAKE_VERSION_2,), download_name="cmake-%s.tar.gz" % (CMAKE_VERSION,))
 
 if 'hdf5' in targets:
-    # not supported
-    orig = [os.environ[f] for f in compiler_flags]
-    for f in compiler_flags:
-        os.environ[f] = re.sub("-flto(=\w+)?", "", os.environ[f])
-
     HDF5_MAJOR = ".".join(HDF5_VERSION.split(".")[:-1])
     build_dependency(
         name=f"hdf5-{HDF5_VERSION}",
@@ -529,10 +512,6 @@ if 'hdf5' in targets:
         ctest_result=f"HDF5-{HDF5_VERSION}-{platform.system()}",
         ctest_result_path=f"HDF_Group/HDF5/{HDF5_VERSION}"
     )
-    
-    for f, o in zip(compiler_flags, orig):
-        os.environ[f] = o
-    
 
 if "json" in targets:
     json_url = f"https://github.com/nlohmann/json/releases/download/{JSON_VERSION}/json.hpp"
@@ -541,9 +520,6 @@ if "json" in targets:
         os.makedirs(os.path.dirname(json_install_path))
     if not os.path.exists(json_install_path):
         urlretrieve(json_url, json_install_path)
-        
-if "eigen" in targets:
-    git_clone_or_pull_repository("https://gitlab.com/libeigen/eigen.git", f"{DEPS_DIR}/install/eigen-3.3.9", revision="3.3.9")
 
 if "pcre" in targets:
     build_dependency(
@@ -577,16 +553,12 @@ if "freetype" in targets:
         download_url = "https://github.com/freetype/freetype",
         download_name = "freetype2",
         download_tool=download_tool_git,
-        revision="VER-2-11-1"
     )
 
 if USE_OCCT and "occ" in targets:
     patches = []
     if OCCT_VERSION < "7.4":
         patches.append("./patches/occt/enable-exception-handling.patch")
-        
-    if OCCT_VERSION == "7.7.1":
-        patches.append("./patches/occt/no_ExpToCasExe.patch")
     
     if "wasm" in flags:
         patches.append("./patches/occt/no_em_js.patch")
@@ -601,7 +573,7 @@ if USE_OCCT and "occ" in targets:
             "-DBUILD_RELEASE_DISABLE_EXCEPTIONS=Off",
             f"-D3RDPARTY_FREETYPE_DIR={DEPS_DIR}/install/freetype"
         ],
-        download_url = "https://git.dev.opencascade.org/repos/occt.git",
+        download_url = "https://github.com/Open-Cascade-SAS/OCCT",
         download_name = "occt",
         download_tool=download_tool_git,
         patch=patches,
@@ -775,42 +747,7 @@ if "cgal" in targets:
         download_tool=download_tool_git,
         revision=f"v{CGAL_VERSION}"
     )
-
-if "usd" in targets:
-    build_dependency(
-        name=f"oneTBB-{TBB_VERSION}",
-        mode="cmake",
-        build_tool_args=[
-            f"-DCMAKE_INSTALL_PREFIX={DEPS_DIR}/install/tbb-{TBB_VERSION}",
-            f"-DTBB_TEST=OFF"
-        ],
-        download_url="https://github.com/oneapi-src/oneTBB",
-        download_name="oneTBB",
-        download_tool=download_tool_git,
-        revision=f"v{TBB_VERSION}"
-    )
-
-    build_dependency(
-        name=f"usd-{USD_VERSION}",
-        mode="cmake",
-        build_tool_args=[
-            f"-DCMAKE_INSTALL_PREFIX={DEPS_DIR}/install/usd-{USD_VERSION}",
-            f"-DBOOST_ROOT={DEPS_DIR}/install/boost-{BOOST_VERSION}",
-            f"-DTBB_ROOT_DIR={DEPS_DIR}/install/tbb-{TBB_VERSION}",
-            f"-DPXR_ENABLE_PYTHON_SUPPORT=FALSE",
-            f"-DPXR_ENABLE_GL_SUPPORT=FALSE",
-            f"-DPXR_BUILD_IMAGING=FALSE",
-            f"-DPXR_BUILD_TUTORIALS=FALSE",
-            f"-DPXR_BUILD_EXAMPLES=FALSE",
-            f"-DPXR_BUILD_USD_TOOLS=FALSE",
-            f"-DPXR_BUILD_TESTS=FALSE"
-        ],
-        download_url="https://github.com/PixarAnimationStudios/USD",
-        download_name="USD",
-        download_tool=download_tool_git,
-        revision=f"v{USD_VERSION}"
-    )
-
+    
 cecho("Building IfcOpenShell:", GREEN)
 
 IFCOS_DIR = os.path.join(DEPS_DIR, "build", "ifcopenshell")
@@ -830,10 +767,8 @@ cmake_args = [
     "-DBOOST_ROOT="                    f"{DEPS_DIR}/install/boost-{BOOST_VERSION}",
     "-DGLTF_SUPPORT="                  "ON",
     "-DJSON_INCLUDE_DIR="              f"{DEPS_DIR}/install/json",
-    "-DEIGEN_DIR="                     f"{DEPS_DIR}/install/eigen-3.3.9",
     "-DBoost_NO_BOOST_CMAKE="          "On",
-    "-DADD_COMMIT_SHA="              +("On" if ADD_COMMIT_SHA else "Off"),
-    "-DVERSION_OVERRIDE="            +("On" if ADD_COMMIT_SHA else "Off")
+    "-DADD_COMMIT_SHA="              +("On" if ADD_COMMIT_SHA else "Off")
 ]
 
 if "wasm" in flags:
@@ -895,13 +830,6 @@ if "hdf5" in targets:
 else:
     cmake_args.append("-DHDF5_SUPPORT=Off")
 
-if "usd" in targets:
-    cmake_args.extend([
-        "-DUSD_SUPPORT="               "On",
-        "-DUSD_INCLUDE_DIR="           f"{DEPS_DIR}/install/usd-{USD_VERSION}/include",
-        "-DUSD_LIBRARY_DIR="           f"{DEPS_DIR}/install/usd-{USD_VERSION}/lib"
-    ])
-
 if not explicit_targets or {"IfcGeom", "IfcConvert", "IfcGeomServer"} & set(explicit_targets):
     logger.info("\rConfiguring executables...")
 
@@ -972,7 +900,7 @@ if "IfcOpenShell-Python" in targets:
             if platform.system() != "Darwin":
                 if BUILD_CFG == "Release":
                     # TODO: This symbol name depends on the Python version?
-                    run([strip, "-s", "-K", "PyInit__ifcopenshell_wrapper", glob.glob(os.path.join(module_dir, "_ifcopenshell_wrapper*.so"))[0]], cwd=module_dir)
+                    run([strip, "-s", "-K", "PyInit__ifcopenshell_wrapper", "_ifcopenshell_wrapper.so"], cwd=module_dir)
 
             return module_dir
 

nix/patches/occt/no_ExpToCasExe.patch

@@ -1,13 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index fd17283f77..6cecf9dad3 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -826,6 +826,8 @@ if (EMSCRIPTEN)
-   list (REMOVE_ITEM BUILD_TOOLKITS ExpToCasExe)
- endif()
- 
-+list (REMOVE_ITEM BUILD_TOOLKITS ExpToCasExe)
-+
- # bison
- if (BUILD_YACCLEX)
-   OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/bison")

pyodide/meta.yaml

@@ -1,6 +1,6 @@
 package:
   name: ifcopenshell
-  version: 0.8.0
+  version: 0.7.0
 
 source:
   path: IfcOpenShell

pyodide/setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 
 setup(name='IfcOpenShell',
-      version='0.8.0',
+      version='0.7.0',
       description='IfcOpenShell is an open source (LGPL) software library for working with the Industry Foundation Classes (IFC) file format.',
       author='Thomas Krijnen',
       author_email='thomas@aecgeeks.com',

pyproject.toml

@@ -1,35 +1,2 @@
 [tool.black]
-line-length = 120
-include = '''
-    src/(
-        bcf
-        |bcfserver
-        |blenderbim
-        |bsdd
-        |foundationserver
-        |ifc2ca
-        |ifc4d
-        |ifc5d
-        |ifcbimtester
-        |ifcblender
-        |ifccityjson
-        |ifcclash
-        |ifccsv
-        |ifcdiff
-        |ifcfm
-        |ifcpatch
-        |ifctester
-        |ifcopenshell-python
-        |ifcsverchok
-        |opencdeserver
-    )/.*.py$
-'''
-extend-exclude = '''
-    src/ifcopenshell-python/ifcopenshell/express/*
-    |src/ifcopenshell-python/ifcopenshell/mvd/*
-    |src/ifc2ca/templates/*
-'''
-
-[tool.pyright]
-reportInvalidTypeForm = false
-disableBytesTypePromotions = true
+line-length = 120

src/bcf/CITATION.cff

@@ -10,7 +10,7 @@ type: software
 authors:
   - name: "IfcOpenShell contributors"
 repository-code: >-
-  https://github.com/IfcOpenShell/IfcOpenShell/tree/v0.8.0/src/bcf
+  https://github.com/IfcOpenShell/IfcOpenShell/tree/v0.7.0/src/bcf
 abstract: >-
   Library to read and write BCF-XML and query OpenCDE
   BCF-API modules

src/bcf/Makefile

@@ -1,23 +1,8 @@
-# BCF - BCF Python library
-# Copyright (C) 2021 Prabhat Singh <singh01prabhat@gmail.com>
-#
-# This file is part of BCF.
-#
-# BCF is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# BCF is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with BCF.  If not, see <http://www.gnu.org/licenses/>.
-
-PACKAGE_NAME:=bcf
-include ../common.mk
+VERSION:=`date '+%y%m%d'`
+SED:=sed -i
+ifeq ($(UNAME_S),Darwin)
+SED:=sed -i '' -e
+endif
 
 .PHONY: ci
 ci:
@@ -30,13 +15,16 @@ license:
 # TODO: make this based on xsd file presence
 .PHONY: models
 models:
-	xsdata generate -p bcf.v2.model --unnest-classes --kw-only --slots -ds Google bcf/v2/xsd
-	xsdata generate -p bcf.v3.model --unnest-classes --kw-only --slots -ds Google bcf/v3/xsd
+	cd src && xsdata generate -p bcf.v2.model --unnest-classes --kw-only --slots -ds Google bcf/v2/xsd
+	cd src && xsdata generate -p bcf.v3.model --unnest-classes --kw-only --slots -ds Google bcf/v3/xsd
 
-.PHONY: test
-test:
-	pytest -p no:pytest-blender tests
+.PHONY: dist
+dist:
+	rm -rf dist
+	$(SED) "s/999999/$(VERSION)/" pyproject.toml
+	python -m build
+	$(SED) "s/$(VERSION)/999999/" pyproject.toml
 
 # .PHONY
 # api:
-#     openapi-python-client generate --url https://api.swaggerhub.com/apis/buildingSMART/BCF/3.0
+#     openapi-python-client generate --url https://api.swaggerhub.com/apis/buildingSMART/BCF/3.0

src/bcf/README.md

@@ -3,7 +3,3 @@
 A simple Python implementation of the BCF standard. Manipulation of BCF-XML is
 available via `bcfxml.py` and manipulation of BCF-API is available via
 `bcfapi.py`.
-
-Python files in 'model' folder are automatically generated from .xsd files (located in 'xsd' folder).
-To regenerate them you can use `make models`.
-The only exception is 'v2/model/extensions.py', see it's note for the details.

src/bcf/bcf/agnostic/extensions.py

@@ -1,28 +0,0 @@
-import bcf.v2.model.extensions
-import bcf.v3.model.extensions
-from typing import NamedTuple, Union
-from dataclasses import fields
-
-
-class AttributeData(NamedTuple):
-    attr_type: type
-    subattr_name: str
-    subattr_xsd_name: str
-
-
-Extensions = Union[bcf.v2.model.extensions.Extensions, bcf.v3.model.extensions.Extensions]
-
-
-def get_extensions_attributes(extensions: Extensions) -> dict[str, AttributeData]:
-    """Return mapping of xsd attribute name to a tuple that consists of:
-    - Extensions attribute name
-    - Extensions attribute type type
-    - subattribute name"""
-    possible_attributes = {}
-    for field in fields(type(extensions)):
-        field_type = field.type.__args__[0]  # type: ignore [reportAttributeAccessIssue]
-        subfield = next(iter(fields(field_type)))
-        xsd_name = subfield.metadata["name"]
-        possible_attributes[field.name] = AttributeData(field_type, subfield.name, xsd_name)
-
-    return possible_attributes

src/bcf/bcf/agnostic/model.py

@@ -1,10 +0,0 @@
-import bcf.v2.model
-import bcf.v3.model
-from typing import Union
-
-BimSnippet = Union[bcf.v2.model.BimSnippet, bcf.v3.model.BimSnippet]
-BitMap = Union[bcf.v2.model.VisualizationInfoBitmap, bcf.v3.model.Bitmap]
-DocumentReference = Union[bcf.v2.model.TopicDocumentReference, bcf.v3.model.DocumentReference]
-HeaderFile = Union[bcf.v2.model.HeaderFile, bcf.v3.model.File]
-Topic = Union[bcf.v2.model.Topic, bcf.v3.model.Topic]
-ViewPoint = Union[bcf.v2.model.ViewPoint, bcf.v3.model.ViewPoint]

src/bcf/bcf/agnostic/topic.py

@@ -1,101 +0,0 @@
-import tempfile
-import bcf.v2.bcfxml
-import bcf.v2.model
-import bcf.v2.topic
-import bcf.v3.bcfxml
-import bcf.v3.model
-import bcf.v3.topic
-import bcf.agnostic.model as mdl
-from pathlib import Path
-from typing import Union, Optional
-from typing_extensions import assert_never
-
-TopicHandler = Union[bcf.v2.topic.TopicHandler, bcf.v3.topic.TopicHandler]
-
-
-def extract_file(
-    topic: TopicHandler,
-    entity: Union[mdl.HeaderFile, mdl.BimSnippet, mdl.DocumentReference, mdl.BitMap],
-    bcfxml: Optional[Union[bcf.v2.bcfxml.BcfXml, bcf.v3.bcfxml.BcfXml]] = None,
-    outfile: Optional[Path] = None,
-) -> Union[Path, str, None]:
-    """Extracts an element with a file into a temporary directory
-
-    These include header files, bim snippets, document references, and
-    viewpoint bitmaps. External reference are not downloaded. Instead, the
-    URI reference is returned.
-
-    :param entity: The entity with a file reference to extract
-    :param outfile: If provided, save the header file to that location.
-        Otherwise, a temporary directory is created and the filename is
-        derived from the header's original filename.
-    :param bcfxml: The BCF XML file to use for resolving document references files.
-        Required only for BCF v3 document references (in BCF v3 internal documents
-        are stored at BCF root, not in the topic).
-    :return: The filepath of the extracted file. It may be a URL if the
-        header file is external.
-    """
-    if isinstance(entity, mdl.DocumentReference):
-        if isinstance(entity, bcf.v2.model.TopicDocumentReference):
-            reference = entity.referenced_document
-        else:
-            reference = entity.document_guid
-    else:
-        reference = entity.reference
-
-    if not reference:
-        return None
-
-    # For v3 document references external documents are detected by empty document_guid.
-    # External bitmaps are not supported by bcf.
-    if not isinstance(entity, (bcf.v3.model.DocumentReference, mdl.BitMap)) and entity.is_external:
-        return reference
-
-    if isinstance(entity, bcf.v3.model.DocumentReference):
-        # Extract document reference filename and contents.
-        if not bcfxml:
-            raise TypeError("bcfxml is required for BCF v3 document references.")
-        assert isinstance(bcfxml, bcf.v3.bcfxml.BcfXml)
-        error_msg = f"BCF XML is missing document with guid '{reference}'."
-        if not bcfxml.documents:
-            raise Exception(error_msg)
-        definition_docs = bcfxml.documents.definition.documents
-        if not definition_docs:
-            raise Exception(error_msg)
-        docs = next((doc for doc in definition_docs.document if doc.guid == reference), None)
-        if not docs:
-            raise Exception(error_msg)
-        filename = docs.filename
-        bytes_data = bcfxml.documents.documents[filename]
-    else:
-        if isinstance(entity, mdl.BimSnippet):
-            bytes_data = topic.bim_snippet
-            assert isinstance(bytes_data, bytes)
-        elif isinstance(entity, mdl.HeaderFile):
-            bytes_data = topic.reference_files[reference]
-        elif isinstance(entity, mdl.BitMap):
-            bytes_data = next(
-                byte_data
-                for vp in topic.viewpoints.values()
-                for data_reference, byte_data in vp.bitmaps.items()
-                if data_reference == reference
-            )
-        elif isinstance(entity, bcf.v2.model.TopicDocumentReference):
-            assert isinstance(topic, bcf.v2.topic.TopicHandler)
-            bytes_data = topic.document_references[reference]
-        else:
-            assert_never(entity)
-
-        # We don't really need it if 'outfile' is None, just keeping type checker happy.
-        if isinstance(entity, mdl.HeaderFile) and entity.filename:
-            filename = entity.filename
-        else:
-            filename = Path(reference).name
-
-    if not outfile:
-        outfile = Path(tempfile.mkdtemp()) / filename
-
-    with open(outfile, "wb") as f:
-        f.write(bytes_data)
-
-    return outfile

src/bcf/bcf/agnostic/visinfo.py

@@ -1,5 +0,0 @@
-import bcf.v2.visinfo
-import bcf.v3.visinfo
-from typing import Union
-
-VisualizationInfoHandler = Union[bcf.v2.visinfo.VisualizationInfoHandler, bcf.v3.visinfo.VisualizationInfoHandler]

src/bcf/bcf/v2/model/extensions.py

@@ -1,197 +0,0 @@
-# NOTE: This file is not generated from
-# https://github.com/buildingSMART/BCF-XML/blob/release_2_1/Extension%20Schemas/extensions.xsd
-# because in bcf 2.1 there is no extensions.xml - I guess, the schema assumes that each .bcf
-# will use their own schema patched by it's own extensions.xsd.
-#
-# To make things simpler we just mimic extensions structures from bcf 3, so they'll have common API,
-# and parse extensions.xsd inside .bcf as .xml and fill our structures.
-#
-# Preferably if we could generate some kind of extensions.xml from extensions.xsd
-# and leave all the handling to xsdata.
-#
-# We also don't add it to __init__.py not to mess with generator.
-#
-# Currently extensions support for v2 is only read-only.
-
-
-from dataclasses import dataclass, field, fields
-from typing import List, NamedTuple, Optional
-
-
-@dataclass(slots=True, kw_only=True)
-class ExtensionsPriorities:
-    class Meta:
-        global_type = False
-
-    priority: List[str] = field(
-        default_factory=list,
-        metadata={
-            "name": "Priority",
-            "type": "Element",
-            "namespace": "",
-            "min_length": 1,
-            "white_space": "collapse",
-        },
-    )
-
-
-@dataclass(slots=True, kw_only=True)
-class ExtensionsSnippetTypes:
-    class Meta:
-        global_type = False
-
-    snippet_type: List[str] = field(
-        default_factory=list,
-        metadata={
-            "name": "SnippetType",
-            "type": "Element",
-            "namespace": "",
-            "min_length": 1,
-            "white_space": "collapse",
-        },
-    )
-
-
-@dataclass(slots=True, kw_only=True)
-class ExtensionsStages:
-    class Meta:
-        global_type = False
-
-    stage: List[str] = field(
-        default_factory=list,
-        metadata={
-            "name": "Stage",
-            "type": "Element",
-            "namespace": "",
-            "min_length": 1,
-            "white_space": "collapse",
-        },
-    )
-
-
-@dataclass(slots=True, kw_only=True)
-class ExtensionsTopicLabels:
-    class Meta:
-        global_type = False
-
-    topic_label: List[str] = field(
-        default_factory=list,
-        metadata={
-            "name": "TopicLabel",
-            "type": "Element",
-            "namespace": "",
-            "min_length": 1,
-            "white_space": "collapse",
-        },
-    )
-
-
-@dataclass(slots=True, kw_only=True)
-class ExtensionsTopicStatuses:
-    class Meta:
-        global_type = False
-
-    topic_status: List[str] = field(
-        default_factory=list,
-        metadata={
-            "name": "TopicStatus",
-            "type": "Element",
-            "namespace": "",
-            "min_length": 1,
-            "white_space": "collapse",
-        },
-    )
-
-
-@dataclass(slots=True, kw_only=True)
-class ExtensionsTopicTypes:
-    class Meta:
-        global_type = False
-
-    topic_type: List[str] = field(
-        default_factory=list,
-        metadata={
-            "name": "TopicType",
-            "type": "Element",
-            "namespace": "",
-            "min_length": 1,
-            "white_space": "collapse",
-        },
-    )
-
-
-@dataclass(slots=True, kw_only=True)
-class ExtensionsUsers:
-    class Meta:
-        global_type = False
-
-    user: List[str] = field(
-        default_factory=list,
-        metadata={
-            "name": "UserIdType",
-            "type": "Element",
-            "namespace": "",
-            "min_length": 1,
-            "white_space": "collapse",
-        },
-    )
-
-
-@dataclass(slots=True, kw_only=True)
-class Extensions:
-    topic_types: Optional[ExtensionsTopicTypes] = field(
-        default=None,
-        metadata={
-            "name": "TopicTypes",
-            "type": "Element",
-            "namespace": "",
-        },
-    )
-    topic_statuses: Optional[ExtensionsTopicStatuses] = field(
-        default=None,
-        metadata={
-            "name": "TopicStatuses",
-            "type": "Element",
-            "namespace": "",
-        },
-    )
-    priorities: Optional[ExtensionsPriorities] = field(
-        default=None,
-        metadata={
-            "name": "Priorities",
-            "type": "Element",
-            "namespace": "",
-        },
-    )
-    topic_labels: Optional[ExtensionsTopicLabels] = field(
-        default=None,
-        metadata={
-            "name": "TopicLabels",
-            "type": "Element",
-            "namespace": "",
-        },
-    )
-    users: Optional[ExtensionsUsers] = field(
-        default=None,
-        metadata={
-            "name": "Users",
-            "type": "Element",
-            "namespace": "",
-        },
-    )
-    snippet_types: Optional[ExtensionsSnippetTypes] = field(
-        default=None,
-        metadata={
-            "name": "SnippetTypes",
-            "type": "Element",
-            "namespace": "",
-        },
-    )
-    stages: Optional[ExtensionsStages] = field(
-        default=None,
-        metadata={
-            "name": "Stages",
-            "type": "Element",
-            "namespace": "",
-        },
-    )

src/bcf/pyproject.toml

@@ -13,11 +13,11 @@ readme = "README.md"
 requires-python = ">=3.8"
 keywords = ["IFC", "BCF", "BIM"]
 dependencies = [
-    "xsdata>=24.4",
+    "xsdata",
     "numpy",
     "ifcopenshell",
 ]
-version = "0.0.0"
+version = "0.0.999999"
 classifiers = [
     "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
     "Operating System :: OS Independent",
@@ -138,4 +138,4 @@ max-attributes = 10
 
 [tool.pylint.format]
 expected-line-ending-format = "LF"
-max-line-length = 120
+max-line-length = 120

src/bcf/src/bcf/__init__.py

@@ -15,5 +15,3 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with BCF.  If not, see <http://www.gnu.org/licenses/>.
-
-__version__ = version = "0.0.0"

src/bcf/src/bcf/bcfxml.py

@@ -18,7 +18,6 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with BCF.  If not, see <http://www.gnu.org/licenses/>.
 """
-
 import zipfile
 from pathlib import Path
 from typing import Optional, Union
@@ -30,10 +29,9 @@ from bcf.v3.model import Version as Version3
 from bcf.xml_parser import AbstractXmlParserSerializer, XmlParserSerializer
 
 
-BcfXml = Union[BcfXml2, BcfXml3]
-
-
-def load(filepath: Path, xml_handler: Optional[AbstractXmlParserSerializer] = None) -> Optional[BcfXml]:
+def load(
+    filepath: Path, xml_handler: Optional[AbstractXmlParserSerializer] = None
+) -> Optional[Union[BcfXml2, BcfXml3]]:
     """
     Load a BCF file.
 

src/bcf/src/bcf/geometry.py

@@ -5,8 +5,8 @@ from numpy.typing import NDArray
 
 
 def camera_vectors_from_element_placement(
-    elem_placement: NDArray[np.float64],
-) -> tuple[NDArray[np.float64], NDArray[np.float64], NDArray[np.float64]]:
+    elem_placement: NDArray[np.float_],
+) -> tuple[NDArray[np.float_], NDArray[np.float_], NDArray[np.float_]]:
     """
     Calculate the vectors of a camera pointing to an element.
 
@@ -21,8 +21,8 @@ def camera_vectors_from_element_placement(
 
 
 def camera_vectors_from_target_position(
-    target_position: NDArray[np.float64], offset: Optional[NDArray[np.float64]] = None
-) -> tuple[NDArray[np.float64], NDArray[np.float64], NDArray[np.float64]]:
+    target_position: NDArray[np.float_], offset: Optional[NDArray[np.float_]] = None
+) -> tuple[NDArray[np.float_], NDArray[np.float_], NDArray[np.float_]]:
     """
     Calculate the vectors of a camera pointing to a target point.
 
@@ -50,7 +50,7 @@ def camera_vectors_from_target_position(
     # return camera_position, -mat[:3, 2], mat[:3, 1]
 
 
-def unit_vector(v: NDArray[np.float64]) -> NDArray[np.float64]:
+def unit_vector(v: NDArray[np.float_]) -> NDArray[np.float_]:
     """
     Return the unit vector of a vector.
 

src/bcf/src/bcf/inmemory_zipfile.py

@@ -5,7 +5,6 @@ Copyright (c) 2017-2020 Anthon van der Neut, Ruamel bvba
 
 original idea from https://stackoverflow.com/a/19722365/1307905
 """
-
 import zipfile
 from io import BytesIO
 from os import PathLike
@@ -14,7 +13,8 @@ from typing import Any, Optional, Protocol
 
 
 class ZipFileInterface(Protocol):
-    def writestr(self, filename_in_zip: str | zipfile.ZipInfo, file_contents: bytes | str) -> None: ...
+    def writestr(self, filename_in_zip: str | zipfile.ZipInfo, file_contents: bytes | str) -> None:
+        ...
 
 
 class InMemoryZipFile:

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

@@ -1,14 +1,11 @@
 """BCF XML V2 handler."""
-
 import uuid
 import warnings
 import zipfile
 from pathlib import Path
 from typing import Any, NoReturn, Optional, TypeVar
 
-import bcf.agnostic.extensions
 import bcf.v2.model as mdl
-import bcf.v2.model.extensions as mdl_extensions
 from bcf.inmemory_zipfile import InMemoryZipFile, ZipFileInterface
 from bcf.v2.topic import TopicHandler
 from bcf.xml_parser import AbstractXmlParserSerializer, XmlParserSerializer
@@ -26,8 +23,7 @@ class BcfXml:
         self._xml_handler = xml_handler or XmlParserSerializer()
         self._version: Optional[mdl.Version] = None
         self._project_info: Optional[mdl.ProjectExtension] = None
-        self._extensions: Optional[mdl_extensions.Extensions] = None
-        self._topics: Optional[dict[str, TopicHandler]] = None
+        self._topics: dict[str, TopicHandler] = {}
         self._extension_schema: Optional[bytes] = None
         self._zip_file = self._load_zip_file()
 
@@ -88,63 +84,24 @@ class BcfXml:
     def extension_schema(self, value: bytes) -> None:
         self._extension_schema = value
 
-    @property
-    def extensions(self) -> Optional[mdl_extensions.Extensions]:
-        """BCF extensions."""
-
-        if not self._extensions and self.extension_schema:
-            import io
-            from xml.etree import ElementTree as etree
-
-            extensions = mdl_extensions.Extensions()
-
-            xs = "{http://www.w3.org/2001/XMLSchema}"
-            root = etree.parse(io.BytesIO((self.extension_schema)))
-
-            attrs = bcf.agnostic.extensions.get_extensions_attributes(extensions)
-            xsd_to_attrs = {v.subattr_xsd_name: k for k, v in attrs.items()}
-            for node in root.findall(f".//{xs}restriction"):
-                attr_type = node.attrib.get("base")
-                if not attr_type:
-                    continue
-                attr_name = xsd_to_attrs.get(attr_type)
-                if attr_name is None:
-                    continue
-                values = []
-                for enum in node.findall(f".//{xs}enumeration"):
-                    values.append(enum.attrib["value"])
-                if not values:
-                    continue
-                attr_data = attrs[attr_name]
-                attr = attr_data.attr_type()
-                setattr(attr, attr_data.subattr_name, values)
-                setattr(extensions, attr_name, attr)
-
-            self._extensions = extensions
-        return self._extensions
-
-    @extensions.setter
-    def extensions(self, value: Optional[mdl_extensions.Extensions]) -> None:
-        self._extensions = value
-
     @property
     def topics(self) -> dict[str, TopicHandler]:
         """BCF topics."""
-        if self._topics is None:
-            self._topics = self._load_topics()
+        if not self._topics and self._zip_file:
+            self._topics = self._load_topics(self._zip_file, self._xml_handler)
         return self._topics
 
-    def _load_topics(self) -> dict[str, TopicHandler]:
+    def _load_topics(
+        self, zip_file: zipfile.ZipFile, xml_handler: AbstractXmlParserSerializer
+    ) -> dict[str, TopicHandler]:
         topics = {}
-        if self._zip_file is None:
-            return topics
-        for topic_dir in zipfile.Path(self._zip_file).iterdir():
+        for topic_dir in zipfile.Path(zip_file).iterdir():
             if not topic_dir.is_dir():
                 continue
             markup_path = topic_dir.joinpath("markup.bcf")
             if not markup_path.exists():
                 continue
-            topics[topic_dir.name] = TopicHandler(topic_dir, self._xml_handler)
+            topics[topic_dir.name] = TopicHandler(topic_dir, xml_handler)
         return topics
 
     @classmethod

src/bcf/src/bcf/v2/model/markup.py

@@ -34,7 +34,7 @@ class BimSnippet:
         metadata={
             "name": "isExternal",
             "type": "Attribute",
-        },
+        }
     )
 
 
@@ -64,7 +64,7 @@ class HeaderFile:
             "name": "Filename",
             "type": "Element",
             "namespace": "",
-        },
+        }
     )
     date: Optional[XmlDateTime] = field(
         default=None,
@@ -72,7 +72,7 @@ class HeaderFile:
             "name": "Date",
             "type": "Element",
             "namespace": "",
-        },
+        }
     )
     reference: Optional[str] = field(
         default=None,
@@ -80,7 +80,7 @@ class HeaderFile:
             "name": "Reference",
             "type": "Element",
             "namespace": "",
-        },
+        }
     )
     ifc_project: Optional[str] = field(
         default=None,
@@ -89,7 +89,7 @@ class HeaderFile:
             "type": "Attribute",
             "length": 22,
             "pattern": r"[0-9,A-Z,a-z,_$]*",
-        },
+        }
     )
     ifc_spatial_structure_element: Optional[str] = field(
         default=None,
@@ -98,14 +98,14 @@ class HeaderFile:
             "type": "Attribute",
             "length": 22,
             "pattern": r"[0-9,A-Z,a-z,_$]*",
-        },
+        }
     )
     is_external: bool = field(
         default=True,
         metadata={
             "name": "isExternal",
             "type": "Attribute",
-        },
+        }
     )
 
 
@@ -120,7 +120,7 @@ class TopicDocumentReference:
             "name": "ReferencedDocument",
             "type": "Element",
             "namespace": "",
-        },
+        }
     )
     description: Optional[str] = field(
         default=None,
@@ -128,7 +128,7 @@ class TopicDocumentReference:
             "name": "Description",
             "type": "Element",
             "namespace": "",
-        },
+        }
     )
     guid: Optional[str] = field(
         default=None,
@@ -136,14 +136,14 @@ class TopicDocumentReference:
             "name": "Guid",
             "type": "Attribute",
             "pattern": r"[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}",
-        },
+        }
     )
     is_external: bool = field(
         default=False,
         metadata={
             "name": "isExternal",
             "type": "Attribute",
-        },
+        }
     )
 
 
@@ -170,7 +170,7 @@ class ViewPoint:
             "name": "Viewpoint",
             "type": "Element",
             "namespace": "",
-        },
+        }
     )
     snapshot: Optional[str] = field(
         default=None,
@@ -178,7 +178,7 @@ class ViewPoint:
             "name": "Snapshot",
             "type": "Element",
             "namespace": "",
-        },
+        }
     )
     index: Optional[int] = field(
         default=None,
@@ -186,7 +186,7 @@ class ViewPoint:
             "name": "Index",
             "type": "Element",
             "namespace": "",
-        },
+        }
     )
     guid: str = field(
         metadata={
@@ -230,7 +230,7 @@ class Comment:
             "name": "Viewpoint",
             "type": "Element",
             "namespace": "",
-        },
+        }
     )
     modified_date: Optional[XmlDateTime] = field(
         default=None,
@@ -238,7 +238,7 @@ class Comment:
             "name": "ModifiedDate",
             "type": "Element",
             "namespace": "",
-        },
+        }
     )
     modified_author: Optional[str] = field(
         default=None,
@@ -246,7 +246,7 @@ class Comment:
             "name": "ModifiedAuthor",
             "type": "Element",
             "namespace": "",
-        },
+        }
     )
     guid: str = field(
         metadata={
@@ -267,7 +267,7 @@ class Header:
             "type": "Element",
             "namespace": "",
             "min_occurs": 1,
-        },
+        }
     )
 
 
@@ -279,7 +279,7 @@ class Topic:
             "name": "ReferenceLink",
             "type": "Element",
             "namespace": "",
-        },
+        }
     )
     title: str = field(
         metadata={
@@ -295,7 +295,7 @@ class Topic:
             "name": "Priority",
             "type": "Element",
             "namespace": "",
-        },
+        }
     )
     index: Optional[int] = field(
         default=None,
@@ -303,7 +303,7 @@ class Topic:
             "name": "Index",
             "type": "Element",
             "namespace": "",
-        },
+        }
     )
     labels: List[str] = field(
         default_factory=list,
@@ -311,7 +311,7 @@ class Topic:
             "name": "Labels",
             "type": "Element",
             "namespace": "",
-        },
+        }
     )
     creation_date: XmlDateTime = field(
         metadata={
@@ -335,7 +335,7 @@ class Topic:
             "name": "ModifiedDate",
             "type": "Element",
             "namespace": "",
-        },
+        }
     )
     modified_author: Optional[str] = field(
         default=None,
@@ -343,7 +343,7 @@ class Topic:
             "name": "ModifiedAuthor",
             "type": "Element",
             "namespace": "",
-        },
+        }
     )
     due_date: Optional[XmlDateTime] = field(
         default=None,
@@ -351,7 +351,7 @@ class Topic:
             "name": "DueDate",
             "type": "Element",
             "namespace": "",
-        },
+        }
     )
     assigned_to: Optional[str] = field(
         default=None,
@@ -359,7 +359,7 @@ class Topic:
             "name": "AssignedTo",
             "type": "Element",
             "namespace": "",
-        },
+        }
     )
     stage: Optional[str] = field(
         default=None,
@@ -367,7 +367,7 @@ class Topic:
             "name": "Stage",
             "type": "Element",
             "namespace": "",
-        },
+        }
     )
     description: Optional[str] = field(
         default=None,
@@ -375,7 +375,7 @@ class Topic:
             "name": "Description",
             "type": "Element",
             "namespace": "",
-        },
+        }
     )
     bim_snippet: Optional[BimSnippet] = field(
         default=None,
@@ -383,7 +383,7 @@ class Topic:
             "name": "BimSnippet",
             "type": "Element",
             "namespace": "",
-        },
+        }
     )
     document_reference: List[TopicDocumentReference] = field(
         default_factory=list,
@@ -391,7 +391,7 @@ class Topic:
             "name": "DocumentReference",
             "type": "Element",
             "namespace": "",
-        },
+        }
     )
     related_topic: List[TopicRelatedTopic] = field(
         default_factory=list,
@@ -399,7 +399,7 @@ class Topic:
             "name": "RelatedTopic",
             "type": "Element",
             "namespace": "",
-        },
+        }
     )
     guid: str = field(
         metadata={
@@ -414,14 +414,14 @@ class Topic:
         metadata={
             "name": "TopicType",
             "type": "Attribute",
-        },
+        }
     )
     topic_status: Optional[str] = field(
         default=None,
         metadata={
             "name": "TopicStatus",
             "type": "Attribute",
-        },
+        }
     )
 
 
@@ -433,7 +433,7 @@ class Markup:
             "name": "Header",
             "type": "Element",
             "namespace": "",
-        },
+        }
     )
     topic: Topic = field(
         metadata={
@@ -449,7 +449,7 @@ class Markup:
             "name": "Comment",
             "type": "Element",
             "namespace": "",
-        },
+        }
     )
     viewpoints: List[ViewPoint] = field(
         default_factory=list,
@@ -457,5 +457,5 @@ class Markup:
             "name": "Viewpoints",
             "type": "Element",
             "namespace": "",
-        },
+        }
     )

src/bcf/src/bcf/v2/model/project.py

@@ -10,7 +10,7 @@ class Project:
             "name": "Name",
             "type": "Element",
             "namespace": "",
-        },
+        }
     )
     project_id: str = field(
         metadata={
@@ -29,7 +29,7 @@ class ProjectExtension:
             "name": "Project",
             "type": "Element",
             "namespace": "",
-        },
+        }
     )
     extension_schema: str = field(
         metadata={

src/bcf/src/bcf/v2/model/version.py

@@ -10,12 +10,12 @@ class Version:
             "name": "DetailedVersion",
             "type": "Element",
             "namespace": "",
-        },
+        }
     )
     version_id: Optional[str] = field(
         default=None,
         metadata={
             "name": "VersionId",
             "type": "Attribute",
-        },
+        }
     )

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

@@ -15,14 +15,14 @@ class Component:
         metadata={
             "name": "OriginatingSystem",
             "type": "Element",
-        },
+        }
     )
     authoring_tool_id: Optional[str] = field(
         default=None,
         metadata={
             "name": "AuthoringToolId",
             "type": "Element",
-        },
+        }
     )
     ifc_guid: Optional[str] = field(
         default=None,
@@ -31,7 +31,7 @@ class Component:
             "type": "Attribute",
             "length": 22,
             "pattern": r"[0-9,A-Z,a-z,_$]*",
-        },
+        }
     )
 
 
@@ -92,21 +92,21 @@ class ViewSetupHints:
         metadata={
             "name": "SpacesVisible",
             "type": "Attribute",
-        },
+        }
     )
     space_boundaries_visible: Optional[bool] = field(
         default=None,
         metadata={
             "name": "SpaceBoundariesVisible",
             "type": "Attribute",
-        },
+        }
     )
     openings_visible: Optional[bool] = field(
         default=None,
         metadata={
             "name": "OpeningsVisible",
             "type": "Attribute",
-        },
+        }
     )
 
 
@@ -139,7 +139,7 @@ class ComponentColoringColor:
             "name": "Component",
             "type": "Element",
             "min_occurs": 1,
-        },
+        }
     )
     color: Optional[str] = field(
         default=None,
@@ -147,7 +147,7 @@ class ComponentColoringColor:
             "name": "Color",
             "type": "Attribute",
             "pattern": r"[0-9,a-f,A-F]{6}([0-9,a-f,A-F]{2})?",
-        },
+        }
     )
 
 
@@ -159,7 +159,7 @@ class ComponentSelection:
             "name": "Component",
             "type": "Element",
             "min_occurs": 1,
-        },
+        }
     )
 
 
@@ -174,7 +174,7 @@ class ComponentVisibilityExceptions:
             "name": "Component",
             "type": "Element",
             "min_occurs": 1,
-        },
+        }
     )
 
 
@@ -205,7 +205,6 @@ class OrthogonalCamera:
         camera_up_vector:
         view_to_world_scale: view's visible size in meters
     """
-
     camera_view_point: Point = field(
         metadata={
             "name": "CameraViewPoint",
@@ -248,7 +247,6 @@ class PerspectiveCamera:
             release and viewers should be expect values outside this
             range in current implementations.
     """
-
     camera_view_point: Point = field(
         metadata={
             "name": "CameraViewPoint",
@@ -338,7 +336,7 @@ class ComponentColoring:
             "name": "Color",
             "type": "Element",
             "min_occurs": 1,
-        },
+        }
     )
 
 
@@ -349,14 +347,14 @@ class ComponentVisibility:
         metadata={
             "name": "Exceptions",
             "type": "Element",
-        },
+        }
     )
     default_visibility: Optional[bool] = field(
         default=None,
         metadata={
             "name": "DefaultVisibility",
             "type": "Attribute",
-        },
+        }
     )
 
 
@@ -370,7 +368,7 @@ class VisualizationInfoClippingPlanes:
         metadata={
             "name": "ClippingPlane",
             "type": "Element",
-        },
+        }
     )
 
 
@@ -385,7 +383,7 @@ class VisualizationInfoLines:
             "name": "Line",
             "type": "Element",
             "min_occurs": 1,
-        },
+        }
     )
 
 
@@ -396,14 +394,14 @@ class Components:
         metadata={
             "name": "ViewSetupHints",
             "type": "Element",
-        },
+        }
     )
     selection: Optional[ComponentSelection] = field(
         default=None,
         metadata={
             "name": "Selection",
             "type": "Element",
-        },
+        }
     )
     visibility: ComponentVisibility = field(
         metadata={
@@ -417,7 +415,7 @@ class Components:
         metadata={
             "name": "Coloring",
             "type": "Element",
-        },
+        }
     )
 
 
@@ -426,48 +424,47 @@ class VisualizationInfo:
     """
     VisualizationInfo documentation.
     """
-
     components: Optional[Components] = field(
         default=None,
         metadata={
             "name": "Components",
             "type": "Element",
-        },
+        }
     )
     orthogonal_camera: Optional[OrthogonalCamera] = field(
         default=None,
         metadata={
             "name": "OrthogonalCamera",
             "type": "Element",
-        },
+        }
     )
     perspective_camera: Optional[PerspectiveCamera] = field(
         default=None,
         metadata={
             "name": "PerspectiveCamera",
             "type": "Element",
-        },
+        }
     )
     lines: Optional[VisualizationInfoLines] = field(
         default=None,
         metadata={
             "name": "Lines",
             "type": "Element",
-        },
+        }
     )
     clipping_planes: Optional[VisualizationInfoClippingPlanes] = field(
         default=None,
         metadata={
             "name": "ClippingPlanes",
             "type": "Element",
-        },
+        }
     )
     bitmap: List[VisualizationInfoBitmap] = field(
         default_factory=list,
         metadata={
             "name": "Bitmap",
             "type": "Element",
-        },
+        }
     )
     guid: str = field(
         metadata={

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

@@ -1,11 +1,10 @@
 """BCF XML V2 Topic handler."""
-
 import datetime
 import tempfile
 import uuid
 import zipfile
 from pathlib import Path
-from typing import Any, NoReturn, Optional, Union
+from typing import Any, NoReturn, Optional
 
 import numpy as np
 from ifcopenshell import entity_instance
@@ -27,9 +26,9 @@ class TopicHandler:
         xml_handler: Optional[AbstractXmlParserSerializer] = None,
     ) -> None:
         self._markup: Optional[mdl.Markup] = None
-        self._viewpoints: Optional[dict[str, VisualizationInfoHandler]] = None
-        self._reference_files: Optional[dict[str, bytes]] = None
-        self._document_references: Optional[dict[str, bytes]] = None
+        self._viewpoints: dict[str, VisualizationInfoHandler] = {}
+        self._reference_files: dict[str, bytes] = {}
+        self._document_references: dict[str, bytes] = {}
         self._bim_snippet: Optional[bytes] = None
         self._xml_handler = xml_handler or XmlParserSerializer()
         self._topic_dir = topic_dir
@@ -63,21 +62,11 @@ class TopicHandler:
         """Return the header of the topic."""
         return self.markup.header if self.markup else None
 
-    @header.setter
-    def header(self, header: mdl.Header) -> None:
-        """Set the header of the topic."""
-        self.markup.header = header
-
     @property
     def comments(self) -> list[mdl.Comment]:
         """Return the comments of the topic."""
         return self.markup.comment if self.markup else []
 
-    @comments.setter
-    def comments(self, comments: list[mdl.Comment]) -> None:
-        assert self.markup
-        self.markup.comment = comments
-
     @property
     def bim_snippet(self) -> Optional[bytes]:
         if not self._bim_snippet and self._topic_dir:
@@ -90,24 +79,14 @@ class TopicHandler:
 
     @property
     def viewpoints(self) -> dict[str, VisualizationInfoHandler]:
-        if self._viewpoints is None:
+        if not self._viewpoints and self._topic_dir:
             self._viewpoints = self._load_viewpoints()
         return self._viewpoints
 
-    def _load_viewpoints(self) -> dict[str, VisualizationInfoHandler]:
-        if self._topic_dir and self.markup and (viewpoints := self.markup.viewpoints):
-            return VisualizationInfoHandler.from_topic_viewpoints(self._topic_dir, viewpoints)
-        return {}
-
     @property
     def reference_files(self) -> dict[str, bytes]:
-        if self._reference_files is not None:
+        if self._reference_files or not self.header:
             return self._reference_files
-
-        self._reference_files = {}
-        if not self.header:
-            return self._reference_files
-
         for ref in self.header.file:
             if ref.is_external:
                 continue
@@ -119,13 +98,8 @@ class TopicHandler:
 
     @property
     def document_references(self) -> dict[str, bytes]:
-        if self._document_references is not None:
+        if self._document_references or not self.topic:
             return self._document_references
-
-        self._document_references = {}
-        if not self.topic:
-            return self._document_references
-
         for doc in self.topic.document_reference:
             if doc.is_external or not doc.referenced_document:
                 continue
@@ -143,6 +117,11 @@ class TopicHandler:
                 return bim_snippet_path.read_bytes()
         return None
 
+    def _load_viewpoints(self) -> dict[str, VisualizationInfoHandler]:
+        if self.markup and (viewpoints := self.markup.viewpoints):
+            return VisualizationInfoHandler.from_topic_viewpoints(self._topic_dir, viewpoints)
+        return {}
+
     @classmethod
     def create_new(
         cls,
@@ -240,7 +219,55 @@ class TopicHandler:
                 real_path = real_path.parent if path_part == ".." else real_path.joinpath(path_part)
             destination_zip.writestr(real_path.at, self.document_references[doc.referenced_document])
 
-    def add_viewpoint(self, element: entity_instance) -> VisualizationInfoHandler:
+    def extract_file(self, entity, outfile: Optional[Path] = None) -> Path:
+        """Extracts an element with a file into a temporary directory
+
+        These include header files, bim snippets, document references, and
+        viewpoint bitmaps. External reference are not downloaded. Instead, the
+        URI reference is returned.
+
+        :param entity: The entity with a file reference to extract
+        :type entity: bcf.v2.model.HeaderFile,bcf.v2.model.BimSnippet,bcf.v2.model.TopicDocumentReference
+        :param outfile: If provided, save the header file to that location.
+            Otherwise, a temporary directory is created and the filename is
+            derived from the header's original filename.
+        :type outfile: pathlib.Path,optional
+        :return: The filepath of the extracted file. It may be a URL if the
+            header file is external.
+        :rtype: Path
+        """
+        if hasattr(entity, "reference"):
+            reference = entity.reference
+        else:
+            reference = entity.referenced_document
+
+        if not reference:
+            return
+
+        if getattr(entity, "is_external", False):
+            return entity.reference
+
+        resolved_reference = self._topic_dir
+
+        for part in Path(reference).parts:
+            if part == "..":
+                resolved_reference = resolved_reference.parent
+            else:
+                resolved_reference = resolved_reference.joinpath(part)
+
+        if not outfile:
+            if getattr(entity, "filename", None):
+                filename = entity.filename
+            else:
+                filename = resolved_reference.name
+            outfile = Path(tempfile.mkdtemp()) / filename
+
+        with open(outfile, "wb") as f:
+            f.write(resolved_reference.read_bytes())
+
+        return outfile
+
+    def add_viewpoint(self, element: entity_instance) -> None:
         """Add a viewpoint pointed at the placement of an IFC element to the topic.
 
         Args:
@@ -250,9 +277,7 @@ class TopicHandler:
         self.add_visinfo_handler(new_viewpoint)
         return new_viewpoint
 
-    def add_viewpoint_from_point_and_guids(
-        self, position: NDArray[np.float64], *guids: str
-    ) -> VisualizationInfoHandler:
+    def add_viewpoint_from_point_and_guids(self, position: NDArray[np.float_], *guids: str) -> None:
         """Add a viewpoint pointing at an XYZ point in space
 
         Args:
@@ -265,17 +290,9 @@ class TopicHandler:
         self.add_visinfo_handler(vi_handler)
         return vi_handler
 
-    def add_visinfo_handler(
-        self, new_viewpoint: VisualizationInfoHandler, snapshot_filename: Optional[str] = None
-    ) -> mdl.ViewPoint:
+    def add_visinfo_handler(self, new_viewpoint: VisualizationInfoHandler) -> None:
         self.viewpoints[new_viewpoint.guid + ".bcfv"] = new_viewpoint
-        viewpoint = mdl.ViewPoint(
-            viewpoint=new_viewpoint.guid + ".bcfv",
-            snapshot=snapshot_filename,
-            guid=new_viewpoint.guid,
-        )
-        self.markup.viewpoints.append(viewpoint)
-        return viewpoint
+        self.markup.viewpoints.append(mdl.ViewPoint(viewpoint=new_viewpoint.guid + ".bcfv", guid=new_viewpoint.guid))
 
     def __eq__(self, other: object) -> bool | NoReturn:
         return (

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

@@ -1,6 +1,7 @@
 import uuid
 import zipfile
-from typing import Any, Iterable, Optional, Literal, Union
+from functools import lru_cache
+from typing import Any, Iterable, Optional
 
 import numpy as np
 from ifcopenshell import entity_instance
@@ -133,15 +134,6 @@ class VisualizationInfoHandler:
         self._save_bitmaps(bcf_zip, topic_dir)
 
     def _save_snapshot(self, bcf_zip: ZipFileInterface, topic_dir: str, filename: Optional[str]) -> None:
-        if bool(self.snapshot) ^ bool(filename):
-            data = ["data (VisualizationInfoHandler.snapshot)", "filename (ViewPoint.snapshot)"]
-            provided_data, missing_data = data if self.snapshot else data[::-1]
-            print(
-                f"WARNING. Snapshot with viewpoint guid '{self.guid}' won't be saved to bcf. "
-                f"Only snapshot {provided_data} is provided but snapshot {missing_data} is missing."
-            )
-            return
-
         if self.snapshot and filename:
             bcf_zip.writestr(f"{topic_dir}/{filename}", self.snapshot)
 
@@ -184,7 +176,7 @@ class VisualizationInfoHandler:
     @classmethod
     def create_from_point_and_guids(
         cls,
-        position: NDArray[np.float64],
+        position: NDArray[np.float_],
         *guids: str,
         xml_handler: Optional[AbstractXmlParserSerializer] = None,
     ) -> "VisualizationInfoHandler":
@@ -204,110 +196,13 @@ class VisualizationInfoHandler:
             visualization_info=build_viewpoint_from_position_and_guids(position, *guids), xml_handler=xml_handler
         )
 
-    def get_selected_guids(self) -> Union[list[str], None]:
-        """
-        Return viewpoint selected elements IFC guids.
-
-        Returns:
-            If viewpoint has no selection settings, return `None`.
-            Otherwise return a list of selected elements IFC guids.
-        """
-        visualization_info = self.visualization_info
-        components = visualization_info.components
-        if not components:
-            return None
-
-        selection = components.selection
-        if not selection:
-            return None
-        return [guid for c in selection.component if (guid := c.ifc_guid)]
-
-    def set_selected_elements(self, elements: list[ifcopenshell.entity_instance]) -> None:
-        visualization_info = self.visualization_info
-
-        guids = [e.GlobalId for e in elements]
-        components = visualization_info.components
-        if not components:
-            visibility = mdl.ComponentVisibility(default_visibility=True)
-            components = mdl.Components(visibility=visibility)
-            visualization_info.components = components
-
-        selection = components.selection
-        components_list = [mdl.Component(ifc_guid=guid) for guid in guids]
-        if not selection:
-            selection = mdl.ComponentSelection()
-            components.selection = selection
-        selection.component = components_list
-
-    def set_visible_elements(self, elements: list[ifcopenshell.entity_instance]) -> None:
-        self.set_visibility(elements, elements_visibility="VISIBLE")
-
-    def set_hidden_elements(self, elements: list[ifcopenshell.entity_instance]) -> None:
-        self.set_visibility(elements, elements_visibility="HIDDEN")
-
-    def set_visibility(
-        self, elements: list[ifcopenshell.entity_instance], elements_visibility: Literal["VISIBLE", "HIDDEN"]
-    ) -> None:
-        visualization_info = self.visualization_info
-        default_visibility = elements_visibility == "HIDDEN"
-
-        guids = [e.GlobalId for e in elements]
-        components_list = [mdl.Component(ifc_guid=guid) for guid in guids]
-        components = visualization_info.components
-        if not components:
-            visibility = mdl.ComponentVisibility(default_visibility=default_visibility)
-            components = mdl.Components(visibility=visibility)
-            visualization_info.components = components
-
-        visibility = components.visibility
-        if not visibility:
-            visibility = mdl.ComponentVisibility(default_visibility=default_visibility)
-            components.visibility = visibility
-        elif visibility.default_visibility != default_visibility:
-            visibility.default_visibility = default_visibility
-
-        exceptions = visibility.exceptions
-        if not exceptions:
-            exceptions = mdl.ComponentVisibilityExceptions()
-            visibility.exceptions = exceptions
-        exceptions.component = components_list
-
-    def get_elements_visibility(self) -> Union[tuple[bool, list[str]], None]:
-        """
-        Return viewpoint elements visibility settings.
-
-        Returns:
-            If viewpoint has no visibility settings, return `None`.
-            Otherwise return a tuple containing the default visibility
-            and a list of IFC element GUIDs listed as exceptions.
-
-            If default visibility is `True`, all elements are visible except the exceptions.
-
-            If default visibility is `False`, all elements are hidden except the exceptions.
-        """
-
-        visualization_info = self.visualization_info
-        components = visualization_info.components
-        if not components:
-            return None
-
-        visibility = components.visibility
-        if not visibility:
-            return None
-        default_visibility = visibility.default_visibility or False
-
-        exceptions = visibility.exceptions
-        if not exceptions:
-            return default_visibility, []
-        guids = [guid for c in exceptions.component if (guid := c.ifc_guid)]
-        return default_visibility, guids
-
 
+@lru_cache(maxsize=None)
 def build_viewpoint(element: entity_instance) -> mdl.VisualizationInfo:
     """
     Return a BCF viewpoint of an IFC element.
 
-    This function is cached to speed up the creation of multiple BCF topics regarding the same element.
+    This function is cached to speedudp the creation of multiple BCF topics regarding the same element.
 
     Args:
         element: The IFC element to point at.
@@ -329,11 +224,11 @@ def build_viewpoint(element: entity_instance) -> mdl.VisualizationInfo:
     )
 
 
-def build_viewpoint_from_position_and_guids(position: NDArray[np.float64], *guids: str) -> mdl.VisualizationInfo:
+def build_viewpoint_from_position_and_guids(position: NDArray[np.float_], *guids: str) -> mdl.VisualizationInfo:
     """
     Return a BCF viewpoint of an IFC element.
 
-    This function is cached to speed up the creation of multiple BCF topics regarding the same element.
+    This function is cached to speedudp the creation of multiple BCF topics regarding the same element.
 
     Args:
         position: target point coordinates.
@@ -354,7 +249,7 @@ def build_components(*guids: str) -> mdl.Components:
     Return the BCF components from an IFC element GUID.
 
     Args:
-        *guids: One or more selected IFC element GUID.
+        *guids: One or more IFC element GUID.
 
     Returns:
         The BCF components definition.
@@ -366,7 +261,7 @@ def build_components(*guids: str) -> mdl.Components:
     )
 
 
-def build_camera(elem_placement: NDArray[np.float64]) -> mdl.PerspectiveCamera:
+def build_camera(elem_placement: NDArray[np.float_]) -> mdl.PerspectiveCamera:
     """
     Return a BCF camera for an IFC element placement matrix.
 
@@ -380,7 +275,7 @@ def build_camera(elem_placement: NDArray[np.float64]) -> mdl.PerspectiveCamera:
 
 
 def build_camera_from_vectors(
-    camera_position: NDArray[np.float64], camera_dir: NDArray[np.float64], camera_up: NDArray[np.float64]
+    camera_position: NDArray[np.float_], camera_dir: NDArray[np.float_], camera_up: NDArray[np.float_]
 ) -> mdl.PerspectiveCamera:
     """
     Return a BCF camera for an IFC element placement matrix.

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

@@ -1,5 +1,4 @@
 """BCF XML V3 handlers."""
-
 import uuid
 import warnings
 import zipfile
@@ -26,7 +25,7 @@ class BcfXml:
         self._version: Optional[mdl.Version] = None
         self._project_info: Optional[mdl.ProjectInfo] = None
         self._extensions: Optional[mdl.Extensions] = None
-        self._topics: Optional[dict[str, TopicHandler]] = None
+        self._topics: dict[str, TopicHandler] = {}
         self._documents: Optional[DocumentsHandler] = None
         self._zip_file = self._load_zip_file()
 
@@ -91,22 +90,18 @@ class BcfXml:
     @property
     def topics(self) -> dict[str, TopicHandler]:
         """BCF topics."""
-        if self._topics is None:
-            self._topics = self._load_topics()
+        if not self._topics and self._zip_file:
+            self._load_topics()
         return self._topics
 
-    def _load_topics(self) -> dict[str, TopicHandler]:
-        topics = {}
-        if self._zip_file is None:
-            return topics
+    def _load_topics(self) -> None:
         for topic_dir in zipfile.Path(self._zip_file).iterdir():
             if not topic_dir.is_dir():
                 continue
             markup_path = topic_dir.joinpath("markup.bcf")
             if not markup_path.exists():
                 continue
-            topics[topic_dir.name] = TopicHandler(topic_dir, self._xml_handler)
-        return topics
+            self._topics[topic_dir.name] = TopicHandler(topic_dir, self._xml_handler)
 
     @property
     def documents(self) -> Optional[DocumentsHandler]:

src/bcf/src/bcf/v3/document.py

@@ -1,5 +1,4 @@
 """BCF XML V3 Documents handler."""
-
 import zipfile
 from typing import Any, Optional
 

src/bcf/src/bcf/v3/model/documents.py

@@ -22,7 +22,7 @@ class Document:
             "namespace": "",
             "min_length": 1,
             "white_space": "collapse",
-        },
+        }
     )
     guid: str = field(
         metadata={
@@ -45,7 +45,7 @@ class DocumentInfoDocuments:
             "name": "Document",
             "type": "Element",
             "namespace": "",
-        },
+        }
     )
 
 
@@ -57,5 +57,5 @@ class DocumentInfo:
             "name": "Documents",
             "type": "Element",
             "namespace": "",
-        },
+        }
     )

src/bcf/src/bcf/v3/model/extensions.py

@@ -15,7 +15,7 @@ class ExtensionsPriorities:
             "namespace": "",
             "min_length": 1,
             "white_space": "collapse",
-        },
+        }
     )
 
 
@@ -32,7 +32,7 @@ class ExtensionsSnippetTypes:
             "namespace": "",
             "min_length": 1,
             "white_space": "collapse",
-        },
+        }
     )
 
 
@@ -49,7 +49,7 @@ class ExtensionsStages:
             "namespace": "",
             "min_length": 1,
             "white_space": "collapse",
-        },
+        }
     )
 
 
@@ -66,7 +66,7 @@ class ExtensionsTopicLabels:
             "namespace": "",
             "min_length": 1,
             "white_space": "collapse",
-        },
+        }
     )
 
 
@@ -83,7 +83,7 @@ class ExtensionsTopicStatuses:
             "namespace": "",
             "min_length": 1,
             "white_space": "collapse",
-        },
+        }
     )
 
 
@@ -100,7 +100,7 @@ class ExtensionsTopicTypes:
             "namespace": "",
             "min_length": 1,
             "white_space": "collapse",
-        },
+        }
     )
 
 
@@ -117,7 +117,7 @@ class ExtensionsUsers:
             "namespace": "",
             "min_length": 1,
             "white_space": "collapse",
-        },
+        }
     )
 
 
@@ -129,7 +129,7 @@ class Extensions:
             "name": "TopicTypes",
             "type": "Element",
             "namespace": "",
-        },
+        }
     )
     topic_statuses: Optional[ExtensionsTopicStatuses] = field(
         default=None,
@@ -137,7 +137,7 @@ class Extensions:
             "name": "TopicStatuses",
             "type": "Element",
             "namespace": "",
-        },
+        }
     )
     priorities: Optional[ExtensionsPriorities] = field(
         default=None,
@@ -145,7 +145,7 @@ class Extensions:
             "name": "Priorities",
             "type": "Element",
             "namespace": "",
-        },
+        }
     )
     topic_labels: Optional[ExtensionsTopicLabels] = field(
         default=None,
@@ -153,7 +153,7 @@ class Extensions:
             "name": "TopicLabels",
             "type": "Element",
             "namespace": "",
-        },
+        }
     )
     users: Optional[ExtensionsUsers] = field(
         default=None,
@@ -161,7 +161,7 @@ class Extensions:
             "name": "Users",
             "type": "Element",
             "namespace": "",
-        },
+        }
     )
     snippet_types: Optional[ExtensionsSnippetTypes] = field(
         default=None,
@@ -169,7 +169,7 @@ class Extensions:
             "name": "SnippetTypes",
             "type": "Element",
             "namespace": "",
-        },
+        }
     )
     stages: Optional[ExtensionsStages] = field(
         default=None,
@@ -177,5 +177,5 @@ class Extensions:
             "name": "Stages",
             "type": "Element",
             "namespace": "",
-        },
+        }
     )

src/bcf/src/bcf/v3/model/markup.py

@@ -40,7 +40,7 @@ class BimSnippet:
         metadata={
             "name": "IsExternal",
             "type": "Attribute",
-        },
+        }
     )
 
 
@@ -68,7 +68,7 @@ class DocumentReference:
             "type": "Element",
             "namespace": "",
             "pattern": r"[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}",
-        },
+        }
     )
     url: Optional[str] = field(
         default=None,
@@ -78,7 +78,7 @@ class DocumentReference:
             "namespace": "",
             "min_length": 1,
             "white_space": "collapse",
-        },
+        }
     )
     description: Optional[str] = field(
         default=None,
@@ -88,7 +88,7 @@ class DocumentReference:
             "namespace": "",
             "min_length": 1,
             "white_space": "collapse",
-        },
+        }
     )
     guid: str = field(
         metadata={
@@ -110,7 +110,7 @@ class File:
             "namespace": "",
             "min_length": 1,
             "white_space": "collapse",
-        },
+        }
     )
     date: Optional[XmlDateTime] = field(
         default=None,
@@ -118,7 +118,7 @@ class File:
             "name": "Date",
             "type": "Element",
             "namespace": "",
-        },
+        }
     )
     reference: Optional[str] = field(
         default=None,
@@ -128,7 +128,7 @@ class File:
             "namespace": "",
             "min_length": 1,
             "white_space": "collapse",
-        },
+        }
     )
     ifc_project: Optional[str] = field(
         default=None,
@@ -137,7 +137,7 @@ class File:
             "type": "Attribute",
             "length": 22,
             "pattern": r"[0-9A-Za-z_$]*",
-        },
+        }
     )
     ifc_spatial_structure_element: Optional[str] = field(
         default=None,
@@ -146,14 +146,14 @@ class File:
             "type": "Attribute",
             "length": 22,
             "pattern": r"[0-9A-Za-z_$]*",
-        },
+        }
     )
     is_external: bool = field(
         default=True,
         metadata={
             "name": "IsExternal",
             "type": "Attribute",
-        },
+        }
     )
 
 
@@ -170,7 +170,7 @@ class TopicLabels:
             "namespace": "",
             "min_length": 1,
             "white_space": "collapse",
-        },
+        }
     )
 
 
@@ -187,7 +187,7 @@ class TopicReferenceLinks:
             "namespace": "",
             "min_length": 1,
             "white_space": "collapse",
-        },
+        }
     )
 
 
@@ -216,7 +216,7 @@ class ViewPoint:
             "namespace": "",
             "min_length": 1,
             "white_space": "collapse",
-        },
+        }
     )
     snapshot: Optional[str] = field(
         default=None,
@@ -226,7 +226,7 @@ class ViewPoint:
             "namespace": "",
             "min_length": 1,
             "white_space": "collapse",
-        },
+        }
     )
     index: Optional[int] = field(
         default=None,
@@ -234,7 +234,7 @@ class ViewPoint:
             "name": "Index",
             "type": "Element",
             "namespace": "",
-        },
+        }
     )
     guid: str = field(
         metadata={
@@ -274,7 +274,7 @@ class Comment:
             "namespace": "",
             "min_length": 1,
             "white_space": "collapse",
-        },
+        }
     )
     viewpoint: Optional[CommentViewpoint] = field(
         default=None,
@@ -282,7 +282,7 @@ class Comment:
             "name": "Viewpoint",
             "type": "Element",
             "namespace": "",
-        },
+        }
     )
     modified_date: Optional[XmlDateTime] = field(
         default=None,
@@ -290,7 +290,7 @@ class Comment:
             "name": "ModifiedDate",
             "type": "Element",
             "namespace": "",
-        },
+        }
     )
     modified_author: Optional[str] = field(
         default=None,
@@ -300,7 +300,7 @@ class Comment:
             "namespace": "",
             "min_length": 1,
             "white_space": "collapse",
-        },
+        }
     )
     guid: str = field(
         metadata={
@@ -323,7 +323,7 @@ class HeaderFiles:
             "name": "File",
             "type": "Element",
             "namespace": "",
-        },
+        }
     )
 
 
@@ -338,7 +338,7 @@ class TopicDocumentReferences:
             "name": "DocumentReference",
             "type": "Element",
             "namespace": "",
-        },
+        }
     )
 
 
@@ -353,7 +353,7 @@ class TopicRelatedTopics:
             "name": "RelatedTopic",
             "type": "Element",
             "namespace": "",
-        },
+        }
     )
 
 
@@ -368,7 +368,7 @@ class TopicViewpoints:
             "name": "ViewPoint",
             "type": "Element",
             "namespace": "",
-        },
+        }
     )
 
 
@@ -380,7 +380,7 @@ class Header:
             "name": "Files",
             "type": "Element",
             "namespace": "",
-        },
+        }
     )
 
 
@@ -395,7 +395,7 @@ class TopicComments:
             "name": "Comment",
             "type": "Element",
             "namespace": "",
-        },
+        }
     )
 
 
@@ -407,7 +407,7 @@ class Topic:
             "name": "ReferenceLinks",
             "type": "Element",
             "namespace": "",
-        },
+        }
     )
     title: str = field(
         metadata={
@@ -427,7 +427,7 @@ class Topic:
             "namespace": "",
             "min_length": 1,
             "white_space": "collapse",
-        },
+        }
     )
     index: Optional[int] = field(
         default=None,
@@ -435,7 +435,7 @@ class Topic:
             "name": "Index",
             "type": "Element",
             "namespace": "",
-        },
+        }
     )
     labels: Optional[TopicLabels] = field(
         default=None,
@@ -443,7 +443,7 @@ class Topic:
             "name": "Labels",
             "type": "Element",
             "namespace": "",
-        },
+        }
     )
     creation_date: XmlDateTime = field(
         metadata={
@@ -469,7 +469,7 @@ class Topic:
             "name": "ModifiedDate",
             "type": "Element",
             "namespace": "",
-        },
+        }
     )
     modified_author: Optional[str] = field(
         default=None,
@@ -479,7 +479,7 @@ class Topic:
             "namespace": "",
             "min_length": 1,
             "white_space": "collapse",
-        },
+        }
     )
     due_date: Optional[XmlDateTime] = field(
         default=None,
@@ -487,7 +487,7 @@ class Topic:
             "name": "DueDate",
             "type": "Element",
             "namespace": "",
-        },
+        }
     )
     assigned_to: Optional[str] = field(
         default=None,
@@ -497,7 +497,7 @@ class Topic:
             "namespace": "",
             "min_length": 1,
             "white_space": "collapse",
-        },
+        }
     )
     stage: Optional[str] = field(
         default=None,
@@ -507,7 +507,7 @@ class Topic:
             "namespace": "",
             "min_length": 1,
             "white_space": "collapse",
-        },
+        }
     )
     description: Optional[str] = field(
         default=None,
@@ -517,7 +517,7 @@ class Topic:
             "namespace": "",
             "min_length": 1,
             "white_space": "collapse",
-        },
+        }
     )
     bim_snippet: Optional[BimSnippet] = field(
         default=None,
@@ -525,7 +525,7 @@ class Topic:
             "name": "BimSnippet",
             "type": "Element",
             "namespace": "",
-        },
+        }
     )
     document_references: Optional[TopicDocumentReferences] = field(
         default=None,
@@ -533,7 +533,7 @@ class Topic:
             "name": "DocumentReferences",
             "type": "Element",
             "namespace": "",
-        },
+        }
     )
     related_topics: Optional[TopicRelatedTopics] = field(
         default=None,
@@ -541,7 +541,7 @@ class Topic:
             "name": "RelatedTopics",
             "type": "Element",
             "namespace": "",
-        },
+        }
     )
     comments: Optional[TopicComments] = field(
         default=None,
@@ -549,7 +549,7 @@ class Topic:
             "name": "Comments",
             "type": "Element",
             "namespace": "",
-        },
+        }
     )
     viewpoints: Optional[TopicViewpoints] = field(
         default=None,
@@ -557,7 +557,7 @@ class Topic:
             "name": "Viewpoints",
             "type": "Element",
             "namespace": "",
-        },
+        }
     )
     guid: str = field(
         metadata={
@@ -574,7 +574,7 @@ class Topic:
             "type": "Attribute",
             "min_length": 1,
             "white_space": "collapse",
-        },
+        }
     )
     topic_type: str = field(
         metadata={
@@ -604,7 +604,7 @@ class Markup:
             "name": "Header",
             "type": "Element",
             "namespace": "",
-        },
+        }
     )
     topic: Topic = field(
         metadata={

src/bcf/src/bcf/v3/model/project.py

@@ -12,7 +12,7 @@ class Project:
             "namespace": "",
             "min_length": 1,
             "white_space": "collapse",
-        },
+        }
     )
     project_id: str = field(
         metadata={

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

@@ -17,7 +17,7 @@ class Component:
             "type": "Element",
             "min_length": 1,
             "white_space": "collapse",
-        },
+        }
     )
     authoring_tool_id: Optional[str] = field(
         default=None,
@@ -26,7 +26,7 @@ class Component:
             "type": "Element",
             "min_length": 1,
             "white_space": "collapse",
-        },
+        }
     )
     ifc_guid: Optional[str] = field(
         default=None,
@@ -35,7 +35,7 @@ class Component:
             "type": "Attribute",
             "length": 22,
             "pattern": r"[0-9A-Za-z_$]*",
-        },
+        }
     )
 
 
@@ -96,21 +96,21 @@ class ViewSetupHints:
         metadata={
             "name": "SpacesVisible",
             "type": "Attribute",
-        },
+        }
     )
     space_boundaries_visible: bool = field(
         default=False,
         metadata={
             "name": "SpaceBoundariesVisible",
             "type": "Attribute",
-        },
+        }
     )
     openings_visible: bool = field(
         default=False,
         metadata={
             "name": "OpeningsVisible",
             "type": "Attribute",
-        },
+        }
     )
 
 
@@ -191,7 +191,7 @@ class ComponentColoringColorComponents:
             "name": "Component",
             "type": "Element",
             "min_occurs": 1,
-        },
+        }
     )
 
 
@@ -202,7 +202,7 @@ class ComponentSelection:
         metadata={
             "name": "Component",
             "type": "Element",
-        },
+        }
     )
 
 
@@ -216,7 +216,7 @@ class ComponentVisibilityExceptions:
         metadata={
             "name": "Component",
             "type": "Element",
-        },
+        }
     )
 
 
@@ -249,7 +249,6 @@ class OrthogonalCamera:
         aspect_ratio: Proportional relationship between the width and
             the height of the view (w/h).
     """
-
     camera_view_point: Point = field(
         metadata={
             "name": "CameraViewPoint",
@@ -303,7 +302,6 @@ class PerspectiveCamera:
         aspect_ratio: Proportional relationship between the width and
             the height of the view (w/h).
     """
-
     camera_view_point: Point = field(
         metadata={
             "name": "CameraViewPoint",
@@ -373,21 +371,21 @@ class ComponentVisibility:
         metadata={
             "name": "ViewSetupHints",
             "type": "Element",
-        },
+        }
     )
     exceptions: Optional[ComponentVisibilityExceptions] = field(
         default=None,
         metadata={
             "name": "Exceptions",
             "type": "Element",
-        },
+        }
     )
     default_visibility: bool = field(
         default=False,
         metadata={
             "name": "DefaultVisibility",
             "type": "Attribute",
-        },
+        }
     )
 
 
@@ -401,7 +399,7 @@ class VisualizationInfoBitmaps:
         metadata={
             "name": "Bitmap",
             "type": "Element",
-        },
+        }
     )
 
 
@@ -415,7 +413,7 @@ class VisualizationInfoClippingPlanes:
         metadata={
             "name": "ClippingPlane",
             "type": "Element",
-        },
+        }
     )
 
 
@@ -429,7 +427,7 @@ class VisualizationInfoLines:
         metadata={
             "name": "Line",
             "type": "Element",
-        },
+        }
     )
 
 
@@ -440,7 +438,7 @@ class ComponentColoring:
         metadata={
             "name": "Color",
             "type": "Element",
-        },
+        }
     )
 
 
@@ -451,21 +449,21 @@ class Components:
         metadata={
             "name": "Selection",
             "type": "Element",
-        },
+        }
     )
     visibility: Optional[ComponentVisibility] = field(
         default=None,
         metadata={
             "name": "Visibility",
             "type": "Element",
-        },
+        }
     )
     coloring: Optional[ComponentColoring] = field(
         default=None,
         metadata={
             "name": "Coloring",
             "type": "Element",
-        },
+        }
     )
 
 
@@ -474,48 +472,47 @@ class VisualizationInfo:
     """
     VisualizationInfo documentation.
     """
-
     components: Optional[Components] = field(
         default=None,
         metadata={
             "name": "Components",
             "type": "Element",
-        },
+        }
     )
     orthogonal_camera: Optional[OrthogonalCamera] = field(
         default=None,
         metadata={
             "name": "OrthogonalCamera",
             "type": "Element",
-        },
+        }
     )
     perspective_camera: Optional[PerspectiveCamera] = field(
         default=None,
         metadata={
             "name": "PerspectiveCamera",
             "type": "Element",
-        },
+        }
     )
     lines: Optional[VisualizationInfoLines] = field(
         default=None,
         metadata={
             "name": "Lines",
             "type": "Element",
-        },
+        }
     )
     clipping_planes: Optional[VisualizationInfoClippingPlanes] = field(
         default=None,
         metadata={
             "name": "ClippingPlanes",
             "type": "Element",
-        },
+        }
     )
     bitmaps: Optional[VisualizationInfoBitmaps] = field(
         default=None,
         metadata={
             "name": "Bitmaps",
             "type": "Element",
-        },
+        }
     )
     guid: str = field(
         metadata={

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

@@ -1,5 +1,4 @@
 """BCF XML V3 Topic handler."""
-
 import datetime
 import uuid
 import zipfile
@@ -26,8 +25,7 @@ class TopicHandler:
         xml_handler: Optional[AbstractXmlParserSerializer] = None,
     ) -> None:
         self._markup: Optional[mdl.Markup] = None
-        self._viewpoints: Optional[dict[str, VisualizationInfoHandler]] = None
-        self._reference_files: Optional[dict[str, bytes]] = None
+        self._viewpoints: dict[str, VisualizationInfoHandler] = {}
         self._bim_snippet: Optional[bytes] = None
         self._xml_handler = xml_handler or XmlParserSerializer()
         self._topic_dir = topic_dir
@@ -50,36 +48,22 @@ class TopicHandler:
         return self.markup.topic
 
     @property
-    def guid(self) -> str:
+    def guid(self) -> Optional[str]:
         """Return the GUID of the topic."""
         if self._markup:
             return self.topic.guid
-        return self._topic_dir.name if self._topic_dir else ""
+        return self._topic_dir.name if self._topic_dir else None
 
     @property
     def header(self) -> Optional[mdl.Header]:
         """Return the header of the topic."""
         return self.markup.header
 
-    @header.setter
-    def header(self, header: mdl.Header) -> None:
-        """Set the header of the topic."""
-        self.markup.header = header
-
     @property
     def comments(self) -> list[mdl.Comment]:
         """Return the comments of the topic."""
         return self.topic.comments.comment if self.topic.comments else []
 
-    @comments.setter
-    def comments(self, comments: list[mdl.Comment]) -> None:
-        topic_comments = self.topic.comments
-        if topic_comments is None:
-            if not comments:
-                return
-            self.topic.comments = (topic_comments := mdl.TopicComments())
-        topic_comments.comment = comments
-
     @property
     def bim_snippet(self) -> Optional[bytes]:
         if not self._bim_snippet and self._topic_dir:
@@ -92,15 +76,15 @@ class TopicHandler:
 
     @property
     def viewpoints(self) -> dict[str, "VisualizationInfoHandler"]:
-        if self._viewpoints is None:
-            self._viewpoints = self._load_viewpoints()
+        if (
+            not self._viewpoints
+            and self._topic_dir
+            and self.topic.viewpoints
+            and (viewpoints := self.topic.viewpoints.view_point)
+        ):
+            self._viewpoints = VisualizationInfoHandler.from_topic_viewpoints(self._topic_dir, viewpoints)
         return self._viewpoints
 
-    def _load_viewpoints(self) -> dict[str, "VisualizationInfoHandler"]:
-        if self._topic_dir and self.topic.viewpoints and (viewpoints := self.topic.viewpoints.view_point):
-            return VisualizationInfoHandler.from_topic_viewpoints(self._topic_dir, viewpoints)
-        return {}
-
     def _load_bim_snippet(self) -> Optional[bytes]:
         bim_snippet_obj = self.topic.bim_snippet
         if bim_snippet_obj and not bim_snippet_obj.is_external and self._topic_dir:
@@ -109,27 +93,6 @@ class TopicHandler:
                 return bim_snippet_path.read_bytes()
         return None
 
-    @property
-    def reference_files(self) -> dict[str, bytes]:
-        if self._reference_files is not None:
-            return self._reference_files
-
-        self._reference_files = {}
-        if not self.header:
-            return self._reference_files
-
-        if not self.header.files:
-            return self._reference_files
-
-        for ref in self.header.files.file:
-            if ref.is_external:
-                continue
-            real_path = self._topic_dir
-            for path_part in ref.reference.split("/"):
-                real_path = real_path.parent if path_part == ".." else real_path.joinpath(path_part)
-            self._reference_files[ref.reference] = real_path.read_bytes()
-        return self._reference_files
-
     @classmethod
     def create_new(
         cls,
@@ -181,7 +144,6 @@ class TopicHandler:
         self._save_xml(destination_zip, self._markup, "markup.bcf")
         self._save_viewpoints(destination_zip, topic_dir)
         self._save_bim_snippet(destination_zip)
-        self._save_reference_files(destination_zip)
 
     def _save_viewpoints(self, destination_zip: ZipFileInterface, topic_dir: str) -> None:
         if not self.topic.viewpoints or not (viewpoints := self.topic.viewpoints.view_point):
@@ -202,20 +164,7 @@ class TopicHandler:
         if self.bim_snippet:
             destination_zip.writestr(f"{self.topic.guid}/{ref_filename}", self.bim_snippet)
 
-    def _save_reference_files(self, destination_zip: ZipFileInterface) -> None:
-        if not self.header:
-            return
-        if not self.header.files:
-            return
-        for ref in self.header.files.file:
-            if ref.is_external or not ref.reference:
-                continue
-            real_path = self._topic_dir
-            for path_part in ref.reference.split("/"):
-                real_path = real_path.parent if path_part == ".." else real_path.joinpath(path_part)
-            destination_zip.writestr(real_path.at, self.reference_files[ref.reference])
-
-    def add_viewpoint(self, element: entity_instance) -> VisualizationInfoHandler:
+    def add_viewpoint(self, element: entity_instance) -> None:
         """
         Add a viewpoint tergeting an IFC element to the topic.
 
@@ -224,11 +173,8 @@ class TopicHandler:
         """
         new_viewpoint = VisualizationInfoHandler.create_new(element, self._xml_handler)
         self.add_visinfo_handler(new_viewpoint)
-        return new_viewpoint
 
-    def add_viewpoint_from_point_and_guids(
-        self, position: NDArray[np.float64], *guids: str
-    ) -> VisualizationInfoHandler:
+    def add_viewpoint_from_point_and_guids(self, position: NDArray[np.float_], *guids: str) -> None:
         """
         Add a viewpoint tergeting an IFC element to the topic.
 
@@ -239,21 +185,14 @@ class TopicHandler:
             position, *guids, xml_handler=self._xml_handler
         )
         self.add_visinfo_handler(vi_handler)
-        return vi_handler
 
-    def add_visinfo_handler(
-        self, new_viewpoint: VisualizationInfoHandler, snapshot_filename: Optional[str] = None
-    ) -> mdl.ViewPoint:
+    def add_visinfo_handler(self, new_viewpoint: VisualizationInfoHandler) -> None:
         self.viewpoints[new_viewpoint.guid + ".bcfv"] = new_viewpoint
         if self.topic.viewpoints is None:
             self.topic.viewpoints = mdl.TopicViewpoints()
-        viewpoint = mdl.ViewPoint(
-            viewpoint=new_viewpoint.guid + ".bcfv",
-            snapshot=snapshot_filename,
-            guid=new_viewpoint.guid,
+        self.topic.viewpoints.view_point.append(
+            mdl.ViewPoint(viewpoint=new_viewpoint.guid + ".bcfv", guid=new_viewpoint.guid)
         )
-        self.topic.viewpoints.view_point.append(viewpoint)
-        return viewpoint
 
     def __eq__(self, other: object) -> bool | NoReturn:
         return (

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

@@ -1,11 +1,11 @@
 import uuid
 import zipfile
-from typing import Any, Iterable, Optional, Literal, Union
+from functools import lru_cache
+from typing import Any, Iterable, Optional
 
 import numpy as np
 from ifcopenshell import entity_instance
-import ifcopenshell.util.unit
-import ifcopenshell.util.placement
+from ifcopenshell.util import placement
 from numpy.typing import NDArray
 
 import bcf.v3.model as mdl
@@ -133,15 +133,6 @@ class VisualizationInfoHandler:
         self._save_bitmaps(bcf_zip, topic_dir)
 
     def _save_snapshot(self, bcf_zip: ZipFileInterface, topic_dir: str, filename: Optional[str]) -> None:
-        if bool(self.snapshot) ^ bool(filename):
-            data = ["data (VisualizationInfoHandler.snapshot)", "filename (ViewPoint.snapshot)"]
-            provided_data, missing_data = data if self.snapshot else data[::-1]
-            print(
-                f"WARNING. Snapshot with viewpoint guid '{self.guid}' won't be saved to bcf. "
-                f"Only snapshot {provided_data} is provided but snapshot {missing_data} is missing."
-            )
-            return
-
         if self.snapshot and filename:
             bcf_zip.writestr(f"{topic_dir}/{filename}", self.snapshot)
 
@@ -184,7 +175,7 @@ class VisualizationInfoHandler:
     @classmethod
     def create_from_point_and_guids(
         cls,
-        position: NDArray[np.float64],
+        position: NDArray[np.float_],
         *guids: str,
         xml_handler: Optional[AbstractXmlParserSerializer] = None,
     ) -> "VisualizationInfoHandler":
@@ -204,110 +195,13 @@ class VisualizationInfoHandler:
             visualization_info=build_viewpoint_from_position_and_guids(position, *guids), xml_handler=xml_handler
         )
 
-    def get_selected_guids(self) -> Union[list[str], None]:
-        """
-        Return viewpoint selected elements IFC guids.
-
-        Returns:
-            If viewpoint has no selection settings, return `None`.
-            Otherwise return a list of selected elements IFC guids.
-        """
-        visualization_info = self.visualization_info
-        components = visualization_info.components
-        if not components:
-            return None
-
-        selection = components.selection
-        if not selection:
-            return None
-        return [guid for c in selection.component if (guid := c.ifc_guid)]
-
-    def set_selected_elements(self, elements: list[ifcopenshell.entity_instance]) -> None:
-        visualization_info = self.visualization_info
-
-        guids = [e.GlobalId for e in elements]
-        components = visualization_info.components
-        if not components:
-            visibility = mdl.ComponentVisibility(default_visibility=True)
-            components = mdl.Components(visibility=visibility)
-            visualization_info.components = components
-
-        selection = components.selection
-        components_list = [mdl.Component(ifc_guid=guid) for guid in guids]
-        if not selection:
-            selection = mdl.ComponentSelection()
-            components.selection = selection
-        selection.component = components_list
-
-    def set_visible_elements(self, elements: list[ifcopenshell.entity_instance]) -> None:
-        self.set_visibility(elements, elements_visibility="VISIBLE")
-
-    def set_hidden_elements(self, elements: list[ifcopenshell.entity_instance]) -> None:
-        self.set_visibility(elements, elements_visibility="HIDDEN")
-
-    def set_visibility(
-        self, elements: list[ifcopenshell.entity_instance], elements_visibility: Literal["VISIBLE", "HIDDEN"]
-    ) -> None:
-        visualization_info = self.visualization_info
-        default_visibility = elements_visibility == "HIDDEN"
-
-        guids = [e.GlobalId for e in elements]
-        components_list = [mdl.Component(ifc_guid=guid) for guid in guids]
-        components = visualization_info.components
-        if not components:
-            visibility = mdl.ComponentVisibility(default_visibility=default_visibility)
-            components = mdl.Components(visibility=visibility)
-            visualization_info.components = components
-
-        visibility = components.visibility
-        if not visibility:
-            visibility = mdl.ComponentVisibility(default_visibility=default_visibility)
-            components.visibility = visibility
-        elif visibility.default_visibility != default_visibility:
-            visibility.default_visibility = default_visibility
-
-        exceptions = visibility.exceptions
-        if not exceptions:
-            exceptions = mdl.ComponentVisibilityExceptions()
-            visibility.exceptions = exceptions
-        exceptions.component = components_list
-
-    def get_elements_visibility(self) -> Union[tuple[bool, list[str]], None]:
-        """
-        Return viewpoint elements visibility settings.
-
-        Returns:
-            If viewpoint has no visibility settings, return `None`.
-            Otherwise return a tuple containing the default visibility
-            and a list of IFC element GUIDs listed as exceptions.
-
-            If default visibility is `True`, all elements are visible except the exceptions.
-
-            If default visibility is `False`, all elements are hidden except the exceptions.
-        """
-
-        visualization_info = self.visualization_info
-        components = visualization_info.components
-        if not components:
-            return None
-
-        visibility = components.visibility
-        if not visibility:
-            return None
-        default_visibility = visibility.default_visibility or False
-
-        exceptions = visibility.exceptions
-        if not exceptions:
-            return default_visibility, []
-        guids = [guid for c in exceptions.component if (guid := c.ifc_guid)]
-        return default_visibility, guids
-
 
+@lru_cache(maxsize=None)
 def build_viewpoint(element: entity_instance) -> mdl.VisualizationInfo:
     """
     Return a BCF viewpoint of an IFC element.
 
-    This function is cached to speed up the creation of multiple BCF topics regarding the same element.
+    This function is cached to speedudp the creation of multiple BCF topics regarding the same element.
 
     Args:
         element: The IFC element to point at.
@@ -315,12 +209,7 @@ def build_viewpoint(element: entity_instance) -> mdl.VisualizationInfo:
     Returns:
         The BCF viewpoint definition.
     """
-    ifc_file = element.wrapped_data.file
-    unit_scale = ifcopenshell.util.unit.calculate_unit_scale(ifc_file)
-    elem_placement = ifcopenshell.util.placement.get_local_placement(element.ObjectPlacement)
-    elem_placement[0][3] *= unit_scale
-    elem_placement[1][3] *= unit_scale
-    elem_placement[2][3] *= unit_scale
+    elem_placement = placement.get_local_placement(element.ObjectPlacement)
 
     return mdl.VisualizationInfo(
         guid=str(uuid.uuid4()),
@@ -329,11 +218,11 @@ def build_viewpoint(element: entity_instance) -> mdl.VisualizationInfo:
     )
 
 
-def build_viewpoint_from_position_and_guids(position: NDArray[np.float64], *guids: str) -> mdl.VisualizationInfo:
+def build_viewpoint_from_position_and_guids(position: NDArray[np.float_], *guids: str) -> mdl.VisualizationInfo:
     """
     Return a BCF viewpoint of an IFC element.
 
-    This function is cached to speed up the creation of multiple BCF topics regarding the same element.
+    This function is cached to speedudp the creation of multiple BCF topics regarding the same element.
 
     Args:
         position: target point coordinates.
@@ -354,7 +243,7 @@ def build_components(*guids: str) -> mdl.Components:
     Return the BCF components from an IFC element GUID.
 
     Args:
-        *guids: One or more selected IFC element GUID.
+        *guids: One or more IFC element GUID.
 
     Returns:
         The BCF components definition.
@@ -366,7 +255,7 @@ def build_components(*guids: str) -> mdl.Components:
     )
 
 
-def build_camera(elem_placement: NDArray[np.float64]) -> mdl.PerspectiveCamera:
+def build_camera(elem_placement: NDArray[np.float_]) -> mdl.PerspectiveCamera:
     """
     Return a BCF camera for an IFC element placement matrix.
 
@@ -380,7 +269,7 @@ def build_camera(elem_placement: NDArray[np.float64]) -> mdl.PerspectiveCamera:
 
 
 def build_camera_from_vectors(
-    camera_position: NDArray[np.float64], camera_dir: NDArray[np.float64], camera_up: NDArray[np.float64]
+    camera_position: NDArray[np.float_], camera_dir: NDArray[np.float_], camera_up: NDArray[np.float_]
 ) -> mdl.PerspectiveCamera:
     """
     Return a BCF camera for an IFC element placement matrix.