Merge branch 'develop' into main

tudelft3d · Jan 3, 2025 · 967ae62 · 967ae62
2 parents 2d0dbc9 + afdf116
commit 967ae62
Show file tree

Hide file tree

Showing 55 changed files with 131 additions and 101 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -16,33 +16,33 @@ jobs:
         run: |
             sudo apt-get update
             sudo apt-get install libgmp-dev libmpfr-dev libboost-all-dev libeigen3-dev libomp-dev libgdal-dev
-      - name: Download CGAL
+      - name: Download CGAL 6.0
         run: |
-            wget https://github.com/CGAL/cgal/releases/download/v5.6.1/CGAL-5.6.1-library.tar.xz -P ${{ github.workspace }}
+            wget https://github.com/CGAL/cgal/releases/download/v6.0/CGAL-6.0-library.tar.xz -P ${{ github.workspace }}
             cd ${{ github.workspace }}
-            tar -xvf CGAL-5.6.1-library.tar.xz
+            tar -xvf CGAL-6.0-library.tar.xz
       - name: Build
         run: |
             mkdir build && cd build
-            cmake .. -DCGAL_DIR=${{ github.workspace }}/CGAL-5.6.1 && make -j4
+            cmake .. -DCGAL_DIR=${{ github.workspace }}/CGAL-6.0 && make -j4
 
-  build_linux_2004:
-    runs-on: ubuntu-20.04
+  build_linux_2204:
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3
       - name: Install dependencies
         run: |
             sudo apt-get update
             sudo apt-get install libgmp-dev libmpfr-dev libboost-all-dev libeigen3-dev libomp-dev libgdal-dev
-      - name: Download CGAL
+      - name: Download CGAL 6.0
         run: |
-            wget https://github.com/CGAL/cgal/releases/download/v5.6.1/CGAL-5.6.1-library.tar.xz -P ${{ github.workspace }}
+            wget https://github.com/CGAL/cgal/releases/download/v6.0/CGAL-6.0-library.tar.xz -P ${{ github.workspace }}
             cd ${{ github.workspace }}
-            tar -xvf CGAL-5.6.1-library.tar.xz
+            tar -xvf CGAL-6.0-library.tar.xz
       - name: Build
         run: |
             mkdir build && cd build
-            cmake .. -DCGAL_DIR=${{ github.workspace }}/CGAL-5.6.1 && make -j4
+            cmake .. -DCGAL_DIR=${{ github.workspace }}/CGAL-6.0 && make -j4
 
   build_macos:
     runs-on: macos-latest

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## [0.6.0] - 2025-01-03
+### Changed
+- Updated to CGAL 6
+
 ## [0.5.0] - 2024-07-29 - breaking changes
 ### Added
 - LoD2.2 and LoD1.3 reconstruction

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -11,6 +11,10 @@ set(CMAKE_BUILD_TYPE "Release")
 #    cmake_policy(SET CMP0003 NEW)
 #endif()
 
+if(POLICY CMP0167)
+    cmake_policy(SET CMP0167 NEW)
+endif()
+
 if (MSVC)
     add_definitions(-DNOMINMAX)
     add_definitions("/EHsc")

diff --git a/README.md b/README.md
@@ -15,7 +15,7 @@ It enables us to reconstruct buildings from different sources and their combinat
   - Extrusion of footprints containing height or floor number attributes,
   - The import of existing building models.
 
