Merge pull request #255 from 3DBAG/253-remove-ahn-200m-tiles-from-the-pipeline

Remove ahn 200m tiles from the pipeline

Author: balazsdukai

docker/pipeline/bag3d-core.dockerfile

@@ -1,4 +1,4 @@
-FROM 3dgi/3dbag-pipeline-tools:2025.08.06 AS develop
+FROM 3dgi/3dbag-pipeline-tools:2025.08.07 AS develop
 ARG VERSION=develop
 ARG BAG3D_PIPELINE_LOCATION=/opt/3dbag-pipeline
 

docker/pipeline/bag3d-floors-estimation.dockerfile

@@ -1,4 +1,4 @@
-FROM 3dgi/3dbag-pipeline-tools:2025.08.06 AS develop
+FROM 3dgi/3dbag-pipeline-tools:2025.08.07 AS develop
 ARG VERSION=develop
 ARG BAG3D_PIPELINE_LOCATION=/opt/3dbag-pipeline
 

docker/pipeline/bag3d-party-walls.dockerfile

@@ -1,4 +1,4 @@
-FROM 3dgi/3dbag-pipeline-tools:2025.08.06 AS develop
+FROM 3dgi/3dbag-pipeline-tools:2025.08.07 AS develop
 ARG VERSION=develop
 ARG BAG3D_PIPELINE_LOCATION=/opt/3dbag-pipeline
 

docker/tools/Dockerfile

@@ -109,13 +109,13 @@ FROM roofer AS geoflow-old
 ARG JOBS=2
 ARG BAG3D_PIPELINE_LOCATION=/opt/3dbag-pipeline
 
-COPY --from=3dgi/geoflow-bundle-builder:2025.07.30 /usr/local/bin/geof $BAG3D_PIPELINE_LOCATION/tools/bin/geof
-COPY --from=3dgi/geoflow-bundle-builder:2025.07.30 /export /export
-COPY --from=3dgi/geoflow-bundle-builder:2025.07.30 /usr/local/src/FileGDB/lib/. /usr/local/src/FileGDB/lib
-COPY --from=3dgi/geoflow-bundle-builder:2025.07.30 /usr/local/lib/libfgdbunixrtl.so /usr/local/lib/libfgdbunixrtl.so
-COPY --from=3dgi/geoflow-bundle-builder:2025.07.30 /usr/local/lib/LASlib /export/usr/local/lib/
-COPY --from=3dgi/geoflow-bundle-builder:2025.07.30 /usr/local/lib/gdalplugins /export/usr/local/lib/
-COPY --from=3dgi/geoflow-bundle-builder:2025.07.30 /usr/local/lib/geoflow-plugins/. $BAG3D_PIPELINE_LOCATION/tools/share/geoflow-bundle/plugins
+COPY --from=3dgi/geoflow-bundle-builder:2025.08.07 /usr/local/bin/geof $BAG3D_PIPELINE_LOCATION/tools/bin/geof
+COPY --from=3dgi/geoflow-bundle-builder:2025.08.07 /export /export
+COPY --from=3dgi/geoflow-bundle-builder:2025.08.07 /usr/local/src/FileGDB/lib/. /usr/local/src/FileGDB/lib
+COPY --from=3dgi/geoflow-bundle-builder:2025.08.07 /usr/local/lib/libfgdbunixrtl.so /usr/local/lib/libfgdbunixrtl.so
+COPY --from=3dgi/geoflow-bundle-builder:2025.08.07 /usr/local/lib/LASlib /export/usr/local/lib/
+COPY --from=3dgi/geoflow-bundle-builder:2025.08.07 /usr/local/lib/gdalplugins /export/usr/local/lib/
+COPY --from=3dgi/geoflow-bundle-builder:2025.08.07 /usr/local/lib/geoflow-plugins/. $BAG3D_PIPELINE_LOCATION/tools/share/geoflow-bundle/plugins
 ENV GF_PLUGIN_FOLDER=$BAG3D_PIPELINE_LOCATION/tools/share/geoflow-bundle/plugins
 
 RUN echo /export/usr/local/lib >> /etc/ld.so.conf.d/geoflow.conf; \

makefile

@@ -107,7 +107,7 @@ include .env
 download:
 	rm -rf $(BAG3D_TEST_DATA)
 	mkdir -p $(BAG3D_TEST_DATA)
-	cd $(BAG3D_TEST_DATA) ; curl -O https://data.3dbag.nl/testdata/pipeline/test_data_v11.zip ; unzip -q test_data_v11.zip ; rm test_data_v11.zip
+	cd $(BAG3D_TEST_DATA) ; curl -O https://data.3dbag.nl/testdata/pipeline/test_data_v12.zip ; unzip -q test_data_v12.zip ; rm test_data_v12.zip
 
 
 install_uv:

packages/common/pyproject.toml

@@ -42,7 +42,7 @@ dev = [
 # Need this block here so that ruff includes this package's files. The ruff config is in the root pyproject.toml file.
 
 [tool.uv.sources]
-pgutils = { git = "https://github.com/balazsdukai/pgutils.git", rev = "2024.1013" }
+pgutils = { git = "https://github.com/balazsdukai/pgutils.git", rev = "2025.1015" }
 bag3d-specs = { git = "https://github.com/3DBAG/3dbag-specs.git", branch = "develop" }
 
 [tool.pytest.ini_options]

packages/common/src/bag3d/common/utils/geodata.py

@@ -242,6 +242,7 @@ def pdal_info(
     """Run 'pdal info' on a point cloud file.
 
     Args:
+        verbose: Return stdout/stderr from pdal
         pdal (AppImage): The pdal AppImage executable.
         file_path: Path to the point cloud file.
         with_all: If true, run ``pdal info --all``, else run ``pdal info --metadata``.
@@ -258,8 +259,8 @@ def pdal_info(
     return_code, output = pdal.execute(
         "pdal", command=" ".join(cmd_list), local_path=file_path, silent=(not verbose)
     )
-
-    return return_code, json.loads(output)
+    output_processed = output.replace("\\u0000", "")
+    return return_code, json.loads(output_processed)
 
 
 def geojson_poly_to_wkt(geometry) -> str:

packages/common/tests/conftest.py

@@ -110,4 +110,4 @@ def test_data_dir():
 
 @pytest.fixture(scope="session")
 def laz_files_ahn3_dir(test_data_dir):
-    yield test_data_dir / "reconstruction_input/pointcloud/AHN3/tiles_200m/"
+    yield test_data_dir / "reconstruction_input/pointcloud/AHN3/as_downloaded/LAZ"

packages/common/tests/test_resources.py

@@ -41,7 +41,7 @@ def test_pdal_local(laz_files_ahn3_dir):
     """Use local PDAL installation"""
     pdal = PDALResource(exe_pdal=EnvVar("EXE_PATH_PDAL").get_value())
     assert not pdal.with_docker
-    filepath = laz_files_ahn3_dir / "t_1042098.laz"
+    filepath = laz_files_ahn3_dir / "C_32BZ2.LAZ"
     return_code, output = pdal_info(pdal.app, filepath, with_all=True)
     assert return_code == 0
 
@@ -55,7 +55,7 @@ def test_lastools(laz_files_ahn3_dir):
 
     lastools = lastools_resource.app
 
-    filepath = laz_files_ahn3_dir / "t_1042098.laz"
+    filepath = laz_files_ahn3_dir / "C_32BZ2.LAZ"
 
     cmd_list = [
         "{exe}",