ign-pdal-tools 1.12.2__py3-none-any.whl → 1.13.0__py3-none-any.whl

{ign_pdal_tools-1.12.2.dist-info → ign_pdal_tools-1.13.0.dist-info}/METADATA

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

@@ -1,20 +1,20 @@
-ign_pdal_tools-1.12.2.dist-info/licenses/LICENSE.md,sha256=iVzCFZTUXeiqP8bP474iuWZiWO_kDCD4SPh1Wiw125Y,1120
-pdaltools/_version.py,sha256=hNkZafWzNyaa6UC2MRErLwCS5CjHrj7c2pqE_mjcoug,75
-pdaltools/add_points_in_pointcloud.py,sha256=6NclQeAFYyVz3kfJ114BEFKfM5nwWWC2c8iN4IpaPOc,12662
+ign_pdal_tools-1.13.0.dist-info/licenses/LICENSE.md,sha256=iVzCFZTUXeiqP8bP474iuWZiWO_kDCD4SPh1Wiw125Y,1120
+pdaltools/_version.py,sha256=e2YiSbYkwkZS7qav4oHKZKNWlgK0RiKNeOJMR4ehiLE,75
+pdaltools/add_points_in_pointcloud.py,sha256=VM2HW2b1Ul_I8jtXaOpTsmyGjiEFgoSi8AmCLuj6gH8,12697
 pdaltools/color.py,sha256=vJgpb8dOvT5rnq5NdVOaMdGc_pKL3damLy4HwGvigJQ,14472
-pdaltools/create_random_laz.py,sha256=kFe5iHeHlkgKWRIKjK5l1AD65OG4qLYwAZdO1Wcvuos,5255
+pdaltools/create_random_laz.py,sha256=XuHH4G8Nrs8DB-F8bkcIeto7JtmrlrNGF_R66oxGCbQ,6069
 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=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/las_rename_dimension.py,sha256=FEWIcq0ZZiv9xWbCLDRE9Hzb5K0YYfoi3Z8IZFEs-uU,2887
 pdaltools/pcd_info.py,sha256=NIAH5KGikVDQLlbCcw9FuaPqe20UZvRfkHsDZd5kmZA,3210
 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.12.2.dist-info/METADATA,sha256=cOFyIrusuyvAsB_nrIRUaV0Y9h-Nle8ou8FU3POAoAA,5778
-ign_pdal_tools-1.12.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ign_pdal_tools-1.12.2.dist-info/top_level.txt,sha256=KvGW0ZzqQbhCKzB5_Tp_buWMZyIgiO2M2krWF_ecOZc,10
-ign_pdal_tools-1.12.2.dist-info/RECORD,,
+ign_pdal_tools-1.13.0.dist-info/METADATA,sha256=vDALkrn5DTjmZxajqmuFyB5EaFygXyGxTumBoTQQLLg,5778
+ign_pdal_tools-1.13.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ign_pdal_tools-1.13.0.dist-info/top_level.txt,sha256=KvGW0ZzqQbhCKzB5_Tp_buWMZyIgiO2M2krWF_ecOZc,10
+ign_pdal_tools-1.13.0.dist-info/RECORD,,

pdaltools/_version.py

@@ -1,4 +1,4 @@
-__version__ = "1.12.2"
+__version__ = "1.13.0"
 
 
 if __name__ == "__main__":

pdaltools/add_points_in_pointcloud.py

@@ -29,7 +29,7 @@ def parse_args(argv=None):
         "--spatial_ref",
         type=str,
         required=False,
