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

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

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

@@ -1,5 +1,5 @@
-ign_pdal_tools-1.15.2.dist-info/licenses/LICENSE.md,sha256=iVzCFZTUXeiqP8bP474iuWZiWO_kDCD4SPh1Wiw125Y,1120
-pdaltools/_version.py,sha256=ANK0EiTSy8uKrYS4qzoFG1GgYJHrvDzj7sGS2FdpOss,75
+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
@@ -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=sx5cDv1r-mehbP1z3QRYO-uhJDh7dnp2RWZZ1ZoVsK0,8082
+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.2.dist-info/METADATA,sha256=ZwOqUTpmld9k5_8RJNZP6NdIAsFEtDyKO2CQlPZnLsE,6146
-ign_pdal_tools-1.15.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ign_pdal_tools-1.15.2.dist-info/top_level.txt,sha256=KvGW0ZzqQbhCKzB5_Tp_buWMZyIgiO2M2krWF_ecOZc,10
-ign_pdal_tools-1.15.2.dist-info/RECORD,,
+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,,

pdaltools/_version.py

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

pdaltools/replace_area_in_pointcloud.py

@@ -102,21 +102,29 @@ 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_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}")
+
+    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")
@@ -134,6 +142,11 @@ def pipeline_read_from_DSM(dsm, ground_mask, 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()
@@ -146,7 +159,8 @@ def replace_area(
     pipeline_target |= pdal.Filter.overlay(column="fid", dimension="geometryFid", datasource=replacement_area)
     # Keep only points out of the area
     pipeline_target |= pdal.Filter.expression(expression="geometryFid==-1", tag="A")
-    pipeline_target.execute()
+    target_count = pipeline_target.execute()
+    print("Step 1: target count: ", target_count)
 
     # get input dimensions dtype from target
     if pipeline_target.arrays:
@@ -177,10 +191,11 @@ def replace_area(
     pipeline_source |= pdal.Filter.overlay(column="fid", dimension="geometryFid", datasource=replacement_area)
     # Keep only points in the area
     pipeline_source |= pdal.Filter.expression(expression="geometryFid>=0", tag="B")
-    pipeline_source.execute()
+    source_count = pipeline_source.execute()
+    print("Step 2: source count: ", source_count)
 
     # add source to the result
-    if pipeline_source.arrays:
+    if source_count:
         # eventually add dimensions in source to have same dimensions as target cloud
         # we do that in numpy (instead of PDAL filter) to keep dimension types
         source_cloud_crop = pipeline_source.arrays[0]