Skip to content
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

Use an existing offset if possible. #112

Merged
merged 5 commits into from
Jan 25, 2022
Merged

Use an existing offset if possible. #112

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0eb3040
Modify offset calculation to take scale factor into account.
abellgithub Nov 1, 2021
2e6eb18
Update comment.
abellgithub Nov 1, 2021
0c8b849
Fix comment.
abellgithub Nov 2, 2021
b1aa3a1
Merge remote-tracking branch 'origin/main' into issue-88
abellgithub Jan 21, 2022
dbe9bd0
Use pre-existing offset if possible.
abellgithub Jan 24, 2022
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
32 changes: 31 additions & 1 deletion epf/Epf.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,10 @@ PointCount Epf::createFileInfo(const StringList& input, StringList dimNames,
filenames.push_back(filename);
}

std::vector<double> xOffsets;
std::vector<double> yOffsets;
std::vector<double> zOffsets;

// Determine a driver for each file and get a preview of the file. If we couldn't
// Create a FileInfo object containing the file bounds, dimensions, filename and
// associated driver. Expand our grid by the bounds and file point count.
Expand Down Expand Up @@ -315,6 +319,15 @@ PointCount Epf::createFileInfo(const StringList& input, StringList dimNames,
m = root.findChild("scale_z");
if (m.valid())
m_b.scale[2] = (std::max)(m_b.scale[2], m.value<double>());
m = root.findChild("offset_x");
if (m.valid())
xOffsets.push_back(m.value<double>());
m = root.findChild("offset_y");
if (m.valid())
yOffsets.push_back(m.value<double>());
m = root.findChild("offset_z");
if (m.valid())
zOffsets.push_back(m.value<double>());

FileInfo fi;
fi.bounds = qi.m_bounds;
Expand All @@ -340,9 +353,26 @@ PointCount Epf::createFileInfo(const StringList& input, StringList dimNames,
totalPoints += fi.numPoints;
}

// If we had an offset from the input, choose one in the middle of the list of offsets.
if (xOffsets.size())
{
std::sort(xOffsets.begin(), xOffsets.end());
m_b.offset[0] = xOffsets[xOffsets.size() / 2];
}
if (yOffsets.size())
{
std::sort(yOffsets.begin(), yOffsets.end());
m_b.offset[1] = yOffsets[yOffsets.size() / 2];
}
if (zOffsets.size())
{
std::sort(zOffsets.begin(), zOffsets.end());
m_b.offset[2] = zOffsets[zOffsets.size() / 2];
}

// If we have LAS start capability, break apart file infos into chunks of size 5 million.
#ifdef PDAL_LAS_START
PointCount ChunkSize = 5000000;
PointCount ChunkSize = 5'000'000;
for (const FileInfo& fi : tempFileInfos)
{
if (fi.driver != "readers.las" || fi.numPoints < ChunkSize)
Expand Down