-The reconstruction using the combination of point clouds and 2D polygons can be done in [LoD2.2, LoD1.3, and LoD1.2](https://3d.bk.tudelft.nl/lod/). You can use the [complexity factor](https://github.com/tudelft3d/City4CFD/wiki/Features#buildings) to tune the overall complexity of the reconstructed geometry.
+The reconstruction using the combination of point clouds and 2D polygons can be done in [LoD2.2, LoD1.3, and LoD1.2](https://3d.bk.tudelft.nl/lod/). You can use the [complexity factor](https://github.com/tudelft3d/City4CFD/wiki/Features#buildings) to tune the overall complexity of the reconstructed geometry. The LoD2.2 and LoD1.3 reconstructions are based on [roofer](https://github.com/3DBAG/roofer).
 
 The resulting geometry is watertight -- buildings and surfaces are seamlessly integrated into a terrain.
 
@@ -39,7 +39,7 @@ You can directly compile City4CFD on your system using cmake, run it through a D
 
 ### Build from source
 The following libraries are required to build the project:
-- [CGAL](https://www.cgal.org/) 5.5.x or 5.6.x
+- [CGAL](https://www.cgal.org/) >= 6.0.1
 - Boost >= 1.66
 - Eigen >= 3.3.4
 - GMP >= 4.2

diff --git a/docker/city4cfd-build-base.dockerfile b/docker/city4cfd-build-base.dockerfile
@@ -7,11 +7,26 @@ LABEL org.opencontainers.image.description="Base image for building City4CFD"
 LABEL org.opencontainers.image.licenses="AGPL-3.0"
 LABEL org.opencontainers.image.url="https://github.com/tudelft3d/city4cfd"
 
+# Install required packages and clean up
 RUN apt-get update && apt-get install -y --no-install-recommends \
     build-essential    \
     cmake              \
     libboost-all-dev   \
-    libcgal-dev        \
+    libgmp-dev         \
+    libmpfr-dev        \
     libeigen3-dev      \
     libomp-dev         \
-    libgdal-dev
+    libgdal-dev        \
+    wget               \
+    ca-certificates    \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/* \
+    && rm -rf /tmp/*
+
+# Download and extract CGAL
+RUN wget https://github.com/CGAL/cgal/releases/download/v6.0/CGAL-6.0-library.tar.xz \
+    && tar -xf CGAL-6.0-library.tar.xz -C /opt \
+    && rm CGAL-6.0-library.tar.xz
+
+# Set environment variable for CGAL
+ENV CGAL_DIR=/opt/CGAL-6.0
diff --git a/src/Boundary.cpp b/src/Boundary.cpp
@@ -1,7 +1,7 @@
 /*
   City4CFD
  
-  Copyright (c) 2021-2024, 3D Geoinformation Research Group, TU Delft
+  Copyright (c) 2021-2025, 3D Geoinformation Research Group, TU Delft
 
   This file is part of City4CFD.
 

diff --git a/src/Boundary.h b/src/Boundary.h
@@ -1,7 +1,7 @@
 /*
   City4CFD
  
-  Copyright (c) 2021-2022, 3D Geoinformation Research Group, TU Delft  
+  Copyright (c) 2021-2025, 3D Geoinformation Research Group, TU Delft
 
   This file is part of City4CFD.
 

diff --git a/src/BoundingRegion.cpp b/src/BoundingRegion.cpp
@@ -1,7 +1,7 @@
 /*
   City4CFD
  
-  Copyright (c) 2021-2024, 3D Geoinformation Research Group, TU Delft
+  Copyright (c) 2021-2025, 3D Geoinformation Research Group, TU Delft
 
   This file is part of City4CFD.
 

diff --git a/src/BoundingRegion.h b/src/BoundingRegion.h
@@ -1,7 +1,7 @@
 /*
   City4CFD
  
-  Copyright (c) 2021-2024, 3D Geoinformation Research Group, TU Delft
+  Copyright (c) 2021-2025, 3D Geoinformation Research Group, TU Delft
 
   This file is part of City4CFD.
 

diff --git a/src/Building.cpp b/src/Building.cpp
@@ -1,7 +1,7 @@
 /*
   City4CFD
  
-  Copyright (c) 2021-2024, 3D Geoinformation Research Group, TU Delft
+  Copyright (c) 2021-2025, 3D Geoinformation Research Group, TU Delft
 
   This file is part of City4CFD.
 
@@ -296,10 +296,10 @@ void Building::get_cityjson_info(nlohmann::json& b) const {
 
 void Building::get_cityjson_semantics(nlohmann::json& g) const { // Temp for checking CGAL mesh properties
     Face_property semantics;
-    bool foundProperty;
-    boost::tie(semantics, foundProperty) = m_mesh.property_map<face_descriptor, std::string>("f:semantics");
-    //   auto semantics = m_mesh.property_map<face_descriptor, std::string>("f:semantics");
-    if (!foundProperty) throw city4cfd_error("Semantic property map not found!");
+    auto semanticsMap = m_mesh.property_map<face_descriptor, std::string>("f:semantics");
+    if (semanticsMap.has_value()) {
+        semantics = semanticsMap.value();
+    } else throw city4cfd_error("Semantic property map not found!");
 
     std::unordered_map<std::string, int> surfaceId;
     surfaceId["RoofSurface"]   = 0; g["semantics"]["surfaces"][0]["type"] = "RoofSurface";

diff --git a/src/Building.h b/src/Building.h
@@ -1,7 +1,7 @@
 /*
   City4CFD
  
-  Copyright (c) 2021-2024, 3D Geoinformation Research Group, TU Delft
+  Copyright (c) 2021-2025, 3D Geoinformation Research Group, TU Delft
 
   This file is part of City4CFD.
 

diff --git a/src/CGALTypes.h b/src/CGALTypes.h
@@ -1,7 +1,7 @@
 /*
   City4CFD
  
-  Copyright (c) 2021-2024, 3D Geoinformation Research Group, TU Delft
+  Copyright (c) 2021-2025, 3D Geoinformation Research Group, TU Delft
 
   This file is part of City4CFD.
 

diff --git a/src/Config.cpp b/src/Config.cpp
@@ -1,7 +1,7 @@
 /*
   City4CFD
  
-  Copyright (c) 2021-2024, 3D Geoinformation Research Group, TU Delft
+  Copyright (c) 2021-2025, 3D Geoinformation Research Group, TU Delft
 
   This file is part of City4CFD.
 
@@ -141,7 +141,7 @@ void Config::set_config(nlohmann::json& j) {
     //- Domain boundaries
     Config::get().set_region(domainBndConfig, "domain_bnd", j);
     // Define domain type if using BPG
-    if (domainBndConfig.type() == typeid(bool)) {
+    if (std::holds_alternative<bool>(domainBndConfig)) {
         if (j.contains("flow_direction"))
             flowDirection = Vector_2(j["flow_direction"][0], j["flow_direction"][1]);
 
@@ -165,13 +165,13 @@ void Config::set_config(nlohmann::json& j) {
     }
 
     // Set domain side and top
-    if (domainBndConfig.type() == typeid(Polygon_2)) {
-        Polygon_2 poly = boost::get<Polygon_2>(domainBndConfig);
+    if (std::holds_alternative<Polygon_2>(domainBndConfig)) {
+        Polygon_2 poly = std::get<Polygon_2>(domainBndConfig);
         numSides = poly.size();
         for (int i = 0; i < poly.size(); ++i) {
             outputSurfaces.emplace_back("Side_" + std::to_string(i % poly.size()));
         }
-    } else if (domainBndConfig.type() == typeid(double) || bpgDomainType != RECTANGLE) {
+    } else if (std::holds_alternative<double>(domainBndConfig) || bpgDomainType != RECTANGLE) {
         outputSurfaces.emplace_back("Sides");
     } else if (bpgDomainType == RECTANGLE) { // Expand output surfaces with front and back
         numSides = 4;
@@ -327,7 +327,7 @@ void Config::set_config(nlohmann::json& j) {
 }
 
 //-- influRegion and domainBndConfig flow control
-void Config::set_region(boost::variant<bool, double, Polygon_2>& regionType,
+void Config::set_region(std::variant<bool, double, Polygon_2>& regionType,
                         const std::string regionName,
                         nlohmann::json& j) {
     if (j[regionName].is_string()) { // Search for GeoJSON polygon

diff --git a/src/Config.h b/src/Config.h
@@ -1,7 +1,7 @@
 /*
   City4CFD
  
-  Copyright (c) 2021-2024, 3D Geoinformation Research Group, TU Delft
+  Copyright (c) 2021-2025, 3D Geoinformation Research Group, TU Delft
 
   This file is part of City4CFD.
 
@@ -50,7 +50,7 @@ class Config {
 public:
     void validate(nlohmann::json& j);
     void set_config(nlohmann::json& j);
-    void set_region(boost::variant<bool, double, Polygon_2>& regionType,
+    void set_region(std::variant<bool, double, Polygon_2>& regionType,
                     const std::string regionName,
                     nlohmann::json& j);
     static void write_to_log(const std::string& msg);
@@ -65,7 +65,7 @@ class Config {
     //-- Domain setup
     Point_2     pointOfInterest;
     double      topHeight                       = 0.;
-    boost::variant<bool, double, Polygon_2> domainBndConfig;
+    std::variant<bool, double, Polygon_2> domainBndConfig;
     DomainType            bpgDomainType;
     bool                  bpgBlockageRatioFlag  = false;
     double                bpgBlockageRatio      = 0.03;
@@ -134,7 +134,7 @@ class Config {
 
     //-- Struct for reconstruction regions (part of Buildings)
     struct ReconRegion{
-        boost::variant<bool, double, Polygon_2> influRegionConfig;
+        std::variant<bool, double, Polygon_2> influRegionConfig;
         std::string lod;
         double      bpgInfluExtra                   = 0.;
         bool        importAdvantage                 = true;

diff --git a/src/ImportedBuilding.cpp b/src/ImportedBuilding.cpp
@@ -1,7 +1,7 @@
 /*
   City4CFD
  
-  Copyright (c) 2021-2024, 3D Geoinformation Research Group, TU Delft
+  Copyright (c) 2021-2025, 3D Geoinformation Research Group, TU Delft
 
   This file is part of City4CFD.
 

diff --git a/src/ImportedBuilding.h b/src/ImportedBuilding.h
@@ -1,7 +1,7 @@
 /*
   City4CFD
  
-  Copyright (c) 2021-2024, 3D Geoinformation Research Group, TU Delft
+  Copyright (c) 2021-2025, 3D Geoinformation Research Group, TU Delft
 
   This file is part of City4CFD.
 

diff --git a/src/LoD12.cpp b/src/LoD12.cpp
@@ -1,7 +1,7 @@
 /*
   City4CFD
  
-  Copyright (c) 2021-2024, 3D Geoinformation Research Group, TU Delft
+  Copyright (c) 2021-2025, 3D Geoinformation Research Group, TU Delft
 
   This file is part of City4CFD.
 

diff --git a/src/LoD12.h b/src/LoD12.h
@@ -1,7 +1,7 @@
 /*
   City4CFD
  
-  Copyright (c) 2021-2024, 3D Geoinformation Research Group, TU Delft
+  Copyright (c) 2021-2025, 3D Geoinformation Research Group, TU Delft
 
   This file is part of City4CFD.
 

diff --git a/src/LoD22.cpp b/src/LoD22.cpp
@@ -1,7 +1,7 @@
 /*
   City4CFD
 
-  Copyright (c) 2021-2024, 3D Geoinformation Research Group, TU Delft
+  Copyright (c) 2021-2025, 3D Geoinformation Research Group, TU Delft
 
   This file is part of City4CFD.
 

diff --git a/src/LoD22.h b/src/LoD22.h
@@ -1,7 +1,7 @@
 /*
   City4CFD
 
-  Copyright (c) 2021-2024, 3D Geoinformation Research Group, TU Delft
+  Copyright (c) 2021-2025, 3D Geoinformation Research Group, TU Delft
 
   This file is part of City4CFD.
 

diff --git a/src/Map3d.cpp b/src/Map3d.cpp
@@ -1,7 +1,7 @@
 /*
   City4CFD
  
-  Copyright (c) 2021-2024, 3D Geoinformation Research Group, TU Delft
+  Copyright (c) 2021-2025, 3D Geoinformation Research Group, TU Delft
 
   This file is part of City4CFD.
 
@@ -198,7 +198,7 @@ void Map3d::set_features() {
     for (auto& reconRegion : Config::get().reconRegions) {
         m_reconRegions.emplace_back(reconRegion);
     }
-    if (Config::get().domainBndConfig.type() == typeid(bool)) m_bndBPG = true;
+    if (std::holds_alternative<bool>(Config::get().domainBndConfig)) m_bndBPG = true;
 
     //-- Apply area filtering
     if (Config::get().minArea > 0.) {
@@ -256,15 +256,15 @@ void Map3d::set_influ_region() {
     //-- Set the reconstruction (influence) regions --//
     double maxDim = -1.; // this works if there's one point of interest
     for (int i = 0; i < m_reconRegions.size(); ++i) {
-        if (m_reconRegions[i].m_reconSettings->influRegionConfig.type() == typeid(bool)) {// bool defines BPG request
+        if (std::holds_alternative<bool>(m_reconRegions[i].m_reconSettings->influRegionConfig)) {// bool defines BPG request
             std::cout << "INFO: Reconstruction region "<< i << " not defined in config. "
                       << "Calculating with BPG." << std::endl;
             if (maxDim < 0.)
                 maxDim = m_reconRegions[i].calc_influ_region_bpg(m_dt, m_buildingsPtr);
             else
                 m_reconRegions[i].calc_influ_region_bpg(maxDim);
         } else
-            boost::apply_visitor(m_reconRegions[i], Config::get().reconRegions[i]->influRegionConfig);
+            std::visit(m_reconRegions[i], Config::get().reconRegions[i]->influRegionConfig);
     }
     // Check if regions get larger with increasing index
     for (int i = 0; i < m_reconRegions.size(); ++i) {
@@ -303,7 +303,7 @@ void Map3d::set_bnd() {
         m_domainBnd.calc_bnd_bpg(m_reconRegions.back().get_bounding_region(), m_buildingsPtr);
     } else {
         //-- Define boundary region with values set in config
-        boost::apply_visitor(m_domainBnd, Config::get().domainBndConfig);
+        std::visit(m_domainBnd, Config::get().domainBndConfig);
     }
     this->bnd_sanity_check(); // Check if outer bnd is larger than the influ region
 

diff --git a/src/Map3d.h b/src/Map3d.h
@@ -1,7 +1,7 @@
 /*
   City4CFD
  
-  Copyright (c) 2021-2024, 3D Geoinformation Research Group, TU Delft
+  Copyright (c) 2021-2025, 3D Geoinformation Research Group, TU Delft
 
   This file is part of City4CFD.