Merge branch 'hotfix-0.4.3'

tudelft3d · Aug 25, 2023 · 99ace13 · 99ace13
2 parents 75bf733 + 61c8fbd
commit 99ace13
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 5 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -8,7 +8,7 @@ on:
     - cron:  '0 6 1 * *' # Run on the first day of every month at 06:00 UTC
 
 jobs:
-  build_linux:
+  build_linux_latest:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
@@ -21,6 +21,19 @@ jobs:
             mkdir build && cd build
             cmake .. && make -j4
 
+  build_linux_2004:
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@v3
+      - name: Install dependencies
+        run: |
+            sudo apt-get update
+            sudo apt-get install libcgal-dev libboost-all-dev libeigen3-dev libomp-dev libgdal-dev
+      - name: Build
+        run: |
+            mkdir build && cd build
+            cmake .. && make -j4
+
   build_macos:
     runs-on: macos-latest
     steps:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## [0.4.3] - 2023-08-25
+### Fixed
+- Issue with GDAL on Ubuntu 20.04
+
 ## [0.4.2]  - 2023-07-12
 ### Fixed
 - Problematic compilation in debug mode

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.9)
 
 project(city4cfd)
 

diff --git a/src/io.cpp b/src/io.cpp
@@ -224,7 +224,7 @@ void IO::read_polygons(std::string& file, PolyVecPtr& polygons, std::string* crs
                 for (int currentPolygon = 0;
                      currentPolygon < inputMultipolygon->getNumGeometries();
                      ++currentPolygon) {
-                    OGRPolygon *inputPolygon = inputMultipolygon->getGeometryRef(currentPolygon);
+                    OGRPolygon* inputPolygon = static_cast<OGRPolygon*>(inputMultipolygon->getGeometryRef(currentPolygon));
                     polygons.push_back(std::make_unique<Polygon_with_attr>());
 //                    polygons.back()->id = std::to_string(inputFeature->GetFID()) + "-" + std::to_string(currentPolygon);
 //                    polygons.back().semantic_class = cityjson_class;

diff --git a/src/main.cpp b/src/main.cpp
@@ -31,7 +31,7 @@
 
 #include  <boost/algorithm/string/predicate.hpp>
 
-std::string CITY4CFD_VERSION = "0.4.2";
+std::string CITY4CFD_VERSION = "0.4.3";
 
 void printWelcome() {
     auto logo{

diff --git a/tools/prepare_point_cloud/CMakeLists.txt b/tools/prepare_point_cloud/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.9)
 project(city4cfd_pcprep)
 
 set(CMAKE_CXX_FLAGS "-O3")