Merge branch 'develop' into deploy-to-docker

# Conflicts:
#	packages/core/tests/test_integration.py

Author: balazsdukai

docker/tools/Dockerfile

@@ -98,9 +98,9 @@ FROM tyler AS roofer
 ARG JOBS=2
 ARG BAG3D_PIPELINE_LOCATION=/opt/3dbag-pipeline
 
-COPY --from=3dgi/roofer:v1.0.0-beta.2 /opt/roofer/bin/. $BAG3D_PIPELINE_LOCATION/tools/bin/
-COPY --from=3dgi/roofer:v1.0.0-beta.2 /opt/roofer/share/proj $BAG3D_PIPELINE_LOCATION/tools/share/proj
-COPY --from=3dgi/roofer:v1.0.0-beta.2 /opt/roofer/share/gdal $BAG3D_PIPELINE_LOCATION/tools/share/gdal
+COPY --from=3dgi/roofer:develop /opt/roofer/bin/. $BAG3D_PIPELINE_LOCATION/tools/bin/
+COPY --from=3dgi/roofer:develop /opt/roofer/share/proj $BAG3D_PIPELINE_LOCATION/tools/share/proj
+COPY --from=3dgi/roofer:develop /opt/roofer/share/gdal $BAG3D_PIPELINE_LOCATION/tools/share/gdal
 ENV GDAL_DATA=$BAG3D_PIPELINE_LOCATION/tools/share/gdal
 ENV PROJ_DATA=$BAG3D_PIPELINE_LOCATION/tools/share/proj
 

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}",

packages/common/uv.lock

@@ -41,7 +41,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-common = { path = "../common", editable = true }
 
 [tool.pytest.ini_options]

packages/core/pyproject.toml

@@ -1,6 +1,5 @@
 from pathlib import Path
-from typing import Tuple, Dict, Optional
-from math import ceil
+from typing import Dict, Optional
 
 import requests
 from dagster import StaticPartitionsDefinition, get_dagster_logger
@@ -120,41 +119,3 @@ def download_ahn_index(
                 features[f["properties"]["AHN"].lower()] = None
 
     return features
-
-
-def tile_index_origin() -> Tuple[float, float, float, float]:  # pragma: no cover
-    """Computes the BBOX of the AHN tile index."""
-    tindex = download_ahn_index(True)
-    minx, miny = tindex["01cz1"]["geometry"]["coordinates"][0][0]
-    maxx, maxy = minx, miny
-    for feature in tindex.values():
-        exterior = feature["geometry"]["coordinates"][0]
-        for x, y in exterior:
-            minx = x if x < minx else minx
-            miny = y if y < miny else miny
-            maxx = x if x > maxx else maxx
-            maxy = y if y > maxy else maxy
-    return minx, miny, maxx, maxy
-
-
-def generate_grid(bbox: Tuple[float, float, float, float], cellsize: int):
-    """Generates a grid of fixed cell-size for a BBOX.
-    The origin of the grid is the BBOX min coordinates.
-
-    Args:
-        bbox: (minx, miny, maxx, maxy)
-        cellsize: Cell size.
-
-    Returns:
-        The bbox of the generated grid, nr. of cells in X-direction,
-        nr. of cells in Y-direction.
-    """
-    origin = bbox[:2]
-    nr_cells_x = ceil((bbox[2] - bbox[0]) / cellsize)
-    nr_cells_y = ceil((bbox[3] - bbox[1]) / cellsize)
-    bbox_new = (
-        *origin,
-        origin[0] + nr_cells_x * cellsize,
-        origin[1] + nr_cells_y * cellsize,
-    )
-    return bbox_new, nr_cells_x, nr_cells_y