diff --git a/doc/grid_radius_assign.md b/doc/grid_radius_assign.md index 52fd15c..3812175 100755 --- a/doc/grid_radius_assign.md +++ b/doc/grid_radius_assign.md @@ -20,7 +20,8 @@ This pipeline updates the Keypoint dimension of all points with classification 1 "src_domain" : "Classification[1:2]", "reference_domain" : "Classification[6:6]", "radius" : 1, - "output_name_attribut": "radius" + "output_name_attribut": "radius", + "is3d": True }, "output.las" ] @@ -43,9 +44,9 @@ Options **output_name_attribut**: The name of the new attribute'. [Default: radius] -**3d_search**: Search in 3d (as a ball). [Default: false] +**is3d**: Search in 3d (as a ball). [Default: false] -**2d_search_above**: If 3d_search is false, take points only if exists points between the referent point and a distance above. [Default: 0.] +**is2d_above**: If is3d is false, take points only if exists points between the referent point and a distance above. [Default: 0.] -**2d_search_bellow**: If 3d_search is false, take points only if exists points between the referent point and a distance bellow. [Default: 0.] +**is2d_bellow**: If is3d is false, take points only if exists points between the referent point and a distance bellow. [Default: 0.] diff --git a/macro/macro.py b/macro/macro.py index 809b410..f4f5b5f 100755 --- a/macro/macro.py +++ b/macro/macro.py @@ -19,7 +19,7 @@ def add_radius_assign(pipeline, radius, search_3d, condition_src, condition_ref, "REF_DOMAIN = 0", f"REF_DOMAIN = 1 WHERE {condition_ref}", "radius_search = 0"]) pipeline |= pdal.Filter.radius_assign(radius=radius, src_domain="SRS_DOMAIN",reference_domain="REF_DOMAIN", - output_dimension="radius_search", search_3d=search_3d) + output_dimension="radius_search", is3d=search_3d) pipeline |= pdal.Filter.assign(value=condition_out,where="radius_search==1") return pipeline diff --git a/src/filter_radius_assign/radius_assignFilter.cpp b/src/filter_radius_assign/radius_assignFilter.cpp index 754dfef..4ac5c9a 100644 --- a/src/filter_radius_assign/radius_assignFilter.cpp +++ b/src/filter_radius_assign/radius_assignFilter.cpp @@ -36,9 +36,9 @@ void RadiusAssignFilter::addArgs(ProgramArgs& args) args.add("reference_domain", "Selects which points will be considered as potential neighbors", m_args->m_referenceDomain, "REF_DOMAIN"); args.add("radius", "Distance of neighbors to consult", m_args->m_radius, 1.); args.add("output_dimension", "Name of the added attribut", m_args->m_outputDimension, "radius"); - args.add("search_3d", "Search in 3d", m_args->search3d, false ); - args.add("search_2d_above", "if search in 2d : filter point above the distance", m_args->m_search_bellow, 0.); - args.add("search_2d_bellow", "if search in 2d : filter point bellow the distance", m_args->m_search_above, 0.); + args.add("is3d", "Search in 3d", m_args->search3d, false ); + args.add("is2d_above", "if search in 2d : filter point above the distance", m_args->m_search_bellow, 0.); + args.add("is2d_bellow", "if search in 2d : filter point bellow the distance", m_args->m_search_above, 0.); } void RadiusAssignFilter::addDimensions(PointLayoutPtr layout) diff --git a/test/test_radius_assign.py b/test/test_radius_assign.py index 4bc759b..07a04bb 100755 --- a/test/test_radius_assign.py +++ b/test/test_radius_assign.py @@ -52,9 +52,9 @@ def run_filter(arrays_las, distance_radius, search_3d, distance_cylinder=0. ): "src_domain": "SRS_DOMAIN", "reference_domain": "REF_DOMAIN", "output_dimension": "radius_search", - "search_3d": search_3d, - "search_2d_above": distance_cylinder, - "search_2d_bellow": distance_cylinder, + "is3d": search_3d, + "is2d_above": distance_cylinder, + "is2d_bellow": distance_cylinder, } ]