ign-pdal-tools 1.7.10__tar.gz → 1.7.11__tar.gz

{ign_pdal_tools-1.7.10 → ign_pdal_tools-1.7.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ign-pdal-tools
-Version: 1.7.10
+Version: 1.7.11
 Summary: Library for common LAS files manipulation with PDAL
 Author-email: Guillaume Liegard <guillaume.liegard@ign.fr>
 Description-Content-Type: text/markdown

{ign_pdal_tools-1.7.10 → ign_pdal_tools-1.7.11}/ign_pdal_tools.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ign-pdal-tools
-Version: 1.7.10
+Version: 1.7.11
 Summary: Library for common LAS files manipulation with PDAL
 Author-email: Guillaume Liegard <guillaume.liegard@ign.fr>
 Description-Content-Type: text/markdown

{ign_pdal_tools-1.7.10 → ign_pdal_tools-1.7.11}/pdaltools/_version.py

@@ -1,4 +1,4 @@
-__version__ = "1.7.10"
+__version__ = "1.7.11"
 
 
 if __name__ == "__main__":

{ign_pdal_tools-1.7.10 → ign_pdal_tools-1.7.11}/pdaltools/add_points_in_pointcloud.py

@@ -1,5 +1,5 @@
 import argparse
-import shutil
+from shutil import copy2
 
 import geopandas as gpd
 import laspy
@@ -127,25 +127,22 @@ def add_points_to_las(
         crs (str): CRS of the data.
         virtual_points_classes (int): The classification value to assign to those virtual points (default: 66).
     """
-
     if input_points_with_z.empty:
         print(
             "No points to add. All points of the geojson file are outside the tile. Copying the input file to output"
         )
-        shutil.copy(input_las, output_las)
-
         return
 
     # Extract XYZ coordinates and additional attribute (classification)
+    nb_points = len(input_points_with_z.geometry.x)
     x_coords = input_points_with_z.geometry.x
     y_coords = input_points_with_z.geometry.y
     z_coords = input_points_with_z.geometry.z
-    classes = virtual_points_classes * np.ones(len(input_points_with_z.index))
+    classes = virtual_points_classes * np.ones(nb_points)
 
-    with laspy.open(input_las, mode="r") as las:
-        las_data = las.read()
+    # Open the input LAS file to check and possibly update the header of the output
+    with laspy.open(input_las) as las:
         header = las.header
-
         if not header:
             header = laspy.LasHeader(point_format=8, version="1.4")
         if crs:
@@ -155,20 +152,21 @@ def add_points_to_las(
                 raise ValueError(f"Invalid CRS: {crs}")
             header.add_crs(crs_obj)
 
-        # Append new points
-        new_x = np.concatenate([las_data.x, x_coords])
-        new_y = np.concatenate([las_data.y, y_coords])
-        new_z = np.concatenate([las_data.z, z_coords])
-        new_classes = np.concatenate([las_data.classification, classes])
-
-        updated_las = laspy.LasData(header)
-        updated_las.x = new_x
-        updated_las.y = new_y
-        updated_las.z = new_z
-        updated_las.classification = new_classes
-
-        with laspy.open(output_las, mode="w", header=header, do_compress=True) as writer:
-            writer.write_points(updated_las.points)
+    # Copy data pointcloud
+    copy2(input_las, output_las)
+
+    # Add the new points with 3D points
+    nb_points = len(x_coords)
+    with laspy.open(output_las, mode="a", header=header) as output_las:  # mode `a` for adding points
+        # create nb_points points with "0" everywhere
+        new_points = laspy.ScaleAwarePointRecord.zeros(nb_points, header=header)  # use header for input_las
+        # then fill in the gaps (X, Y, Z an classification)
+        new_points.x = x_coords.astype(new_points.x.dtype)
+        new_points.y = y_coords.astype(new_points.y.dtype)
+        new_points.z = z_coords.astype(new_points.z.dtype)
+        new_points.classification = classes.astype(new_points.classification.dtype)
+
+        output_las.append_points(new_points)
 
 
 def line_to_multipoint(line, spacing: float, z_value: float = None):

{ign_pdal_tools-1.7.10 → ign_pdal_tools-1.7.11}/test/test_add_points_in_pointcloud.py

@@ -3,6 +3,8 @@ import os
 from pathlib import Path
 
 import geopandas as gpd
+import laspy
+import numpy as np
 import pytest
 from shapely.geometry import LineString, MultiPoint, Point
 
@@ -98,6 +100,40 @@ def test_add_points_to_las(input_file, epsg, expected_nb_points):
     point_count = compute_count_one_file(OUTPUT_FILE)["68"]
     assert point_count == expected_nb_points  # Add all points from geojson
 
+    # Read original and updated point clouds
+    original_las = laspy.read(input_file)
+    updated_las = laspy.read(OUTPUT_FILE)
+
+    original_count = len(original_las.points)
+    added_count = len(points)
+
+    # Check total point count
+    assert len(updated_las.points) == original_count + added_count
+
+    default_zero_fields = [
+        "gps_time",
+        "intensity",
+        "return_number",
+        "number_of_returns",
+        "scan_direction_flag",
+        "edge_of_flight_line",
+        "R",
+        "G",
+        "B",
+    ]
+    # Ensure original points retain their values (gps_tme, intensity, etc)
+    for field in default_zero_fields:
+        if hasattr(updated_las, field):
+            values = getattr(updated_las, field)
+            original_values = getattr(original_las, field)
+            assert np.all(values[:original_count] == original_values[:original_count])
+
+    # Ensure added points have zero values for gps_time, intensity, etc
+    for field in default_zero_fields:
+        if hasattr(updated_las, field):
+            values = getattr(updated_las, field)
+            assert np.all(values[original_count:] == 0)
+
 
 @pytest.mark.parametrize(
     "line, spacing, z_value, expected_points",