ign-pdal-tools 1.7.6__py3-none-any.whl → 1.7.8__py3-none-any.whl

{ign_pdal_tools-1.7.6.dist-info → ign_pdal_tools-1.7.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: ign-pdal-tools
-Version: 1.7.6
+Version: 1.7.8
 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.6.dist-info → ign_pdal_tools-1.7.8.dist-info}/RECORD

@@ -1,18 +1,18 @@
-pdaltools/_version.py,sha256=J51Tb9gFrrvFgU9fo3qbvKaTCWayFmNsRBrzb6HjUIM,74
+pdaltools/_version.py,sha256=_9dnWGQSoerUjXo6a6mDsI_oUJbf9SP5h2HkjA-Zd9E,74
 pdaltools/add_points_in_las.py,sha256=TGbt5JUkszjmbQiA2LCUntsjz6A8DHb7QPIXGDuEgWA,3643
-pdaltools/add_points_in_pointcloud.py,sha256=W_b1eBjPPyUO20aHj8BkFgL0qNnkBs7qNnp1fGJ68JA,3725
+pdaltools/add_points_in_pointcloud.py,sha256=g9V_gUA-vOy3wuYdWXFSObDZtSKO2LhzXa5Vy-yypuA,5684
 pdaltools/color.py,sha256=PSdtMMdsapOtgzojdnaKVx6IxbKOaN2xP9mScAbCGm0,8629
 pdaltools/las_add_buffer.py,sha256=sBpTywlfsHHS8KuCUa-eydB2hylshEvjrMQt5TrqXb8,11275
 pdaltools/las_clip.py,sha256=GvEOYu8RXV68e35kU8i42GwSkbo4P9TvmS6rkrdPmFM,1034
-pdaltools/las_info.py,sha256=cVVsOrtwgyOpI093PuXNhs2N7BJIdfW0BgxxRb-XqyQ,8096
+pdaltools/las_info.py,sha256=lMKxKzsViptDENI1wOlANG4qOvdc19ixyasYKD-N1ck,9512
 pdaltools/las_merge.py,sha256=tcFVueV9X9nNEaoAl5zCduY5DETlBg63MAgP2SuKiNo,4121
 pdaltools/las_remove_dimensions.py,sha256=u_3VfkabkN_Y3eDLdJwCLVGpondvIx0f0v0RdFDoAFw,1792
 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.7.6.dist-info/LICENSE.md,sha256=iVzCFZTUXeiqP8bP474iuWZiWO_kDCD4SPh1Wiw125Y,1120
-ign_pdal_tools-1.7.6.dist-info/METADATA,sha256=CwwZbRIegxl51Mi-0WP2_UEmARo7IBVdJf1eRxxT2bM,5722
-ign_pdal_tools-1.7.6.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-ign_pdal_tools-1.7.6.dist-info/top_level.txt,sha256=KvGW0ZzqQbhCKzB5_Tp_buWMZyIgiO2M2krWF_ecOZc,10
-ign_pdal_tools-1.7.6.dist-info/RECORD,,
+ign_pdal_tools-1.7.8.dist-info/LICENSE.md,sha256=iVzCFZTUXeiqP8bP474iuWZiWO_kDCD4SPh1Wiw125Y,1120
+ign_pdal_tools-1.7.8.dist-info/METADATA,sha256=BW25glZH1wZ1Ntgp6MQbPa_iMJZrJNBTs_acW7AxVYg,5722
+ign_pdal_tools-1.7.8.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+ign_pdal_tools-1.7.8.dist-info/top_level.txt,sha256=KvGW0ZzqQbhCKzB5_Tp_buWMZyIgiO2M2krWF_ecOZc,10
+ign_pdal_tools-1.7.8.dist-info/RECORD,,

{ign_pdal_tools-1.7.6.dist-info → ign_pdal_tools-1.7.8.dist-info}/WHEEL

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

pdaltools/_version.py

@@ -1,4 +1,4 @@
-__version__ = "1.7.6"
+__version__ = "1.7.8"
 
 
 if __name__ == "__main__":

pdaltools/add_points_in_pointcloud.py

@@ -1,47 +1,63 @@
+import argparse
+import shutil
+
 import geopandas as gpd
 import laspy
 import numpy as np
+from pyproj import CRS
+from pyproj.exceptions import CRSError
 from shapely.geometry import box
 
