Add PDALDimType retrieval functions for PointLayout

Author: jimmysoda

source/pdal/capi/Forward.h

@@ -42,6 +42,16 @@ namespace pdal
 #include <stdint.h> // for uint64_t
 #endif /* __cplusplus */
 
+typedef struct PDALDimType PDALDimType;
+
+struct PDALDimType
+{
+	uint32_t id;
+	uint32_t type;
+	double scale;
+	double offset;
+};
+
 /// A pointer to a dimension type list
 typedef void* PDALDimTypeListPtr;
 

source/pdal/capi/PointLayout.cpp

@@ -34,6 +34,71 @@ namespace pdal
 			return size;
 		}
 
+
+		size_t PDALGetDimTypeIdName(PDALDimType dim, char *name, size_t size)
+		{
+			size_t result = 0;
+
+			if (name && size > 0)
+			{
+				std::string s = pdal::Dimension::name(
+					static_cast<pdal::Dimension::Id>(dim.id));
+				std::strncpy(name, s.c_str(), size);
+				result = std::min(std::strlen(name), size);
+			}
+
+			return result;
+		}
+
+		size_t PDALGetDimTypeInterpretationName(PDALDimType dim, char *name, size_t size)
+		{
+			size_t result = 0;
+
+			if (name && size > 0)
+			{
+				std::string s = pdal::Dimension::interpretationName(
+					static_cast<pdal::Dimension::Type>(dim.type));
+				std::strncpy(name, s.c_str(), size);
+				result = std::min(std::strlen(name), size);
+			}
+
+			return result;
+		}
+
+
+		PDALDimType PDALGetDimType(PDALDimTypeListPtr types, size_t index)
+		{
+			pdal::capi::DimTypeList *wrapper = reinterpret_cast<pdal::capi::DimTypeList *>(types);
+
+			PDALDimType dim = {
+				static_cast<uint32_t>(pdal::Dimension::id("")), static_cast<uint32_t>(pdal::Dimension::type("")),
+				1.0, 0.0
+			};
+
+			if (wrapper && wrapper->get())
+			{
+				try
+				{
+					pdal::DimTypeList *list = wrapper->get();
+
+					if (index < list->size())
+					{
+						pdal::DimType nativeDim = list->at(index);
+						dim.id = static_cast<uint32_t>(nativeDim.m_id);
+						dim.type = static_cast<uint32_t>(nativeDim.m_type);
+						dim.scale = nativeDim.m_xform.m_scale.m_val;
+						dim.offset = nativeDim.m_xform.m_offset.m_val;
+					}
+				}
+				catch (const std::exception &e)
+				{
+					printf("%s\n", e.what());
+				}
+			}
+
+			return dim;
+		}
+
 		PDALDimTypeListPtr PDALGetPointLayoutDimTypes(PDALPointLayoutPtr layout)
 		{
 			PDALDimTypeListPtr types = NULL;
@@ -58,6 +123,28 @@ namespace pdal
 			}
 		}
 
