ign-pdal-tools 1.15.5__tar.gz → 1.15.7__tar.gz

{ign_pdal_tools-1.15.5 → ign_pdal_tools-1.15.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ign-pdal-tools
-Version: 1.15.5
+Version: 1.15.7
 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.5 → ign_pdal_tools-1.15.7}/ign_pdal_tools.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ign-pdal-tools
-Version: 1.15.5
+Version: 1.15.7
 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.5 → ign_pdal_tools-1.15.7}/pdaltools/_version.py

@@ -1,4 +1,4 @@
-__version__ = "1.15.5"
+__version__ = "1.15.7"
 
 
 if __name__ == "__main__":

{ign_pdal_tools-1.15.5 → ign_pdal_tools-1.15.7}/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)
 

{ign_pdal_tools-1.15.5 → ign_pdal_tools-1.15.7}/pdaltools/color.py

@@ -31,7 +31,7 @@ def match_min_max_with_pixel_size(min_d: float, max_d: float, pixel_per_meter: f
     return min_d, max_d
 
 
-def color(
+def color_from_stream(
     input_file: str,
     output_file: str,
     proj="",
@@ -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,
@@ -156,28 +156,58 @@ def color(
     return tmp_ortho, tmp_ortho_irc
 
 
-def parse_args():
-    parser = argparse.ArgumentParser("Colorize tool", formatter_class=argparse.RawTextHelpFormatter)
-    parser.add_argument("--input", "-i", type=str, required=True, help="Input file")
-    parser.add_argument("--output", "-o", type=str, default="", help="Output file")
-    parser.add_argument(
-        "--proj", "-p", type=str, default="", help="Projection, default will use projection from metadata input"
+def color_from_files(
+    input_file: str,
+    output_file: str,
+    rgb_image: str,
+    irc_image: str,
+    color_rvb_enabled=True,
+    color_ir_enabled=True,
+    veget_index_file="",
+    vegetation_dim="Deviation",
+):
+    pipeline = pdal.Reader.las(filename=input_file)
+
+    writer_extra_dims = "all"
+
+    if veget_index_file and veget_index_file != "":
+        print(f"Remplissage du champ {vegetation_dim} à partir du fichier {veget_index_file}")
+        pipeline |= pdal.Filter.colorization(raster=veget_index_file, dimensions=f"{vegetation_dim}:1:256.0")
+        writer_extra_dims = [f"{vegetation_dim}=ushort"]
+
+    # Warning: the initial color is multiplied by 256 despite its initial 8-bits encoding
+    # which turns it to a 0 to 255*256 range.
+    # It is kept this way because of other dependencies that have been tuned to fit this range
+    if color_rvb_enabled:
+        pipeline |= pdal.Filter.colorization(raster=rgb_image, dimensions="Red:1:256.0, Green:2:256.0, Blue:3:256.0")
+    if color_ir_enabled:
+        pipeline |= pdal.Filter.colorization(raster=irc_image, dimensions="Infrared:1:256.0")
+
+    pipeline |= pdal.Writer.las(
+        filename=output_file, extra_dims=writer_extra_dims, minor_version="4", dataformat_id="8", forward="all"
     )
-    parser.add_argument("--resolution", "-r", type=float, default=5, help="Resolution, in pixel per meter")
-    parser.add_argument("--timeout", "-t", type=int, default=300, help="Timeout, in seconds")
-    parser.add_argument("--rvb", action="store_true", help="Colorize RVB")
-    parser.add_argument("--ir", action="store_true", help="Colorize IR")
-    parser.add_argument(
-        "--vegetation",
-        type=str,
-        default="",
-        help="Vegetation file (raster), value will be stored in 'vegetation_dim' field",
+
+    print("Traitement du nuage de point")
+    pipeline.execute()
+
+
+def argument_parser():
+    parser = argparse.ArgumentParser("Colorize tool")
+    subparsers = parser.add_subparsers(required=True)
+
+    # first command is 'from_stream'
+    from_stream = subparsers.add_parser("from_stream", help="Images are downloaded from streams")
+    from_stream.add_argument(
+        "--proj", "-p", type=str, default="", help="Projection, default will use projection from metadata input"
     )
-    parser.add_argument(
-        "--vegetation_dim", type=str, default="Deviation", help="name of the extra_dim uses for the vegetation value"
+    from_stream.add_argument("--timeout", "-t", type=int, default=300, help="Timeout, in seconds")
+    from_stream.add_argument("--rvb", action="store_true", help="Colorize RVB")
+    from_stream.add_argument("--ir", action="store_true", help="Colorize IR")
+    from_stream.add_argument("--resolution", "-r", type=float, default=5, help="Resolution, in pixel per meter")
+    from_stream.add_argument(
+        "--check-images", "-c", action="store_true", help="Check that downloaded image is not white"
     )
-    parser.add_argument("--check-images", "-c", action="store_true", help="Check that downloaded image is not white")
-    parser.add_argument(
+    from_stream.add_argument(
         "--stream-RGB",
         type=str,
         default="ORTHOIMAGERY.ORTHOPHOTOS",
@@ -186,27 +216,49 @@ default stream (ORTHOIMAGERY.ORTHOPHOTOS) let the server choose the resolution
 for 20cm resolution rasters, use HR.ORTHOIMAGERY.ORTHOPHOTOS
 for 50 cm resolution rasters, use ORTHOIMAGERY.ORTHOPHOTOS.BDORTHO""",
     )
-    parser.add_argument(
+    from_stream.add_argument(
         "--stream-IRC",
         type=str,
         default="ORTHOIMAGERY.ORTHOPHOTOS.IRC",
         help="""WMS raster stream for IRC colorization. Default to ORTHOIMAGERY.ORTHOPHOTOS.IRC
 Documentation about possible stream : https://geoservices.ign.fr/services-web-experts-ortho""",
     )
-    parser.add_argument(
+    from_stream.add_argument(
         "--size-max-GPF",
         type=int,
         default=5000,
         help="Maximum edge size (in pixels) of downloaded images."
         " If input file needs more, several images are downloaded and merged.",
     )
+    add_common_options(from_stream)
+    from_stream.set_defaults(func=from_stream_func)
 
-    return parser.parse_args()
+    # second command is 'from_files'
+    from_files = subparsers.add_parser("from_files", help="Images are in directories from RGB/IRC")
+    from_files.add_argument("--image_RGB", type=str, required=True, help="RGB image filepath")
+    from_files.add_argument("--image_IRC", type=str, required=True, help="IRC image filepath")
+    add_common_options(from_files)
+    from_files.set_defaults(func=from_files_func)
 
+    return parser
 
-if __name__ == "__main__":
-    args = parse_args()
-    color(
+
+def add_common_options(parser):
+    parser.add_argument("--input", "-i", type=str, required=True, help="Input file")
+    parser.add_argument("--output", "-o", type=str, default="", help="Output file")
+    parser.add_argument(
+        "--vegetation",
+        type=str,
+        default="",
+        help="Vegetation file (raster), value will be stored in 'vegetation_dim' field",
+    )
+    parser.add_argument(
+        "--vegetation_dim", type=str, default="Deviation", help="name of the extra_dim uses for the vegetation value"
+    )
+
+
+def from_stream_func(args):
+    color_from_stream(
         input_file=args.input,
         output_file=args.output,
         proj=args.proj,
@@ -221,3 +273,33 @@ if __name__ == "__main__":
         stream_IRC=args.stream_IRC,
         size_max_gpf=args.size_max_GPF,
     )
+
+
+def from_files_func(args):
+    if args.image_RGB and args.image_RGB != "":
+        color_rvb_enabled = True
+    else:
+        color_rvb_enabled = False
+    if args.image_IRC and args.image_IRC != "":
+        color_irc_enabled = True
+    else:
+        color_irc_enabled = False
+
+    if not color_rvb_enabled and not color_irc_enabled:
+        raise ValueError("At least one of --rvb or --ir must be provided")
+
+    color_from_files(
+        input_file=args.input,
+        output_file=args.output,
+        rgb_image=args.image_RGB,
+        irc_image=args.image_IRC,
+        color_rvb_enabled=color_rvb_enabled,
+        color_ir_enabled=color_irc_enabled,
+        veget_index_file=args.vegetation,
+        vegetation_dim=args.vegetation_dim,
+    )
+
+
+if __name__ == "__main__":
+    args = argument_parser.parse_args()
+    args.func(args)

{ign_pdal_tools-1.15.5 → ign_pdal_tools-1.15.7}/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

{ign_pdal_tools-1.15.5 → ign_pdal_tools-1.15.7}/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)
 

{ign_pdal_tools-1.15.5 → ign_pdal_tools-1.15.7}/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,

{ign_pdal_tools-1.15.5 → ign_pdal_tools-1.15.7}/pdaltools/las_comparison.py

@@ -1,11 +1,13 @@
+import argparse
+from typing import Tuple, Dict, Optional
+
 import laspy
-from pathlib import Path
 import numpy as np
-import argparse
-from typing import Tuple
+
+from pathlib import Path
 
 
-def compare_las_dimensions(file1: Path, file2: Path, dimensions: list = None) -> Tuple[bool, int, float]:
+def compare_las_dimensions(file1: Path, file2: Path, dimensions: list = None, precision: Optional[Dict[str, float]] = None) -> Tuple[bool, int, float]:
     """
     Compare specified dimensions between two LAS files.
     If no dimensions are specified, compares all available dimensions.
@@ -15,6 +17,8 @@ def compare_las_dimensions(file1: Path, file2: Path, dimensions: list = None) ->
         file1: Path to the first LAS file
         file2: Path to the second LAS file
         dimensions: List of dimension names to compare (optional)
+        precision: Dictionary mapping dimension names to tolerance values for float comparison.
+                   If None or dimension not in dict, uses exact comparison (default: None)
 
     Returns:
         bool: True if all specified dimensions are identical, False otherwise
@@ -58,20 +62,42 @@ def compare_las_dimensions(file1: Path, file2: Path, dimensions: list = None) ->
         # Compare each dimension
         for dim in dimensions:
             try:
+                
                 # Get sorted dimension arrays
                 dim1 = np.array(las1[dim])[sort_idx1]
                 dim2 = np.array(las2[dim])[sort_idx2]
 
+                # Get precision for this dimension (if specified)
+                dim_precision = None
+                if precision is not None and dim in precision:
+                    dim_precision = precision[dim]
+
                 # Compare dimensions
-                if not np.array_equal(dim1, dim2):
-                    # Find differences
-                    diff_indices = np.where(dim1 != dim2)[0]
-                    print(f"Found {len(diff_indices)} points with different {dim}:")
-                    for idx in diff_indices[:10]:  # Show first 10 differences
-                        print(f"Point {idx}: file1={dim1[idx]}, file2={dim2[idx]}")
-                    if len(diff_indices) > 10:
-                        print(f"... and {len(diff_indices) - 10} more differences")
-                    return False, len(diff_indices), 100 * len(diff_indices) / len(las1)
+                if dim_precision is not None:
+                    # Use tolerance-based comparison for floats
+                    are_equal = np.allclose(dim1, dim2, rtol=0, atol=dim_precision)
+                    if not are_equal:
+                        # Find differences
+                        diff_mask = ~np.isclose(dim1, dim2, rtol=0, atol=dim_precision)
+                        diff_indices = np.where(diff_mask)[0]
+                        print(f"Found {len(diff_indices)} points with different {dim} (tolerance={dim_precision}):")
+                        for idx in diff_indices[:10]:  # Show first 10 differences
+                            diff_value = abs(dim1[idx] - dim2[idx])
+                            print(f"Point {idx}: file1={dim1[idx]}, file2={dim2[idx]}, diff={diff_value}")
+                        if len(diff_indices) > 10:
+                            print(f"... and {len(diff_indices) - 10} more differences")
+                        return False, len(diff_indices), 100 * len(diff_indices) / len(las1)
+                else:
+                    # Exact comparison
+                    if not np.array_equal(dim1, dim2):
+                        # Find differences
+                        diff_indices = np.where(dim1 != dim2)[0]
+                        print(f"Found {len(diff_indices)} points with different {dim}:")
+                        for idx in diff_indices[:10]:  # Show first 10 differences
+                            print(f"Point {idx}: file1={dim1[idx]}, file2={dim2[idx]}")
+                        if len(diff_indices) > 10:
+                            print(f"... and {len(diff_indices) - 10} more differences")
+                        return False, len(diff_indices), 100 * len(diff_indices) / len(las1)
 
             except KeyError:
                 print(f"Dimension '{dim}' not found in one or both files")
@@ -92,12 +118,32 @@ def compare_las_dimensions(file1: Path, file2: Path, dimensions: list = None) ->
 
 # Update main function to use the new compare function
 def main():
-    parser = argparse.ArgumentParser(description="Compare dimensions between two LAS files")
+    parser = argparse.ArgumentParser(
+        description="Compare dimensions between two LAS files",
+        formatter_class=argparse.RawDescriptionHelpFormatter,
+        epilog="""
+Examples:
+  # Compare all dimensions with exact match
+  python las_comparison.py file1.las file2.las
+
+  # Compare specific dimensions with precision per dimension
+  python las_comparison.py file1.las file2.las --dimensions X Y Z --precision X=0.001 Y=0.001 Z=0.0001
+
+  # Compare all dimensions with precision for specific ones
+  python las_comparison.py file1.las file2.las --precision X=0.001 Y=0.001
+        """
+    )
     parser.add_argument("file1", type=str, help="Path to first LAS file")
     parser.add_argument("file2", type=str, help="Path to second LAS file")
     parser.add_argument(
         "--dimensions", nargs="*", help="List of dimensions to compare. If not specified, compares all dimensions."
     )
+    parser.add_argument(
+        "--precision", nargs="*", metavar="DIM=VAL",
+        help="Tolerance for float comparison per dimension (format: DIMENSION=PRECISION). "
+             "Example: --precision X=0.001 Y=0.001 Z=0.0001. "
+             "Dimensions not specified will use exact comparison."
+    )
 
     args = parser.parse_args()
 
@@ -108,7 +154,18 @@ def main():
         print("Error: One or both files do not exist")
         exit(1)
 
-    result = compare_las_dimensions(file1, file2, args.dimensions)
+    # Parse precision dictionary from command line arguments
+    precision_dict = None
+    if args.precision:
+        precision_dict = {}
+        for prec_spec in args.precision:
+            try:
+                dim_name, prec_value = prec_spec.split('=', 1)
+                precision_dict[dim_name] = float(prec_value)
+            except ValueError:
+                parser.error(f"Invalid precision format: '{prec_spec}'. Expected format: DIMENSION=PRECISION (e.g., X=0.001)")
+
+    result = compare_las_dimensions(file1, file2, args.dimensions, precision_dict)
     print(f"Dimensions comparison result: {'identical' if result[0] else 'different'}")
     return result
 

{ign_pdal_tools-1.15.5 → ign_pdal_tools-1.15.7}/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]):

{ign_pdal_tools-1.15.5 → ign_pdal_tools-1.15.7}/pdaltools/replace_area_in_pointcloud.py

@@ -271,7 +271,7 @@ def replace_area(
     points = pipeline.execute()
 
     end = time.time()
-    print(f"Step 3: merge: { points }, points in {end-t3:.2f} seconds")
+    print(f"Step 3: merge: {points}, points in {end-t3:.2f} seconds")
     print("all steps done in ", f"{end-start:.2f}", " seconds")
 
 

{ign_pdal_tools-1.15.5 → ign_pdal_tools-1.15.7}/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():

{ign_pdal_tools-1.15.5 → ign_pdal_tools-1.15.7}/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.5 → ign_pdal_tools-1.15.7}/test/test_add_points_in_pointcloud.py

@@ -1,10 +1,12 @@
 import inspect
 import os
+import tempfile
 from pathlib import Path
 
 import geopandas as gpd
 import laspy
 import numpy as np
+import pdal
 import pytest
 from shapely.geometry import LineString, MultiPoint, Point
 
@@ -424,3 +426,49 @@ def test_parse_args():
     parsed_args_keys = args.__dict__.keys()
     main_parameters = inspect.signature(add_points_in_pointcloud.add_points_from_geometry_to_las).parameters.keys()
     assert set(parsed_args_keys) == set(main_parameters)
+
+
+def test_namedtemporaryfile_delete_on_close_false():
+    """Test that NamedTemporaryFile could be used on windows in the context with delete_on_close=False"""
+    temp_file_path = None
+
+    with tempfile.NamedTemporaryFile(suffix="_test.las", delete_on_close=False) as tmp:
+        temp_file_path = tmp.name
+        # Verify that the file exists during the context
+        assert os.path.exists(temp_file_path)
+
+        # Write some data to the temporary file
+        with open(temp_file_path, "w") as f:
+            f.write("test data")
+        f.close()
+
+    # Verify that the file still exists after exiting the context
+    assert not os.path.exists(
+        temp_file_path
+    ), f"Temporary file {temp_file_path} should not exist oustside the context with delete_on_close=False"
+
+
+def test_namedtemporaryfile_delete_false_with_pdal():
+    """Test that NamedTemporaryFile could be used on windows in the context
+    with delete_on_close=False and some pdal operations"""
+
+    def read_las(input_las, tmp):
+        pipeline = pdal.Pipeline()
+        pipeline |= pdal.Reader.las(filename=input_las)
+        pipeline |= pdal.Writer.las(filename=tmp.name, forward="all", extra_dims="all")
+        pipeline.execute()
+
+    input_las = os.path.join(TEST_PATH, "data/crop_duplicate.laz")
+    temp_file_path = None
+    with tempfile.NamedTemporaryFile(suffix="_test.las", delete_on_close=False) as tmp:
+        temp_file_path = tmp.name
+        read_las(input_las, tmp)
+        pipeline = pdal.Pipeline()
+        pipeline |= pdal.Reader.las(filename=tmp.name)
+        pipeline.execute()
+        assert os.path.exists(tmp.name)
+
+    # Verify that the file still exists after exiting the context
+    assert not os.path.exists(
+        temp_file_path
+    ), f"Temporary file {temp_file_path} should not exist oustside the context with delete_on_close=False"