-from pdaltools.las_info import get_tile_origin_using_header_info
-
-
-def get_tile_bbox(input_las, tile_width=1000) -> tuple:
-    """
-    Get the theoretical bounding box (xmin, ymin, xmax, ymax) of a LIDAR tile
-    using its origin and the predefined tile width.
-
-    Args:
-        input_las (str): Path to the LIDAR `.las/.laz` file.
-        tile_width (int): Width of the tile in meters (default: 1000).
-
-    Returns:
-        tuple: Bounding box as (xmin, ymin, xmax, ymax).
-    """
-    origin_x, origin_y = get_tile_origin_using_header_info(input_las)
-    bbox = (origin_x, origin_y - tile_width, origin_x + tile_width, origin_y)
-    return bbox
-
-
-def clip_3d_points_to_tile(input_points: str, input_las: str, crs: str) -> gpd.GeoDataFrame:
+from pdaltools.las_info import get_epsg_from_las, get_tile_bbox
+
+
+def parse_args(argv=None):
+    parser = argparse.ArgumentParser("Add points from GeoJSON in LIDAR tile")
+    parser.add_argument("--input_geojson", "-ig", type=str, required=True, help="Input GeoJSON file")
+    parser.add_argument("--input_las", "-i", type=str, required=True, help="Input las file")
+    parser.add_argument("--output_las", "-o", type=str, required=True, default="", help="Output las file")
+    parser.add_argument(
+        "--virtual_points_classes",
+        "-c",
+        type=int,
+        default=66,
+        help="classification value to assign to the added virtual points",
+    )
+    parser.add_argument(
+        "--spatial_ref",
+        type=str,
+        required=False,
+        help="spatial reference for the writer",
+    )
+    parser.add_argument(
+        "--tile_width",
+        type=int,
+        default=1000,
+        help="width of tiles in meters",
+    )
+
+    return parser.parse_args(argv)
+
+
+def clip_3d_points_to_tile(input_points: str, input_las: str, crs: str, tile_width: int) -> gpd.GeoDataFrame:
     """
     Add points from a GeoJSON file in the LIDAR's tile.
 
     Args:
         input_points (str): Path to the input GeoJSON file with 3D points.
         input_las (str): Path to the LIDAR `.las/.laz` file.
-        crs (str): CRS of the data, e.g., 'EPSG:2154'.
+        crs (str): CRS of the data.
+        tile_width (int): Width of the tile in meters (default: 1000).
 
     Return:
         gpd.GeoDataFrame: Points 2d with "Z" value
     """
     # Compute the bounding box of the LIDAR tile
-    tile_bbox = get_tile_bbox(input_las)
+    tile_bbox = get_tile_bbox(input_las, tile_width)
 
     # Read the input GeoJSON with 3D points
     points_gdf = gpd.read_file(input_points)
 
-    # Ensure the CRS matches
     if crs:
         points_gdf = points_gdf.to_crs(crs)
 
@@ -55,7 +71,7 @@ def clip_3d_points_to_tile(input_points: str, input_las: str, crs: str) -> gpd.G
 
 
 def add_points_to_las(
-    input_points_with_z: gpd.GeoDataFrame, input_las: str, output_las: str, virtual_points_classes=66
+    input_points_with_z: gpd.GeoDataFrame, input_las: str, output_las: str, crs: str, virtual_points_classes=66
 ):
     """Add points (3D points in LAZ format) by LIDAR tiles (tiling file)
 
@@ -63,11 +79,17 @@ def add_points_to_las(
         input_points_with_z(gpd.GeoDataFrame): geometry columns (2D points) as encoded to WKT.
         input_las (str): Path to the LIDAR tiles (LAZ).
         output_las (str): Path to save the updated LIDAR file (LAS/LAZ format).
+        crs (str): CRS of the data.
         virtual_points_classes (int): The classification value to assign to those virtual points (default: 66).
     """
-    # Check if input points are empty
+
     if input_points_with_z.empty:
