ign-pdal-tools 1.15.1__py3-none-any.whl → 1.15.3__py3-none-any.whl

{ign_pdal_tools-1.15.1.dist-info → ign_pdal_tools-1.15.3.dist-info}/METADATA

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

@@ -1,6 +1,6 @@
-ign_pdal_tools-1.15.1.dist-info/licenses/LICENSE.md,sha256=iVzCFZTUXeiqP8bP474iuWZiWO_kDCD4SPh1Wiw125Y,1120
-pdaltools/_version.py,sha256=Ifg5508wmTI_52FvVJqD1IBETM-8iJe8gIBnxxVL1UI,75
-pdaltools/add_points_in_pointcloud.py,sha256=VM2HW2b1Ul_I8jtXaOpTsmyGjiEFgoSi8AmCLuj6gH8,12697
+ign_pdal_tools-1.15.3.dist-info/licenses/LICENSE.md,sha256=iVzCFZTUXeiqP8bP474iuWZiWO_kDCD4SPh1Wiw125Y,1120
+pdaltools/_version.py,sha256=kbqZcb5X6kCQzhP5k9ki5_yUYO5nUoW5BIsGseJ1Rz4,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
@@ -12,11 +12,11 @@ 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=VyLMDItP-FU4muRV01vbetf5ySgdKeOpc55YESicJ7U,8008
+pdaltools/replace_area_in_pointcloud.py,sha256=fWh9YLwwB7hUndNSIHbCvRVZRfwSrmkv4we0PEd1fJw,8594
 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.1.dist-info/METADATA,sha256=3mwPLGrnvNs6FuL_f6iSbFq1Zb5mlVnTjdGidcs8SLI,6146
-ign_pdal_tools-1.15.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ign_pdal_tools-1.15.1.dist-info/top_level.txt,sha256=KvGW0ZzqQbhCKzB5_Tp_buWMZyIgiO2M2krWF_ecOZc,10
-ign_pdal_tools-1.15.1.dist-info/RECORD,,
+ign_pdal_tools-1.15.3.dist-info/METADATA,sha256=HES6lKZwoiaArDrjrqrazbY-xtcqdjM2QxXG71NV0p4,6146
+ign_pdal_tools-1.15.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ign_pdal_tools-1.15.3.dist-info/top_level.txt,sha256=KvGW0ZzqQbhCKzB5_Tp_buWMZyIgiO2M2krWF_ecOZc,10
+ign_pdal_tools-1.15.3.dist-info/RECORD,,

pdaltools/_version.py

@@ -1,4 +1,4 @@
-__version__ = "1.15.1"
+__version__ = "1.15.3"
 
 
 if __name__ == "__main__":

pdaltools/add_points_in_pointcloud.py

@@ -6,6 +6,7 @@ import geopandas as gpd
 import laspy
 import numpy as np
 import pdal
+from shapely import set_precision
 from shapely.geometry import MultiPoint, Point, box
 
 from pdaltools.las_info import get_epsg_from_las, get_tile_bbox
@@ -327,6 +328,10 @@ def add_points_from_geometry_to_las(
     # Clip points from GeoJSON by LIDAR tile
     points_clipped = clip_3d_points_to_tile(points_gdf, input_las, spatial_ref, tile_width)
 
+    # Remove duplicate points (due to precision issue) - las file have centrimetric precision
+    points_clipped.geometry = set_precision(points_clipped.geometry, grid_size=0.01)
+    points_clipped = points_clipped.drop_duplicates()
+
     # Add points by LIDAR tile and save the result
     add_points_to_las(points_clipped, input_las, output_las, spatial_ref, virtual_points_classes)
 

pdaltools/replace_area_in_pointcloud.py

@@ -33,13 +33,14 @@ def argument_parser():
         help="path of the source digital surface model (DSM), used to generate source points",
     )
     from_DSM.add_argument(
-        "--source_ground_area",
+        "--source_ground_mask",
         "-g",
         required=True,
         type=str,
         help=(
-            "area of the ground, used to intersect source cloud. "
-            "(shapefile, geojson or other format readable by GDAL)"
+            "ground mask, a raster file used to filter source cloud. "
+            "Pixel with value > 0 is considered as ground, and define the source cloud we keep. "
+            "(tif or other raster format readable by GDAL)"
         ),
     )
     from_DSM.add_argument(
@@ -65,7 +66,7 @@ def add_common_options(parser):
         "-r",
         required=True,
         type=str,
-        help="area to replace (shapefile, geojson or other format readable by GDAL)",
+        help="area to replace (shapefile, geojson or other vector format readable by GDAL)",
     )
     parser.add_argument("--output_cloud", "-o", required=True, type=str, help="output cloud file")
 