-        help="spatial reference for the writer",
+        help="spatial reference for the writer (eg: 'EPSG:2154')",
     )
     parser.add_argument(
         "--tile_width",
@@ -169,7 +169,7 @@ def add_points_to_las(
         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 |= pdal.Writer.las(filename=output_las, forward="all", extra_dims="all", a_srs=a_srs)
         pipeline.execute()
 
 
@@ -281,7 +281,7 @@ def add_points_from_geometry_to_las(
     gdf = gpd.read_file(input_geometry)
 
     if gdf.crs is None:
-        gdf.set_crs(epsg=spatial_ref, inplace=True)
+        gdf.set_crs(crs=spatial_ref, inplace=True)
 
     # Check if both Z in geometries and altitude_column are provided
     if gdf.geometry.has_z.any() and altitude_column:

pdaltools/create_random_laz.py

@@ -8,11 +8,12 @@ from typing import List, Tuple
 
 def create_random_laz(
     output_file: str,
-    point_format: int = 3,
+    point_format: int = 6,
     num_points: int = 100,
     crs: int = 2154,
     center: Tuple[float, float] = (650000, 6810000),
     extra_dims: List[Tuple[str, str]] = [],
+    classifications: List[int] = None,
 ):
     """
     Create a test LAZ file with EPSG code and additional dimensions.
@@ -26,6 +27,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. 
     """
 
     # Create a new point cloud
@@ -52,7 +54,7 @@ def create_random_laz(
         numpy_type = type_mapping[dim_type]
         header.add_extra_dim(laspy.ExtraBytesParams(name=dim_name, type=numpy_type))
 
-        # Create point cloud
+    # Create point cloud
     las = laspy.LasData(header)
     las.header.add_crs(CRS.from_string(f"epsg:{crs}"))
 
@@ -64,14 +66,19 @@ def create_random_laz(
     # Generate random intensity values
     las.intensity = np.random.randint(0, 255, num_points)
 
-    # Generate random classification values
-    # 66 is the max value for classification of IGN LidarHD
-    # cf. https://geoservices.ign.fr/sites/default/files/2022-05/DT_LiDAR_HD_1-0.pdf
-    if point_format > 3:
-        num_classifications = 66
+    # Set classification values
+    if classifications:
+        # Randomly select from the provided classification values
+        las.classification = np.random.choice(classifications, size=num_points, replace=True).astype(np.uint8)
     else:
-        num_classifications = 10
-    las.classification = np.random.randint(0, num_classifications, num_points)
+        # Generate random classification values if not provided
+        # 66 is the max value for classification of IGN LidarHD
+        # cf. https://geoservices.ign.fr/sites/default/files/2022-05/DT_LiDAR_HD_1-0.pdf
+        if point_format >= 6:
+            num_classifications = 66
+        else:
+            num_classifications = 10
+        las.classification = np.random.randint(0, num_classifications, num_points, dtype=np.uint8)
 
     # Generate random values for each extra dimension
     for dim_name, dim_type in extra_dims:
@@ -112,20 +119,24 @@ def parse_args():
     # Parse arguments (assuming argparse is used)
     parser = argparse.ArgumentParser(description="Create a random LAZ file.")
     parser.add_argument("--output_file", type=str, help="Path to save the LAZ file")
-    parser.add_argument("--point_format", type=int, default=3, help="Point format of the LAZ file")
+    parser.add_argument("--point_format", type=int, default=6, help="Point format of the LAZ file")
     parser.add_argument("--num_points", type=int, default=100, help="Number of points to generate")
     parser.add_argument(
         "--extra_dims", type=str, nargs="*", default=[], help="Extra dimensions in the format name:type"
     )
     parser.add_argument("--crs", type=int, default=2154, help="Projection code")
     parser.add_argument(
-        "--center", type=str, default="650000,6810000", help="Center of the area to generate points in"
+        "--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)"
     )
     return parser.parse_args()
 
 
 def main():
-
     # Parse arguments
     args = parse_args()
 
@@ -133,10 +144,21 @@ def main():
     extra_dims = [tuple(dim.split(":")) for dim in args.extra_dims]
 
     # Parse center
-    center = tuple(map(float, args.center.split(",")))
+    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)
+    result = create_random_laz(
+        args.output_file, 
+        args.point_format, 
+        args.num_points, 
+        args.crs, 
+        center, 
+        extra_dims,
+        classifications
+    )
 
     # Test output file
     test_output_file(result, args.output_file)

pdaltools/las_rename_dimension.py

@@ -5,10 +5,12 @@ 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
+from pdaltools.las_info import las_info_metadata
 
 
 def rename_dimension(input_file: str, output_file: str, old_dims: list[str], new_dims: list[str]):
@@ -31,8 +33,14 @@ def rename_dimension(input_file: str, output_file: str, old_dims: list[str], new
         if dim in mandatory_dimensions:
             raise ValueError(f"New dimension {dim} cannot be a mandatory dimension (X,Y,Z,x,y,z)")
 
+    metadata = las_info_metadata(input_file)
+    input_dimensions = metadata["dimensions"]
+
     pipeline = pdal.Pipeline() | pdal.Reader.las(input_file)
     for old, new in zip(old_dims, new_dims):
+        if old not in input_dimensions:
+            logging.warning(f"Dimension {old} not found in input file : we cannot rename it")
+            continue
         pipeline |= pdal.Filter.ferry(dimensions=f"{old} => {new}")
     pipeline |= pdal.Writer.las(output_file)
     pipeline.execute()