ign-pdal-tools 1.15.4__py3-none-any.whl → 1.15.6__py3-none-any.whl

{ign_pdal_tools-1.15.4.dist-info → ign_pdal_tools-1.15.6.dist-info}/METADATA

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

@@ -0,0 +1,22 @@
+ign_pdal_tools-1.15.6.dist-info/licenses/LICENSE.md,sha256=iVzCFZTUXeiqP8bP474iuWZiWO_kDCD4SPh1Wiw125Y,1120
+pdaltools/_version.py,sha256=rbwL37ozKUuMooO5Jv8RL7L5YP6krgkxEC3KNUvyY6c,75
+pdaltools/add_points_in_pointcloud.py,sha256=lDxePBBRTKSEKC3BgrVLWUEMN8vCM4xNgsJfbIz4GRw,12988
+pdaltools/color.py,sha256=yVSP1IjFsV5yAXYudaD76a8BM0hZAmMLMzjUjd7CNS0,9595
+pdaltools/create_random_laz.py,sha256=w0P4e3-bzaiKl_osmyFdOcKODRUadU7G4ez9fLvCDrs,6028
+pdaltools/download_image.py,sha256=RgR9iHbw1kr1rb5aumbNwNyLk3BgM86EV3MssXiVaGU,7869
+pdaltools/las_add_buffer.py,sha256=WXUkMSRX8T-Xj5il9F_uv7uKSqwUmv5P3AUcHXQVQDE,11343
+pdaltools/las_clip.py,sha256=GvEOYu8RXV68e35kU8i42GwSkbo4P9TvmS6rkrdPmFM,1034
+pdaltools/las_comparison.py,sha256=AsmbdH8HF61lWHroZkez5x1h7B681RLWWZCHibDc3M4,4506
+pdaltools/las_info.py,sha256=xZlTsdLS3I9_xeqGJyOOpJNJrqF82JBhlMhtYabOuw0,9845
+pdaltools/las_merge.py,sha256=tcFVueV9X9nNEaoAl5zCduY5DETlBg63MAgP2SuKiNo,4121
+pdaltools/las_remove_dimensions.py,sha256=f8imGhN6LNTuQ1GMJQRzIIV3Wab_oRPOyEnKi1CgfiM,2318
+pdaltools/las_rename_dimension.py,sha256=AWYx0Jd5YHWng-CY2yIV8iRTR_bMxhvwGz1MO5sYTWc,2889
+pdaltools/pcd_info.py,sha256=NIAH5KGikVDQLlbCcw9FuaPqe20UZvRfkHsDZd5kmZA,3210
+pdaltools/replace_area_in_pointcloud.py,sha256=V8aFRSxrqJtsUufoA_5g9ysPl-Wp17_TXjezvSERdmU,10537
+pdaltools/replace_attribute_in_las.py,sha256=MHpIizSupgWtbizteoRH8FKDE049hrAh4v_OhmRmSPU,4318
+pdaltools/standardize_format.py,sha256=-ukrz5gY0mq071fN7EXbB9ANS44IEmgpKQrrjzOnqhE,4455
+pdaltools/unlock_file.py,sha256=3BplGrcKJ7lpPj1lHTG4ODeuGDXjmeoMeSl3q2Qn2XA,1980
+ign_pdal_tools-1.15.6.dist-info/METADATA,sha256=DRXg0EtK94BnLSbhA-7okBqdGRZbSPcVhC2HSNtLIh4,6146
+ign_pdal_tools-1.15.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ign_pdal_tools-1.15.6.dist-info/top_level.txt,sha256=KvGW0ZzqQbhCKzB5_Tp_buWMZyIgiO2M2krWF_ecOZc,10
+ign_pdal_tools-1.15.6.dist-info/RECORD,,

pdaltools/_version.py

@@ -1,4 +1,4 @@
-__version__ = "1.15.4"
+__version__ = "1.15.6"
 
 
 if __name__ == "__main__":

pdaltools/add_points_in_pointcloud.py