-        raise ValueError("No points to add. The input GeoDataFrame is 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)
     x_coords = input_points_with_z.geometry.x
@@ -75,28 +97,63 @@ def add_points_to_las(
     z_coords = input_points_with_z.RecupZ
     classes = virtual_points_classes * np.ones(len(input_points_with_z.index))
 
-    # Read the existing LIDAR file
     with laspy.open(input_las, mode="r") as las:
         las_data = las.read()
         header = las.header
 
-        # Create a new header if the original header is missing or invalid
-        if header is None:
-            header = laspy.LasHeader(point_format=6, version="1.4")  # Example format and version
+        if not header:
+            header = laspy.LasHeader(point_format=8, version="1.4")
+        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)
 
-        # Append the clipped points to the existing LIDAR data
+        # 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])
 
-        # Create a new LAS file with updated data
         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
 
-        # Write the updated LAS file
         with laspy.open(output_las, mode="w", header=header, do_compress=True) as writer:
             writer.write_points(updated_las.points)
+
+
+def add_points_from_geojson_to_las(
+    input_geojson: str, input_las: str, output_las: str, virtual_points_classes: int, spatial_ref: str, tile_width: int
+):
+    """Add points with Z value(GeoJSON format) by LIDAR tiles (tiling file)
+
+    Args:
+        input_geojson (str): Path to the input GeoJSON file with 3D points.
+        input_las (str): Path to the LIDAR `.las/.laz` file.
+        output_las (str): Path to save the updated LIDAR file (LAS/LAZ format).
+        virtual_points_classes (int): The classification value to assign to those virtual points (default: 66).
+        spatial_ref (str): CRS of the data.
+        tile_width (int): Width of the tile in meters (default: 1000).
+
+    Raises:
+        RuntimeError: If the input LAS file has no valid EPSG code.
+    """
+    if not spatial_ref:
+        spatial_ref = get_epsg_from_las(input_las)
+        if spatial_ref is None:
+            raise RuntimeError(f"LAS file {input_las} does not have a valid EPSG code.")
+
+    # Clip points from GeoJSON by LIDAR tile
+    points_clipped = clip_3d_points_to_tile(input_geojson, input_las, spatial_ref, tile_width)
+
+    # Add points by LIDAR tile and save the result
+    add_points_to_las(points_clipped, input_las, output_las, spatial_ref, virtual_points_classes)
+
+
+if __name__ == "__main__":
+    args = parse_args()
+    add_points_from_geojson_to_las(**vars(args))

pdaltools/las_info.py

@@ -1,8 +1,10 @@
 import json
 import logging
 import os
+from pathlib import Path
 from typing import Dict, Tuple
 
+import laspy
 import osgeo.osr as osr
 import pdal
 
@@ -50,6 +52,23 @@ def get_tile_origin_using_header_info(filename: str, tile_width: int = 1000) ->
     return infer_tile_origin(minx, maxx, miny, maxy, tile_width)
 
 
+def get_tile_bbox(input_las, tile_width=1000) -> tuple:
+    """
+    Get the theoretical bounding box (xmin, ymin, xmax, ymax) of a LIDAR tile
+    using its origin and the predefined tile width.
+
+    Args:
+        input_las (str): Path to the LIDAR `.las/.laz` file.
+        tile_width (int): Width of the tile in meters (default: 1000).
+
+    Returns:
+        tuple: Bounding box as (xmin, ymin, xmax, ymax).
+    """
+    origin_x, origin_y = get_tile_origin_using_header_info(input_las, tile_width)
+    bbox = (origin_x, origin_y - tile_width, origin_x + tile_width, origin_y)
+    return bbox
+
+
 def get_epsg_from_header_info(metadata):
     if "srs" not in metadata.keys():
         raise RuntimeError("EPSG could not be inferred from metadata: No 'srs' key in metadata.")
@@ -142,7 +161,14 @@ def parse_filename(file: str):
     For example Semis_2021_0000_1111_LA93_IGN69.las"""
     basename = os.path.basename(file)  # Make sure that we work on the base name and not the full path
 
-    prefix1, prefix2, coordx, coordy, suffix = basename.split("_", 4)
+    try:
+        prefix1, prefix2, coordx, coordy, suffix = basename.split("_", 4)
+    except ValueError:
+        raise ValueError(
+            f"Filename {Path(file).name} does not have the expected format. "
+            "Expected prefix1_prefix2_coordx_coordy_suffix"
+        )
+
     prefix = f"{prefix1}_{prefix2}"
 
     return prefix, int(coordx), int(coordy), suffix
@@ -211,3 +237,20 @@ def get_writer_parameters_from_reader_metadata(metadata: Dict, a_srs=None) -> Di
         "a_srs": a_srs if a_srs else reader_metadata["comp_spatialreference"],
     }
     return params
+
+
+def get_epsg_from_las(filename: str) -> str:
+    """Extract EPSG code from LAS file metadata and return as 'EPSG:XXXX' format.
+
+    Args:
+        filename (str): full path of file for which to get the bounding box
+
+    Returns:
+        str : CRS's value of the data in 'EPSG:XXXX' format, or None if not found.
+    """
+    with laspy.open(filename) as las:
+        crs = las.header.parse_crs()
+        if crs is None:
+            return None  # Return None if CRS is not defined
+        epsg_code = crs.to_epsg()
+        return f"EPSG:{epsg_code}" if epsg_code else None