diff --git a/kernels/info/InfoKernel.cpp b/kernels/info/InfoKernel.cpp index 5ed58d094f..a14df98ba0 100644 --- a/kernels/info/InfoKernel.cpp +++ b/kernels/info/InfoKernel.cpp @@ -406,7 +406,7 @@ MetadataNode InfoKernel::dumpQuery(PointViewPtr inView) const else count = 0; if (count == 0) - throw pdal_error("Invalid location specificiation. " + throw pdal_error("Invalid location specification. " "--query=\"X,Y[/count]\""); auto seps = [](char c){ return (c == ',' || c == '|' || c == ' '); }; diff --git a/plugins/hexbin/filters/HexBin.cpp b/plugins/hexbin/filters/HexBin.cpp index 63c77be7c2..7a974d3f0b 100644 --- a/plugins/hexbin/filters/HexBin.cpp +++ b/plugins/hexbin/filters/HexBin.cpp @@ -95,8 +95,21 @@ void HexBin::filter(PointView& view) void HexBin::done(PointTableRef table) { m_grid->processSample(); - m_grid->findShapes(); - m_grid->findParentPaths(); + + try + { + m_grid->findShapes(); + m_grid->findParentPaths(); + } + catch (hexer::hexer_error& e) + { + m_metadata.add("error", e.what(), "Hexer threw an error and was unable to compute a boundary"); + m_metadata.add("boundary", "MULTIPOLYGON EMPTY", "Empty polygon -- unable to compute boundary"); + + return; + + } + std::ostringstream offsets; offsets << "MULTIPOINT ("; diff --git a/scripts/docker/Dockerfile b/scripts/docker/Dockerfile index e464d326e9..664827ad4e 100644 --- a/scripts/docker/Dockerfile +++ b/scripts/docker/Dockerfile @@ -56,7 +56,7 @@ RUN git clone https://github.com/PDAL/PRC.git \ && cmake \ -DCMAKE_BUILD_TYPE=Release \ -DPDAL_DIR=/usr/lib/pdal/cmake \ - -DCMAKE_BUILD_PREFIX=/usr \ + -DCMAKE_INSTALL_PREFIX=/usr \ .. \ && make \ && make install \ diff --git a/src/Dimension.json b/src/Dimension.json index 5e756a2b7d..ee9c4bd775 100644 --- a/src/Dimension.json +++ b/src/Dimension.json @@ -327,5 +327,15 @@ "alt_names": "Elevation_High", "type": "double", "description": "Elevation High" + }, + { + "name": "PointId", + "type": "uint32", + "description": "An explicit representation of point ordering within a file, which allows this usually-implicit information to be preserved when reordering points." + }, + { + "name": "OriginId", + "type": "uint32", + "description": "A file source ID from which the point originated. This ID is global to a derivative dataset which may be aggregated from multiple files." } ] }