@@ -156,7 +156,7 @@ def add_points_to_las(
     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 tempfile.NamedTemporaryFile(suffix="_new_points.las", delete_on_close=False) as tmp:
         with laspy.open(tmp.name, mode="w", header=header) as las_file:
             las_file.write_points(new_points)
 

pdaltools/color.py

@@ -101,7 +101,7 @@ def color(
 
     tmp_ortho = None
     if color_rvb_enabled:
-        tmp_ortho = tempfile.NamedTemporaryFile(suffix="_rvb.tif")
+        tmp_ortho = tempfile.NamedTemporaryFile(suffix="_rvb.tif", delete_on_close=False)
         download_image(
             proj,
             stream_RGB,
@@ -124,7 +124,7 @@ def color(
 
     tmp_ortho_irc = None
     if color_ir_enabled:
-        tmp_ortho_irc = tempfile.NamedTemporaryFile(suffix="_irc.tif")
+        tmp_ortho_irc = tempfile.NamedTemporaryFile(suffix="_irc.tif", delete_on_close=False)
         download_image(
             proj,
             stream_IRC,

pdaltools/create_random_laz.py

@@ -1,10 +1,11 @@
-import numpy as np
-import laspy
-from pathlib import Path
 import argparse
-from pyproj import CRS
+from pathlib import Path
 from typing import List, Tuple
 
+import laspy
+import numpy as np
+from pyproj import CRS
+
 
 def create_random_laz(
     output_file: str,
@@ -27,7 +28,7 @@ def create_random_laz(
                 (default: (650000, 6810000) ; around Paris)
         extra_dims: List of tuples (dimension_name, dimension_type) where type can be:
                    'float32', 'float64', 'int8', 'int16', 'int32', 'int64', 'uint8', 'uint16', 'uint32', 'uint64'
-        classifications: Optional list of classification values. 
+        classifications: Optional list of classification values.
     """
 
     # Create a new point cloud
@@ -103,7 +104,6 @@ def create_random_laz(
 
 
 def test_output_file(result: dict, output_file: str):
-
     # Validate output file path
     output_path = Path(output_file)
     if not output_path.exists():
@@ -126,12 +126,14 @@ def parse_args():
     )
     parser.add_argument("--crs", type=int, default=2154, help="Projection code")
     parser.add_argument(
-        "--center", type=float, nargs=2, default=[650000.0, 6810000.0],
-        help="Center coordinates (x y) of the area to generate points in (space-separated)"
+        "--center",
+        type=float,
+        nargs=2,
+        default=[650000.0, 6810000.0],
+        help="Center coordinates (x y) of the area to generate points in (space-separated)",
     )
     parser.add_argument(
-        "--classifications", type=int, nargs='+',
-        help="List of classification values (space-separated)"
+        "--classifications", type=int, nargs="+", help="List of classification values (space-separated)"
     )
     return parser.parse_args()
 
@@ -145,19 +147,13 @@ def main():
 
     # Parse center
     center = tuple(args.center[:2])  # Only take first 2 values if more are provided
-    
+
     # Parse classifications if provided
     classifications = args.classifications
 
     # Call create_random_laz
     result = create_random_laz(
-        args.output_file, 
-        args.point_format, 
-        args.num_points, 
-        args.crs, 
-        center, 
-        extra_dims,
-        classifications
+        args.output_file, args.point_format, args.num_points, args.crs, center, extra_dims, classifications
     )
 
     # Test output file

pdaltools/download_image.py

@@ -185,7 +185,7 @@ def download_image(proj, layer, minx, miny, maxx, maxy, pixel_per_meter, outfile
                 tmp_gpg_ortho.append(cells_ortho_paths)
 
         # merge the cells
-        with tempfile.NamedTemporaryFile(suffix="_gpf.vrt") as tmp_vrt:
+        with tempfile.NamedTemporaryFile(suffix="_gpf.vrt", delete_on_close=False) as tmp_vrt:
             gdal.BuildVRT(tmp_vrt.name, tmp_gpg_ortho)
             gdal.Translate(outfile, tmp_vrt.name)
 

pdaltools/las_add_buffer.py

@@ -153,7 +153,7 @@ def remove_points_from_buffer(input_file: str, output_file: str):
         input_file (str): path to the input file containing the "is_in_original" dimension
         output_file (str): path to the output_file
     """
-    with tempfile.NamedTemporaryFile(suffix="_with_additional_dim.las") as tmp_las:
+    with tempfile.NamedTemporaryFile(suffix="_with_additional_dim.las", delete_on_close=False) as tmp_las:
         pipeline = pdal.Pipeline() | pdal.Reader.las(input_file)
         pipeline |= pdal.Filter.range(limits=f"{ORIGINAL_TILE_TAG}[1:1]")
         pipeline |= pdal.Writer.las(filename=tmp_las.name, forward="all", extra_dims="all")
@@ -217,8 +217,8 @@ def run_on_buffered_las(
                 )
 
             with (
-                tempfile.NamedTemporaryFile(suffix="_buffered_input.laz", dir=".") as buf_in,
-                tempfile.NamedTemporaryFile(suffix="_buffered_output.laz", dir=".") as buf_out,
+                tempfile.NamedTemporaryFile(suffix="_buffered_input.laz", dir=".", delete_on_close=False) as buf_in,
+                tempfile.NamedTemporaryFile(suffix="_buffered_output.laz", dir=".", delete_on_close=False) as buf_out,
             ):
                 create_las_with_buffer(
                     Path(input_file).parent,

pdaltools/las_comparison.py

@@ -1,9 +1,10 @@
-import laspy
-from pathlib import Path
-import numpy as np
 import argparse
+from pathlib import Path
 from typing import Tuple
 
+import laspy
+import numpy as np
+
 
 def compare_las_dimensions(file1: Path, file2: Path, dimensions: list = None) -> Tuple[bool, int, float]:
     """

pdaltools/las_rename_dimension.py

@@ -6,11 +6,13 @@ This script allows renaming dimensions in a LAS file while preserving all other
 
 import argparse
 import logging
-import pdal
 import sys
 from pathlib import Path
-from pdaltools.las_remove_dimensions import remove_dimensions_from_points
+
+import pdal
+
 from pdaltools.las_info import las_info_metadata
+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]):

pdaltools/replace_area_in_pointcloud.py

@@ -1,12 +1,22 @@
 import argparse
+import os
+import shutil
+import tempfile
+import time
 import warnings
 
+import geopandas as gpd
 import numpy as np
 import pdal
 from numpy.lib import recfunctions as rfn
 from osgeo import gdal
+from shapely.geometry import box
 
-from pdaltools.las_info import get_writer_parameters_from_reader_metadata
+from pdaltools.las_info import (
+    get_bounds_from_header_info,
+    get_writer_parameters_from_reader_metadata,
+    las_info_metadata,
+)
 
 
 def argument_parser():
@@ -139,6 +149,18 @@ def pipeline_read_from_DSM(dsm, ground_mask, classification):
     return pipeline
 
 
+def clip_area(area_input, area_output, las_file):
+    start = time.time()
+    gdf = gpd.read_file(area_input)
+    minx, maxx, miny, maxy = get_bounds_from_header_info(las_info_metadata(las_file))
+    selection = gdf[gdf.intersects(box(minx, miny, maxx, maxy))]
+    num_polygon = len(selection)
+    selection.to_file(area_output)
+    end = time.time()
+    print(f"Create replacement area cropped: {num_polygon} polygons in {end-start:.2f} seconds")
+    return num_polygon
+
+
 def replace_area(
     target_cloud, pipeline_source, replacement_area, output_cloud, source_pdal_filter="", target_pdal_filter=""
 ):
@@ -147,6 +169,24 @@ def replace_area(
     print("output cloud: ", output_cloud)
     print("source pdal filter: ", source_pdal_filter)
     print("target pdal filter: ", target_pdal_filter)
+
+    start = time.time()
+    tmpdir = tempfile.mkdtemp()
+    replacement_name, ext = os.path.splitext(os.path.basename(replacement_area))
+    las_name, _ = os.path.splitext(os.path.basename(target_cloud))
+    replacement_area_crop = os.path.join(tmpdir, f"{replacement_name}_{las_name}{ext}")
+    print("replacement area crop: ", replacement_area_crop)
+
+    num_polygon = clip_area(replacement_area, replacement_area_crop, target_cloud)
+    if num_polygon == 0:
+        print("No polygon inside target cloud, output file is target cloud. We copy target in output.")
+
+        shutil.copy2(src=target_cloud, dst=output_cloud)
+        end = time.time()
+        print("all steps done in ", f"{end-start:.2f}", " seconds")
+        return
+
+    replacement_area = replacement_area_crop
     crops = []
     # pipeline to read target_cloud and remove points inside the polygon
     pipeline_target = pdal.Pipeline()
@@ -160,7 +200,9 @@ def replace_area(
     # Keep only points out of the area
     pipeline_target |= pdal.Filter.expression(expression="geometryFid==-1", tag="A")
     target_count = pipeline_target.execute()
-    print("Step 1: target count: ", target_count)
+
+    t1 = time.time()
+    print(f"Step 1: target count: {target_count} points in {t1-start:.2f} seconds")
 
     # get input dimensions dtype from target
     if pipeline_target.arrays:
@@ -171,7 +213,10 @@ def replace_area(
         pipeline_target2 |= pdal.Reader.las(filename=target_cloud)
         pipeline_target2.execute()
         input_dim_dtype = pipeline_target2.arrays[0].dtype
+        t1_bis = time.time()
+        print(f"Step 1-bis: re-read to have dimensions: {t1_bis-t1:.2f} seconds")
 
+    t2 = time.time()
     # get input dimensions names
     input_dimensions = list(input_dim_dtype.fields.keys())
 
@@ -179,7 +224,7 @@ def replace_area(
     output_dimensions = [dim for dim in input_dimensions if dim not in "geometryFid"]
 
     # add target to the result after keeping only the expected dimensions
-    if pipeline_target.arrays:
+    if target_count:
         target_cloud_pruned = pipeline_target.arrays[0][output_dimensions]
         crops.append(target_cloud_pruned)
 
@@ -192,7 +237,9 @@ def replace_area(
     # Keep only points in the area
     pipeline_source |= pdal.Filter.expression(expression="geometryFid>=0", tag="B")
     source_count = pipeline_source.execute()
-    print("Step 2: source count: ", source_count)
+
+    t3 = time.time()
+    print(f"Step 2: source count: {source_count} points in {t3-t2:.2f} seconds")
 
     # add source to the result
     if source_count:
@@ -221,7 +268,11 @@ def replace_area(
 
     writer_params = get_writer_params(target_cloud)
     pipeline |= pdal.Writer.las(filename=output_cloud, **writer_params)
-    pipeline.execute()
+    points = pipeline.execute()
+
+    end = time.time()
+    print(f"Step 3: merge: {points}, points in {end-t3:.2f} seconds")
+    print("all steps done in ", f"{end-start:.2f}", " seconds")
 
 
 if __name__ == "__main__":

pdaltools/standardize_format.py

@@ -9,13 +9,14 @@
 """
 
 import argparse
+import os
 import tempfile
 from typing import Dict, List
 
 import pdal
 
-from pdaltools.unlock_file import copy_and_hack_decorator
 from pdaltools.las_rename_dimension import rename_dimension
+from pdaltools.unlock_file import copy_and_hack_decorator
 
 # Standard parameters to pass to the pdal writer
 STANDARD_PARAMETERS = dict(
@@ -76,34 +77,50 @@ def get_writer_parameters(new_parameters: Dict) -> Dict:
     params = STANDARD_PARAMETERS | new_parameters
     return params
 
+
 @copy_and_hack_decorator
 def standardize(
-    input_file: str, output_file: str, params_from_parser: Dict, classes_to_remove: List = [], rename_dims: List = []
+    input_file: str, 
+    output_file: str, 
+    params_from_parser: Dict, 
+    classes_to_remove: List = [], 
+    rename_dims: List = []
 ) -> None:
+    """
+    Standardize a LAS/LAZ file with improved error handling and resource management.
+    
+    Args:
+        input_file: Input file path
+        output_file: Output file path
+        params_from_parser: Parameters for the PDAL writer
+        classes_to_remove: List of classification classes to remove
+        rename_dims: List of dimension names to rename (pairs of old_name, new_name)
+    """
     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(tmp_file_name)
-    if classes_to_remove:
-        expression = "&&".join([f"Classification != {c}" for c in classes_to_remove])
-        pipeline |= pdal.Filter.expression(expression=expression)
-    pipeline |= pdal.Writer(filename=output_file, forward="all", **params)
-    pipeline.execute()
+    tmp_file_name = None
+
+    try:
+        # 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
+                old_dims = rename_dims[::2]
+                new_dims = rename_dims[1::2]
+                rename_dimension(input_file, tmp_file_name, old_dims, new_dims)
+                input_file = tmp_file_name
+
+        pipeline = pdal.Pipeline()
+        pipeline |= pdal.Reader.las(input_file)
+        if classes_to_remove:
+            expression = "&&".join([f"Classification != {c}" for c in classes_to_remove])
+            pipeline |= pdal.Filter.expression(expression=expression)
+        pipeline |= pdal.Writer(filename=output_file, forward="all", **params)
+        pipeline.execute()
+
+    finally:
+        # Clean up temporary file
+        if tmp_file_name and os.path.exists(tmp_file_name):
+            os.remove(tmp_file_name)
 
 
 def main():

pdaltools/unlock_file.py

@@ -39,10 +39,9 @@ def copy_and_hack_decorator(func):
             if "readers.las: Global encoding WKT flag not set for point format 6 - 10." in str(e):
                 args = list(args)
                 in_file = args[0]
-                with tempfile.NamedTemporaryFile(suffix=os.path.splitext(in_file)[-1]) as tmp:
+                with tempfile.NamedTemporaryFile(suffix=os.path.splitext(in_file)[-1], delete_on_close=False) as tmp:
                     copy_and_hack_input_file(in_file, tmp.name)
                     args[0] = tmp.name
-
                     return func(*args, **kwargs)
 
             else:

ign_pdal_tools-1.15.4.dist-info/RECORD

@@ -1,22 +0,0 @@
-ign_pdal_tools-1.15.4.dist-info/licenses/LICENSE.md,sha256=iVzCFZTUXeiqP8bP474iuWZiWO_kDCD4SPh1Wiw125Y,1120
-pdaltools/_version.py,sha256=v1-P-Ov-24Bdx7-zaJ7QUAVXDpuCxPkaM1l4VOXLOSA,75
-pdaltools/add_points_in_pointcloud.py,sha256=UJTwoOjC0WKnp_ynNHpwUh1fmbIgw7hq5xoNN8_FxQQ,12965
-pdaltools/color.py,sha256=s-_rmLK6fIK3UwkUzHVZPEkm6r1LliG5ftGr-jkqyjM,9549
-pdaltools/create_random_laz.py,sha256=XuHH4G8Nrs8DB-F8bkcIeto7JtmrlrNGF_R66oxGCbQ,6069
-pdaltools/download_image.py,sha256=DG9PunQsjw7Uyyf4YMVp8LMH0G3Uo4cahx5EZbdi3so,7846
-pdaltools/las_add_buffer.py,sha256=rnFExAfi0KqlQpL4hDMh2aC08AcYdSHSB6WPG5RyFIc,11274
-pdaltools/las_clip.py,sha256=GvEOYu8RXV68e35kU8i42GwSkbo4P9TvmS6rkrdPmFM,1034
-pdaltools/las_comparison.py,sha256=B9hFGbmD0x4JEN4oHbiQFNbd0T-9P3mnAN67Czu0pZk,4505
-pdaltools/las_info.py,sha256=xZlTsdLS3I9_xeqGJyOOpJNJrqF82JBhlMhtYabOuw0,9845
-pdaltools/las_merge.py,sha256=tcFVueV9X9nNEaoAl5zCduY5DETlBg63MAgP2SuKiNo,4121
-pdaltools/las_remove_dimensions.py,sha256=f8imGhN6LNTuQ1GMJQRzIIV3Wab_oRPOyEnKi1CgfiM,2318
-pdaltools/las_rename_dimension.py,sha256=FEWIcq0ZZiv9xWbCLDRE9Hzb5K0YYfoi3Z8IZFEs-uU,2887
-pdaltools/pcd_info.py,sha256=NIAH5KGikVDQLlbCcw9FuaPqe20UZvRfkHsDZd5kmZA,3210
-pdaltools/replace_area_in_pointcloud.py,sha256=4JyWWDtPUqtzE3zMh7eHwjGAupLclvjxKg8ScgIC4-4,8714
-pdaltools/replace_attribute_in_las.py,sha256=MHpIizSupgWtbizteoRH8FKDE049hrAh4v_OhmRmSPU,4318
-pdaltools/standardize_format.py,sha256=I2oNiwhSMtr4e5ZK9qbB_yKmy3twOoO6QLiSFu4_AaI,3905
-pdaltools/unlock_file.py,sha256=G2odk0cpp_X9r49Y90oK88v3qlihaMfg6acwmWqblik,1958
-ign_pdal_tools-1.15.4.dist-info/METADATA,sha256=kBr1Y0CwOciH9Gjw4HxpYiYy5eQpcHqbSxQ_zXnZr3M,6146
-ign_pdal_tools-1.15.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ign_pdal_tools-1.15.4.dist-info/top_level.txt,sha256=KvGW0ZzqQbhCKzB5_Tp_buWMZyIgiO2M2krWF_ecOZc,10
-ign_pdal_tools-1.15.4.dist-info/RECORD,,