@@ -84,7 +85,7 @@ def from_DSM_func(args):
     replace_area(
         target_cloud=args.target_cloud,
         pipeline_source=pipeline_read_from_DSM(
-            dsm=args.source_dsm, ground_area=args.source_ground_area, classification=args.source_classification
+            dsm=args.source_dsm, ground_mask=args.source_ground_mask, classification=args.source_classification
         ),
         replacement_area=args.replacement_area,
         output_cloud=args.output_cloud,
@@ -101,27 +102,35 @@ def get_writer_params(input_file):
 
 
 def pipeline_read_from_cloud(filename):
+    print("source cloud: ", filename)
     pipeline_source = pdal.Pipeline()
     pipeline_source |= pdal.Reader.las(filename=filename)
     return pipeline_source
 
 
-def pipeline_read_from_DSM(dsm, ground_area, classification):
+def pipeline_read_from_DSM(dsm, ground_mask, classification):
+    print("DSM: ", dsm)
+    print("ground_mask: ", ground_mask)
+    print("classification: ", classification)
+
     # get nodata value
     ds = gdal.Open(dsm)
     band = ds.GetRasterBand(1)
     nodata_value = band.GetNoDataValue()
+    print("DSM: nodata:", nodata_value)
     ds.Close()
 
     pipeline = pdal.Pipeline()
     pipeline |= pdal.Reader.gdal(filename=dsm, header="Z")
-    pipeline |= pdal.Filter.expression(expression=f"Z != {nodata_value}")
 
-    pipeline |= pdal.Filter.ferry(dimensions="=> geometryFid")
-    pipeline |= pdal.Filter.assign(assignment="geometryFid[:]=-1")
-    pipeline |= pdal.Filter.overlay(column="fid", dimension="geometryFid", datasource=ground_area)
+    if nodata_value is not None:  # nodata_value may be None and cause bugs
+        pipeline |= pdal.Filter.expression(expression=f"Z != {nodata_value}")
+
+    pipeline |= pdal.Filter.ferry(dimensions="=> ground")
+    pipeline |= pdal.Filter.assign(assignment="ground[:]=-1")
+    pipeline |= pdal.Filter.colorization(dimensions="ground:1:1.0", raster=ground_mask)
     # Keep only points in the area
-    pipeline |= pdal.Filter.expression(expression="geometryFid>=0")
+    pipeline |= pdal.Filter.expression(expression="ground>0")
 
     # assign class
     pipeline |= pdal.Filter.ferry(dimensions="=>Classification")
@@ -133,6 +142,11 @@ def pipeline_read_from_DSM(dsm, ground_area, classification):
 def replace_area(
     target_cloud, pipeline_source, replacement_area, output_cloud, source_pdal_filter="", target_pdal_filter=""
 ):
+    print("target cloud: ", target_cloud)
+    print("replacement area: ", replacement_area)
+    print("output cloud: ", output_cloud)
+    print("source pdal filter: ", source_pdal_filter)
+    print("target pdal filter: ", target_pdal_filter)
     crops = []
     # pipeline to read target_cloud and remove points inside the polygon
     pipeline_target = pdal.Pipeline()