+		PDALDimType PDALFindDimType(PDALPointLayoutPtr layout, const char *name)
+		{
+			PDALDimType dim = {
+				static_cast<uint32_t>(pdal::Dimension::id("")), static_cast<uint32_t>(pdal::Dimension::type("")),
+				1.0, 0.0
+			};
+
+			pdal::PointLayoutPtr nativeLayout = reinterpret_cast<pdal::PointLayoutPtr>(layout);
+
+			if (name && nativeLayout)
+			{
+				pdal::DimType nativeDim = nativeLayout->findDimType(name);
+
+				dim.id = static_cast<uint32_t>(nativeDim.m_id);
+				dim.type = static_cast<uint32_t>(nativeDim.m_type);
+				dim.scale = nativeDim.m_xform.m_scale.m_val;
+				dim.offset = nativeDim.m_xform.m_offset.m_val;
+			}
+
+			return dim;
+		}
+
 		size_t PDALGetDimSize(PDALPointLayoutPtr layout, const char *name)
 		{
 			pdal::PointLayoutPtr nativeLayout = reinterpret_cast<pdal::PointLayoutPtr>(layout);

source/pdal/capi/PointLayout.h

@@ -18,11 +18,17 @@ namespace pdal
 #endif
 			PDAL_C_API size_t PDALGetDimTypeListSize(PDALDimTypeListPtr types);
 
+			PDAL_C_API PDALDimType PDALGetDimType(PDALDimTypeListPtr types, size_t index);
+
+			PDAL_C_API size_t PDALGetDimTypeIdName(PDALDimType dim, char *name, size_t size);
+
+			PDAL_C_API size_t PDALGetDimTypeInterpretationName(PDALDimType dim, char *name, size_t size);
+
 			PDAL_C_API PDALDimTypeListPtr PDALGetPointLayoutDimTypes(PDALPointLayoutPtr layout);
 
 			PDAL_C_API void PDALDisposeDimTypeList(PDALDimTypeListPtr types);
 
-			//! PDAL_C_API PDALDimType PDALFindDimType(PDALPointLayoutPtr layout, const char *name);
+			PDAL_C_API PDALDimType PDALFindDimType(PDALPointLayoutPtr layout, const char *name);
 
 			PDAL_C_API size_t PDALGetDimSize(PDALPointLayoutPtr layout, const char *name);
 

tests/pdal/capi/PointLayoutTest.c.in

@@ -81,6 +81,57 @@ TEST testPDALGetPointLayoutDimTypes(void)
 	PASS();
 }
 
+TEST testPDALFindDimType(void)
+{
+	uint32_t idUnknown = 0;
+	uint32_t typeNone = 0;
+	double tolerance = 1.0e-4;
+
+	ASSERT(gLayout);
+
+	PDALDimType actual = PDALFindDimType(NULL, NULL);
+	ASSERT_EQ(idUnknown, actual.id);
+	ASSERT_EQ(typeNone, actual.type);
+	ASSERT_IN_RANGE(1.0, actual.scale, tolerance);
+	ASSERT_IN_RANGE(0.0, actual.offset, tolerance);
+
+	actual = PDALFindDimType(gLayout, NULL);
+	ASSERT_EQ(idUnknown, actual.id);
+	ASSERT_EQ(typeNone, actual.type);
+	ASSERT_IN_RANGE(1.0, actual.scale, tolerance);
+	ASSERT_IN_RANGE(0.0, actual.offset, tolerance);
+
+	PDALDimTypeListPtr types = PDALGetPointLayoutDimTypes(gLayout);
+	size_t size = PDALGetDimTypeListSize(types);
+
+	for (size_t i = 0; i < size; ++i)
+	{
+		PDALDimType expected = PDALGetDimType(types, i);
+		ASSERT(idUnknown != expected.id);
+		ASSERT(typeNone != expected.type);
+
+		char name[64];
+		ASSERT(PDALGetDimTypeIdName(expected, name, 64) > 0);
+
+		actual = PDALFindDimType(NULL, name);
+		ASSERT_EQ(idUnknown, actual.id);
+		ASSERT_EQ(typeNone, actual.type);
+		ASSERT_IN_RANGE(1.0, actual.scale, tolerance);
+		ASSERT_IN_RANGE(0.0, actual.offset, tolerance);
+
+		actual = PDALFindDimType(gLayout, name);
+		ASSERT_EQ(expected.id, actual.id);
+		ASSERT_EQ(expected.type, actual.type);
+		ASSERT_IN_RANGE(expected.scale, actual.scale, tolerance);
+		ASSERT_IN_RANGE(expected.offset, actual.offset, tolerance);
+	}
+
+	PDALDisposeDimTypeList(types);
+
+	PASS();
+}
+
+
 TEST testPDALGetDimSize(void)
 {
 	ASSERT(gLayout);
@@ -148,6 +199,7 @@ GREATEST_SUITE(PointLayoutTest)
 	SET_TEARDOWN(teardownPointLayoutTest, NULL);
 
 	RUN_TEST(testPDALGetPointLayoutDimTypes);
+	RUN_TEST(testPDALFindDimType);
 	RUN_TEST(testPDALGetDimSize);
 	RUN_TEST(testPDALGetDimPackedOffset);
 	RUN_TEST(testPDALGetPointSize);