Skip to content

Commit

Permalink
Remove Bounds from Key constructor.
Browse files Browse the repository at this point in the history
  • Loading branch information
connormanning committed Mar 5, 2019
1 parent 514524e commit 1629a3d
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
5 changes: 3 additions & 2 deletions io/EptAddonWriter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -193,8 +193,9 @@ void EptAddonWriter::writeOne(const PointViewPtr view, const Addon& addon) const

// Write the addon hierarchy data.
Json::Value h;
const Key key(m_info->bounds());
writeHierarchy(h, Key(m_info->bounds()), hierEp);
Key key;
key.b = m_info->bounds();
writeHierarchy(h, key, hierEp);
hierEp.put(key.toString() + ".json", h.toStyledString());

m_pool->await();
Expand Down
3 changes: 2 additions & 1 deletion io/EptReader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,8 @@ void EptReader::overlaps()
//
// Because this may require fetching lots of JSON files, it'll run in our
// thread pool.
const Key key(m_info->bounds());
Key key;
key.b = m_info->bounds();
const std::string file("ept-hierarchy/" + key.toString() + ".json");

{
Expand Down
2 changes: 1 addition & 1 deletion io/private/EptSupport.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ class PDAL_DLL Key
// An EPT key representation (see https://git.io/fAiBh). A depth/X/Y/Z key
// representing a data node, as well as the bounds of the contained data.
public:
Key(BOX3D b) : b(b) { }
Key() { }
Key(std::string s)
{
const std::vector<std::string> tokens(Utils::split(s, '-'));
Expand Down

0 comments on commit 1629a3d

Please sign in to comment.