ign-pdal-tools 1.8.1__py3-none-any.whl → 1.11.1__py3-none-any.whl

{ign_pdal_tools-1.8.1.dist-info → ign_pdal_tools-1.11.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ign-pdal-tools
-Version: 1.8.1
+Version: 1.11.1
 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.11.1.dist-info/RECORD

@@ -0,0 +1,18 @@
+ign_pdal_tools-1.11.1.dist-info/licenses/LICENSE.md,sha256=iVzCFZTUXeiqP8bP474iuWZiWO_kDCD4SPh1Wiw125Y,1120
+pdaltools/_version.py,sha256=ePCDD63wucRpBvp1zzN9uerMLecQK4e65Z3lJKH3_4M,75
+pdaltools/add_points_in_pointcloud.py,sha256=13xl8tnoaW6FsRHBPa77-c6Olw8uUw2KBUGoz8JcbBg,12675
+pdaltools/color.py,sha256=vJgpb8dOvT5rnq5NdVOaMdGc_pKL3damLy4HwGvigJQ,14472
+pdaltools/las_add_buffer.py,sha256=rnFExAfi0KqlQpL4hDMh2aC08AcYdSHSB6WPG5RyFIc,11274
+pdaltools/las_clip.py,sha256=GvEOYu8RXV68e35kU8i42GwSkbo4P9TvmS6rkrdPmFM,1034
+pdaltools/las_info.py,sha256=lMKxKzsViptDENI1wOlANG4qOvdc19ixyasYKD-N1ck,9512
+pdaltools/las_merge.py,sha256=tcFVueV9X9nNEaoAl5zCduY5DETlBg63MAgP2SuKiNo,4121
+pdaltools/las_remove_dimensions.py,sha256=f8imGhN6LNTuQ1GMJQRzIIV3Wab_oRPOyEnKi1CgfiM,2318
+pdaltools/las_rename_dimension.py,sha256=zXEKHyx1uQ3U0oZYo_BTnqbTHGSq5TIZHqZn_EPqNKQ,2576
+pdaltools/pcd_info.py,sha256=NIAH5KGikVDQLlbCcw9FuaPqe20UZvRfkHsDZd5kmZA,3210
+pdaltools/replace_attribute_in_las.py,sha256=po1F-fi8s7iilqKWaryW4JRbsmdMOUe0yGvG3AEKxtk,4771
+pdaltools/standardize_format.py,sha256=Z09yhY_dRaX0uNO0K_Ml5ZD3XpVDv4Q2gIyZHXaplAQ,4849
+pdaltools/unlock_file.py,sha256=G2odk0cpp_X9r49Y90oK88v3qlihaMfg6acwmWqblik,1958
+ign_pdal_tools-1.11.1.dist-info/METADATA,sha256=JnMi78wrNuEEwzqfP9ql8AcyBVRZJmazi-fmHUHuKeA,5778
+ign_pdal_tools-1.11.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ign_pdal_tools-1.11.1.dist-info/top_level.txt,sha256=KvGW0ZzqQbhCKzB5_Tp_buWMZyIgiO2M2krWF_ecOZc,10
+ign_pdal_tools-1.11.1.dist-info/RECORD,,

{ign_pdal_tools-1.8.1.dist-info → ign_pdal_tools-1.11.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (79.0.1)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

pdaltools/_version.py

@@ -1,4 +1,4 @@
-__version__ = "1.8.1"
+__version__ = "1.11.1"
 
 
 if __name__ == "__main__":

pdaltools/add_points_in_pointcloud.py

@@ -1,5 +1,6 @@
 import argparse
 from shutil import copy2
+import tempfile
 
 import geopandas as gpd
 import laspy
@@ -10,6 +11,8 @@ from shapely.geometry import MultiPoint, Point, box
 
 from pdaltools.las_info import get_epsg_from_las, get_tile_bbox
 
+import pdal
+
 
 def parse_args(argv=None):
     parser = argparse.ArgumentParser("Add points from GeoJSON in LIDAR tile")
@@ -127,13 +130,12 @@ 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).
     """
-    # Copy data pointcloud
-    copy2(input_las, output_las)
 
     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"
         )
+        copy2(input_las, output_las)
         return
 
     # Extract XYZ coordinates and additional attribute (classification)
@@ -148,24 +150,30 @@ def add_points_to_las(
         header = las.header
         if not header:
             header = laspy.LasHeader(point_format=8, version="1.4")
+
+    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)
+
+    with tempfile.NamedTemporaryFile(suffix="_new_points.las") as tmp:
+        with laspy.open(tmp.name, mode="w", header=header) as las_file:
+            las_file.write_points(new_points)
+
         if crs:
-            try:
-                crs_obj = CRS.from_user_input(crs)  # Convert to a pyproj.CRS object
-            except CRSError:
-                raise ValueError(f"Invalid CRS: {crs}")
-            header.add_crs(crs_obj)
-
-    # Add the new points with 3D points
-    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)
+            a_srs = crs
+        else:
+            a_srs = get_epsg_from_las(input_las)
+
+        # Use pdal to merge the new points with the existing points
+        pipeline = pdal.Pipeline()
+        pipeline |= pdal.Reader.las(filename=input_las)
+        pipeline |= pdal.Reader.las(filename=tmp.name)
+        pipeline |= pdal.Filter.merge()
+        pipeline |= pdal.Writer.las(filename=output_las, forward="all", a_srs=a_srs)
+        pipeline.execute()
 
 
 def line_to_multipoint(line, spacing: float, z_value: float = None):

pdaltools/las_add_buffer.py

@@ -158,7 +158,6 @@ def remove_points_from_buffer(input_file: str, output_file: str):
         pipeline |= pdal.Filter.range(limits=f"{ORIGINAL_TILE_TAG}[1:1]")
         pipeline |= pdal.Writer.las(filename=tmp_las.name, forward="all", extra_dims="all")
         pipeline.execute()
-
         remove_dimensions_from_las(tmp_las.name, dimensions=[ORIGINAL_TILE_TAG], output_las=output_file)
 
 

pdaltools/las_remove_dimensions.py

@@ -5,22 +5,36 @@ import pdal
 from pdaltools.las_info import get_writer_parameters_from_reader_metadata
 
 
-def remove_dimensions_from_las(input_las: str, dimensions: [str], output_las: str):
+def remove_dimensions_from_points(points, metadata, dimensions: [str], output_las: str):
     """
     export new las without some dimensions
     """
-    pipeline = pdal.Pipeline() | pdal.Reader.las(input_las)
-    pipeline.execute()
-    points = pipeline.arrays[0]
+
+    mandatory_dimensions = ["X", "Y", "Z", "x", "y", "z"]
+    output_dimensions_test = [dim for dim in dimensions if dim not in mandatory_dimensions]
+    assert len(output_dimensions_test) == len(
+        dimensions
+    ), "All dimensions to remove must not be mandatory dimensions (X,Y,Z,x,y,z)"
+
     input_dimensions = list(points.dtype.fields.keys())
     output_dimensions = [dim for dim in input_dimensions if dim not in dimensions]
     points_pruned = points[output_dimensions]
-    params = get_writer_parameters_from_reader_metadata(pipeline.metadata)
+    params = get_writer_parameters_from_reader_metadata(metadata)
     pipeline_end = pdal.Pipeline(arrays=[points_pruned])
     pipeline_end |= pdal.Writer.las(output_las, forward="all", **params)
     pipeline_end.execute()
 
 
+def remove_dimensions_from_las(input_las: str, dimensions: [str], output_las: str):
+    """
+    export new las without some dimensions
+    """
+    pipeline = pdal.Pipeline() | pdal.Reader.las(input_las)
+    pipeline.execute()
+    points = pipeline.arrays[0]
+    remove_dimensions_from_points(points, pipeline.metadata, dimensions, output_las)
+
+
 def parse_args():
     parser = argparse.ArgumentParser("Remove dimensions from las")
     parser.add_argument(

pdaltools/las_rename_dimension.py

@@ -0,0 +1,79 @@
+"""
+Rename dimensions in a LAS file using PDAL's Python API.
+
+This script allows renaming dimensions in a LAS file while preserving all other data.
+"""
+
+import argparse
+import pdal
+import sys
+from pathlib import Path
+from pdaltools.las_remove_dimensions import remove_dimensions_from_points
+
+
+def rename_dimension(input_file: str, output_file: str, old_dims: list[str], new_dims: list[str]):
+    """
+    Rename one or multiple dimensions in a LAS file using PDAL.
+
+    Args:
+        input_file: Path to the input LAS file
+        output_file: Path to save the output LAS file
+        old_dims: List of names of dimensions to rename
+        new_dims: List of new names for the dimensions
+    """
+
+    # Validate dimensions
+    if len(old_dims) != len(new_dims):
+        raise ValueError("Number of old dimensions must match number of new dimensions")
+
+    mandatory_dimensions = ["X", "Y", "Z", "x", "y", "z"]
+    for dim in new_dims:
+        if dim in mandatory_dimensions:
+            raise ValueError(f"New dimension {dim} cannot be a mandatory dimension (X,Y,Z,x,y,z)")
+
+    pipeline = pdal.Pipeline() | pdal.Reader.las(input_file)
+    for old, new in zip(old_dims, new_dims):
+        pipeline |= pdal.Filter.ferry(dimensions=f"{old} => {new}")
+    pipeline |= pdal.Writer.las(output_file)
+    pipeline.execute()
+    points = pipeline.arrays[0]
+
+    # Remove old dimensions
+    remove_dimensions_from_points(points, pipeline.metadata, old_dims, output_file)
+
+
+def main():
+    parser = argparse.ArgumentParser(description="Rename dimensions in a LAS file")
+    parser.add_argument("input_file", help="Input LAS file")
+    parser.add_argument("output_file", help="Output LAS file")
+    parser.add_argument(
+        "--old-dims",
+        nargs="+",
+        required=True,
+        help="Names of dimensions to rename (can specify multiple)",
+    )
+    parser.add_argument(
+        "--new-dims",
+        nargs="+",
+        required=True,
+        help="New names for the dimensions (must match --old-dims count)",
+    )
+
+    args = parser.parse_args()
+
+    # Validate input file
+    input_path = Path(args.input_file)
+    if not input_path.exists():
+        print(f"Error: Input file {args.input_file} does not exist", file=sys.stderr)
+        sys.exit(1)
+
+    # Validate output file
+    output_path = Path(args.output_file)
+    if output_path.exists():
+        print(f"Warning: Output file {args.output_file} already exists. It will be overwritten.")
+
+    rename_dimension(args.input_file, args.output_file, args.old_dims, args.new_dims)
+
+
+if __name__ == "__main__":
+    main()

pdaltools/standardize_format.py

@@ -1,11 +1,11 @@
 """Re-write las file with expected format:
-    - laz version
-    - [TODO] nomenclature ???
-    - record format
-    - global encoding
-    - projection
-    - precision
-    - no extra-dims
+- laz version
+- [TODO] nomenclature ???
+- record format
+- global encoding
+- projection
+- precision
+- no extra-dims
 """
 
 import argparse
@@ -18,6 +18,7 @@ from typing import Dict, List
 import pdal
 
 from pdaltools.unlock_file import copy_and_hack_decorator
+from pdaltools.las_rename_dimension import rename_dimension
 
 # Standard parameters to pass to the pdal writer
 STANDARD_PARAMETERS = dict(
@@ -60,6 +61,13 @@ def parse_args():
         help="List of extra dims to keep in the output (default=[], use 'all' to keep all extra dims), "
         "extra_dims must be specified with their type (see pdal.writers.las documentation, eg 'dim1=double')",
     )
+    parser.add_argument(
+        "--rename_dims",
+        default=[],
+        nargs="*",
+        type=str,
+        help="Rename dimensions in pairs: --rename_dims old_name1 new_name1 old_name2 new_name2 ...",
+    )
     return parser.parse_args()
 
 
@@ -73,11 +81,27 @@ def get_writer_parameters(new_parameters: Dict) -> Dict:
 
 
 def rewrite_with_pdal(
-    input_file: str, output_file: str, params_from_parser: Dict, classes_to_remove: List = []
+    input_file: str, output_file: str, params_from_parser: Dict, classes_to_remove: List = [], rename_dims: List = []
 ) -> None:
     params = get_writer_parameters(params_from_parser)
+
+    # Create temporary file for dimension renaming if needed
+    if rename_dims:
+        with tempfile.NamedTemporaryFile(suffix=".laz", delete=False) as tmp_file:
+            tmp_file_name = tmp_file.name
+
+            # Rename dimensions
+            old_dims = rename_dims[::2]
+            new_dims = rename_dims[1::2]
+            rename_dimension(input_file, tmp_file_name, old_dims, new_dims)
+
+            # Use renamed file as input
+            input_file = tmp_file_name
+    else:
+        tmp_file_name = input_file
+
     pipeline = pdal.Pipeline()
-    pipeline |= pdal.Reader.las(input_file)
+    pipeline |= pdal.Reader.las(tmp_file_name)
     if classes_to_remove:
         expression = "&&".join([f"Classification != {c}" for c in classes_to_remove])
         pipeline |= pdal.Filter.expression(expression=expression)
@@ -102,18 +126,24 @@ def exec_las2las(input_file: str, output_file: str):
 
 
 @copy_and_hack_decorator
-def standardize(input_file: str, output_file: str, params_from_parser: Dict, class_points_removed: []) -> None:
+def standardize(
+    input_file: str, output_file: str, params_from_parser: Dict, class_points_removed: [], rename_dims: []
+) -> None:
     filename = os.path.basename(output_file)
     with tempfile.NamedTemporaryFile(suffix=filename) as tmp:
-        rewrite_with_pdal(input_file, tmp.name, params_from_parser, class_points_removed)
+        rewrite_with_pdal(input_file, tmp.name, params_from_parser, class_points_removed, rename_dims)
         exec_las2las(tmp.name, output_file)
 
 
-if __name__ == "__main__":
+def main():
     args = parse_args()
     params_from_parser = dict(
         dataformat_id=args.record_format,
         a_srs=args.projection,
         extra_dims=args.extra_dims,
     )
-    standardize(args.input_file, args.output_file, params_from_parser, args.class_points_removed)
+    standardize(args.input_file, args.output_file, params_from_parser, args.class_points_removed, args.rename_dims)
+
+
+if __name__ == "__main__":
+    main()

pdaltools/unlock_file.py

@@ -1,5 +1,4 @@
-"""Tools to handle malformed las/laz files
-    """
+"""Tools to handle malformed las/laz files"""
 
 # https://gis.stackexchange.com/questions/413191/python-pdal-error-reading-format-1-4-las-file-readers-las-error-global-enco
 

ign_pdal_tools-1.8.1.dist-info/RECORD

@@ -1,17 +0,0 @@
-ign_pdal_tools-1.8.1.dist-info/licenses/LICENSE.md,sha256=iVzCFZTUXeiqP8bP474iuWZiWO_kDCD4SPh1Wiw125Y,1120
-pdaltools/_version.py,sha256=h3YpE0kofxFLptgIZDqRkDU33Y3pyOvd2HkmX5qItO8,74
-pdaltools/add_points_in_pointcloud.py,sha256=-xFdqrBr5KC-5ab7g-poaG2rR8dcbyKP9bLFbfd2V2c,12513
-pdaltools/color.py,sha256=vJgpb8dOvT5rnq5NdVOaMdGc_pKL3damLy4HwGvigJQ,14472
-pdaltools/las_add_buffer.py,sha256=sBpTywlfsHHS8KuCUa-eydB2hylshEvjrMQt5TrqXb8,11275
-pdaltools/las_clip.py,sha256=GvEOYu8RXV68e35kU8i42GwSkbo4P9TvmS6rkrdPmFM,1034
-pdaltools/las_info.py,sha256=lMKxKzsViptDENI1wOlANG4qOvdc19ixyasYKD-N1ck,9512
-pdaltools/las_merge.py,sha256=tcFVueV9X9nNEaoAl5zCduY5DETlBg63MAgP2SuKiNo,4121
-pdaltools/las_remove_dimensions.py,sha256=VX6jQqjF298bsPm6MJQlBH-7ue9fG7XlwhDzdkACZ84,1793
-pdaltools/pcd_info.py,sha256=NIAH5KGikVDQLlbCcw9FuaPqe20UZvRfkHsDZd5kmZA,3210
-pdaltools/replace_attribute_in_las.py,sha256=po1F-fi8s7iilqKWaryW4JRbsmdMOUe0yGvG3AEKxtk,4771
-pdaltools/standardize_format.py,sha256=gqm2GJbtDkT4k4oC_NX2LIPh9R2BLh4sMHLKYgfKrMc,3973
-pdaltools/unlock_file.py,sha256=pIThdWMNkTph0xgJVVRaM1o9aUMQhM6804PscScB3JI,1963
-ign_pdal_tools-1.8.1.dist-info/METADATA,sha256=BNBK2WhJ6rfeHGcRdERPiKzAbIH_bsi7avbmYpH2Df4,5777
-ign_pdal_tools-1.8.1.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
-ign_pdal_tools-1.8.1.dist-info/top_level.txt,sha256=KvGW0ZzqQbhCKzB5_Tp_buWMZyIgiO2M2krWF_ecOZc,10
-ign_pdal_tools-1.8.1.dist-info/RECORD,,