Skip to content

Fix clipping extent #92

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JanCaha merged 11 commits into from
Jul 1, 2026
Merged

Fix clipping extent #92

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
d31a8e7
bump version
JanCaha Apr 15, 2026
c862c07
create combined bounds from polygon extent and filter bounds
JanCaha Jun 29, 2026
0bc5124
pass combinedBox to the pipeline
JanCaha Jun 29, 2026
dc8b7eb
version
JanCaha Jun 29, 2026
39928ef
use version from main
JanCaha Jun 30, 2026
8db6955
use ParallelJobInfo filterBounds instead of dedicated variable
JanCaha Jun 30, 2026
9f6b308
use combineBox as filterBounds of ParallelJobInfo
JanCaha Jul 1, 2026
f1ba4cd
the parameter is always string representing PDAL extent
JanCaha Jul 1, 2026
26234db
Apply suggestions from code review
uclaros Jul 1, 2026
a21a4dd
Merge branch 'main' into fix-clipping-extent
JanCaha Jul 1, 2026
ba13bb7
fix link
JanCaha Jul 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 22 additions & 3 deletions src/clip.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ static std::unique_ptr<PipelineManager> pipeline(ParallelJobInfo *tile, const pd
else
{
// Reader can't do the filtering - do it with a filter
last = &manager->makeFilter( "filters.crop", *last, filter_opts);
last = &manager->makeFilter("filters.crop", *last, filter_opts);
}
}
if (!tile->filterExpression.empty())
Expand All @@ -162,6 +162,25 @@ void Clip::preparePipelines(std::vector<std::unique_ptr<PipelineManager>>& pipel
if (!loadPolygons(polygonFile, crop_opts, bbox))
return;

// equal combinedBox to the polygon bounds
// it is never necessary to read more from the input than this
BOX2D combinedBox = BOX2D(bbox);

// if filterBounds is set, combine it with the polygon bounds
if (!filterBounds.empty()) {
BOX2D filterBoundsBox;
std::string::size_type pos = 0;
filterBoundsBox.parse(filterBounds, pos);

// combinedBox is the intersection of the polygon bounds and the filter bounds
combinedBox.clip(filterBoundsBox);
}

if (!combinedBox.valid()) {
std::cerr << "clip bounds are empty or polygon and filter bounds do not overlap" << std::endl;
return;
}

if (isVpcFilename(inputFile))
{
// for /tmp/hello.vpc we will use /tmp/hello dir for all results
Expand All @@ -187,7 +206,7 @@ void Clip::preparePipelines(std::vector<std::unique_ptr<PipelineManager>>& pipel
std::cout << "using " << f.filename << std::endl;
}

ParallelJobInfo tile(ParallelJobInfo::FileBased, BOX2D(), filterExpression, filterBounds);
ParallelJobInfo tile(ParallelJobInfo::FileBased, BOX2D(), filterExpression, box_to_pdal_bounds(combinedBox));
tile.inputFilenames.push_back(f.filename);

tile.outputFilename = tileOutputFileName(outputFile, outputFormatVpc, outputSubdir, f.filename);
Expand All @@ -203,7 +222,7 @@ void Clip::preparePipelines(std::vector<std::unique_ptr<PipelineManager>>& pipel
{
isStreaming = false;
}
ParallelJobInfo tile(ParallelJobInfo::Single, BOX2D(), filterExpression, filterBounds);
ParallelJobInfo tile(ParallelJobInfo::Single, BOX2D(), filterExpression, box_to_pdal_bounds(combinedBox));
tile.inputFilenames.push_back(inputFile);
tile.outputFilename = outputFile;
pipelines.push_back(pipeline(&tile, crop_opts));
Expand Down
2 changes: 1 addition & 1 deletion tests/test_clip.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ def test_input_file_output_file(
(utils.test_data_filepath("data_copc.vpc"), utils.test_data_filepath("clipped-vpc-copc-files.copc.laz"), 66911),
(utils.test_data_filepath("data_copc.vpz"), utils.test_data_filepath("clipped-vpz-copc-files.vpc"), 66911),
(utils.test_data_filepath("data_copc.vpz"), utils.test_data_filepath("clipped-vpz-copc-files.copc.laz"), 66911),
("https://raw.githubusercontent.com/PDAL/wrench/refs/heads/fix-remote-vpc/tests/data/stadium.vpc", utils.test_data_filepath("clipped-vpz-copc-files.copc.laz"), 66905),
("https://raw.githubusercontent.com/PDAL/wrench/f4b156c5081dd9a1d44fccfdb67f2c36e91e3566/tests/data/stadium.vpc", utils.test_data_filepath("clipped-vpz-copc-files.copc.laz"), 66905),
],
)
def test_clip_vpc(
Expand Down
Loading