Add function to get all packed points from a PDALPointViewPtr

Author: jimmysoda

source/pdal/capi/PointView.cpp

@@ -143,6 +143,40 @@ namespace pdal
 
 				return size;
 			}
+
+			uint64_t PDALGetAllPackedPoints(PDALPointViewPtr view, PDALDimTypeListPtr dims, char *buf)
+			{
+				uint64_t size = 0;
+
+				if (view && dims && buf)
+				{
+					pdal::capi::PointView *capiView = reinterpret_cast<pdal::capi::PointView *>(view);
+
+					pdal::capi::DimTypeList *capiDims = reinterpret_cast<pdal::capi::DimTypeList *>(dims);
+
+
+					if (*capiView && *capiDims)
+					{
+						pdal::DimTypeList *list = capiDims->get();
+
+						for (unsigned i = 0; i < (*capiView)->size(); ++i)
+						{
+							size_t pointSize = 0;
+							(*capiView)->getPackedPoint(*list, i, buf);
+
+							for (const auto &dim : *list)
+							{
+								pointSize += pdal::Dimension::size(dim.m_type);
+							}
+
+							buf += pointSize;
+							size += pointSize;
+						}
+					}
+				}
+
+				return size;
+			}
 		}
 	}
 }

source/pdal/capi/PointView.h

@@ -101,19 +101,30 @@ namespace pdal
 			PDAL_C_API PDALPointLayoutPtr PDALGetPointViewLayout(PDALPointViewPtr view);
 
 			/**
-			 * Fill a buffer with point data specified by the dimension list.
+			 * Retrieves data for a point based on the provided dimension list.
 			 *
 			 * @see pdal::PointView::getPackedPoint
 			 *
 			 * @param view The view that contains the point
-			 * @param dims List of dimensions/types to retrieve.
-			 * @param idx Index of point to get.
-			 * @param[out] buf Pointer to buffer to fill.
+			 * @param dims List of dimensions to retrieve
+			 * @param idx Index of point to get
+			 * @param[out] buf Pointer to buffer to fill
 			 * @return The size of the point stored in `buf`
 			 */
 			PDAL_C_API size_t PDALGetPackedPoint(PDALPointViewPtr view, PDALDimTypeListPtr dims, PDALPointId idx, char *buf);
 
-			//! PDAL_C_API void getPackedPoints(const DimTypeList& dims, PointId idx, char *buf);
+			/**
+			 * Retrieves data for all points based on the provided dimension list.
+			 *
+			 * @see pdal::PointView::getPackedPoint
+			 *
+			 * @param view The view that contains the points
+			 * @param dims List of dimensions to retrieve
+			 * @param idx Index of point to get
+			 * @param[out] buf Pointer to buffer to fill
+			 * @return The size of the points stored in `buf`
+			 */
+			PDAL_C_API uint64_t PDALGetAllPackedPoints(PDALPointViewPtr view, PDALDimTypeListPtr dims, char *buf);
 
 			/**
 			 * Fill a buffer with point data specified by the dimension list, accounts index

tests/pdal/capi/PointViewTest.c.in

@@ -317,7 +317,6 @@ TEST testPDALGetPointViewLayout(void)
 
 TEST testPDALGetPackedPoint(void)
 {
-	//  PDALGetPackedPoint(PDALPointViewPtr view, PDALDimTypeListPtr dims, PDALPointId idx, char *buf)
 	PDALResetPointViewIterator(gPointViewIterator);
 	bool hasNext = PDALHasNextPointView(gPointViewIterator);
 	ASSERT(hasNext);
@@ -363,6 +362,64 @@ TEST testPDALGetPackedPoint(void)
 	PASS();
 }
 
+TEST testPDALGetAllPackedPoints(void)
+{
+	PDALResetPointViewIterator(gPointViewIterator);
+	bool hasNext = PDALHasNextPointView(gPointViewIterator);
+	ASSERT(hasNext);
+
+	uint64_t actualSize = PDALGetAllPackedPoints(NULL, NULL, NULL);
+	ASSERT_EQ(0, actualSize);
+
+	PDALPointViewPtr view = PDALGetNextPointView(gPointViewIterator);
+	ASSERT(view);
+
+	actualSize = PDALGetAllPackedPoints(view, NULL, NULL);
+	ASSERT_EQ(0, actualSize);
+
+	PDALPointLayoutPtr layout = PDALGetPointViewLayout(view);
+	ASSERT(layout);
+	PDALDimTypeListPtr dims = PDALGetPointLayoutDimTypes(layout);
+	ASSERT(dims);
+
+	actualSize = PDALGetAllPackedPoints(NULL, dims, NULL);
+	ASSERT_EQ(0, actualSize);
+	actualSize = PDALGetAllPackedPoints(view, dims, NULL);
+	ASSERT_EQ(0, actualSize);
+
+	uint64_t numPoints = PDALGetPointViewSize(view);
+	size_t pointSize = PDALGetPointSize(layout);
+	ASSERT(numPoints > 0);
+	ASSERT(pointSize > 0);
+
+	char *actualPoints = calloc(numPoints, pointSize);
+	ASSERT(actualPoints);
+
+	actualSize = PDALGetAllPackedPoints(NULL, NULL, actualPoints);
+	ASSERT_EQ(0, actualSize);
+	actualSize = PDALGetAllPackedPoints(view, NULL, actualPoints);
+	ASSERT_EQ(0, actualSize);
+	actualSize = PDALGetAllPackedPoints(NULL, dims, actualPoints);
+	ASSERT_EQ(0, actualSize);
+	actualSize = PDALGetAllPackedPoints(view, dims, actualPoints);
+	ASSERT_EQ(numPoints * pointSize, actualSize);
+
+	char *expectedPoint = calloc(1, pointSize);
+	ASSERT(expectedPoint);
+
+	for (uint64_t i = 0; i < numPoints; ++i)
+	{
+		ASSERT_EQ(pointSize, PDALGetPackedPoint(view, dims, i, expectedPoint));
+		ASSERT_MEM_EQ(expectedPoint, actualPoints + i * pointSize, pointSize);
+	}
+
+	free(expectedPoint);
+	free(actualPoints);
+	PDALDisposePointView(view);
+
+	PASS();
+}
+
 GREATEST_SUITE(PointViewTest)
 {
 	SET_SETUP(setupPointViewTest, NULL);
@@ -376,6 +433,7 @@ GREATEST_SUITE(PointViewTest)
 	RUN_TEST(testPDALGetPointViewWkt);
 	RUN_TEST(testPDALGetPointViewLayout);
 	RUN_TEST(testPDALGetPackedPoint);
+	RUN_TEST(testPDALGetAllPackedPoints);
 
 	SET_SETUP(NULL, NULL);
 	SET_TEARDOWN(NULL, NULL);