Merge pull request #156 from 3DBAG/install-cjio

New tools image: Install cjio

Author: GinaStavropoulou

CHANGELOG.md

@@ -4,6 +4,9 @@ For the changes in the 3DBAG data set, see the [3DBAG release notes](https://doc
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+## [2025.02.14]
+Install cjval, val3dity & cjio in tools images
+
 ## [2024.12.16]
 
 Release that produced the 3DBAG data set version 2024.12.16.

docker/tools/Dockerfile

@@ -25,7 +25,8 @@ RUN --mount=target=/var/lib/apt/lists,type=cache,sharing=locked \
     apt-get -y install libgeos-dev libgeos++-dev sqlite3 \
     libsqlite3-dev libtiff-dev libproj-dev libproj25 libpq5 libpq-dev libpqxx-dev \
     libgeotiff-dev nlohmann-json3-dev openssh-client openssl ca-certificates \
-    libxml++2.6-dev parallel
+    libxml++2.6-dev parallel libeigen3-dev libcgal-dev build-essential libboost-all-dev\
+    pipx
 
 COPY --from=ghcr.io/astral-sh/uv:0.5.27 /uv /bin/uv
 # Python 3.11 is currently required by the party_walls package
@@ -48,6 +49,7 @@ RUN bash $BAG3D_PIPELINE_LOCATION/tools-build.sh \
     --build-pdal \
     --build-val3dity \
     --build-cjval \
+    --build-cjio \
     --jobs $JOBS \
     --clean
 

tools-build.sh

@@ -22,6 +22,7 @@ build_geotiff=false
 build_pdal=false
 build_val3dity=false
 build_cjval=false
+build_cjio=false
 
 geos_version="3.12.1"
 geotiff_version="1.7.3"
@@ -57,6 +58,7 @@ usage() {
  echo " --build-pdal              Build PDAL"
  echo " --build-val3dity          Build Val3dity"
  echo " --build-cjval             Build cjval"
+ echo " --build-cjio              Build cjio"
 }
 
 has_argument() {
@@ -108,6 +110,7 @@ handle_options() {
         build_pdal=true
         build_val3dity=true
         build_cjval=true
+        build_cjio=true
         ;;
       --build-tyler)
         build_tyler=true
@@ -142,6 +145,9 @@ handle_options() {
       --build-cjval)
         build_cjval=true
         ;;
+      --build-cjio)
+        build_cjio=true
+        ;;
       *)
         echo "Invalid option: $1" >&2
         usage
@@ -344,8 +350,6 @@ fi
 if [ "$build_val3dity" = true ] ; then
   printf "\n\nInstalling Val3dity...\n\n"
   cd $root_dir || exit
-  apt update -y
-  apt install libeigen3-dev libgeos++-dev  libcgal-dev  build-essential libboost-all-dev -y
   wget --no-verbose https://github.com/tudelft3d/val3dity/archive/refs/tags/${val3dity_version}.zip -O ${val3dity_version}.zip
   unzip -q ${val3dity_version}.zip
   mkdir val3dity-${val3dity_version}/build
@@ -368,6 +372,12 @@ if [ "$build_cjval" = true ] ; then
     --features build-binary
 fi
 
+if [ "$build_cjio" = true ] ; then
+  printf "\n\nInstalling cjio...\n\n"
+  pipx install cjio
+  pipx ensurepath
+fi
+
 if [ "$clean_up" = true ] ; then
   cd $root_dir || exit
   printf "\n\nDeleting build artifacts...\n\n"

tools-test.sh

@@ -77,6 +77,16 @@ check_exe_lastools() {
   fi
 }
 
+check_exe_cjio() {
+  /root/.local/bin/$1 --version &> /dev/null
+  if [ $? -eq 0 ] ; then
+    printf "[${GREEN}OK${NC}].....$1\n"
+  else
+    printf "[${RED}FAIL${NC}]...$1\n"
+    all_ok=1
+  fi
+}
+
 check_exe_help() {
   bin/$1 --help &> /dev/null
   if [ $? -eq 0 ] ; then
@@ -96,8 +106,9 @@ check_exe "ogrinfo"
 check_exe "pdal"
 check_exe "val3dity"
 check_exe "cjval"
+check_exe_cjio "cjio"
 check_exe_help "sozip"
 check_exe_lastools "las2las64"
 check_exe_lastools "lasindex64"
 
-exit $all_ok
+exit #$all_ok