Enable PointView projection string unit tests

- Added new pipelines that enable projection string retrieval
- Set GDAL_DATA and PROJ_LIB environment variables for Windows tests

Author: jimmysoda

.gitlab-ci.yml

@@ -73,6 +73,8 @@ test-x64-windows-release:
   before_script:
     - cd %VCPKG_ROOT%/installed/x64-windows/bin
   script:
+    - set GDAL_DATA=%VCPKG_ROOT%\installed\x64-windows\share\gdal
+    - set PROJ_LIB=%VCPKG_ROOT%\installed\x64-windows\share\proj4
     - "%CI_PROJECT_DIR%/build/build-x64-windows-release/bin/test_pdal_c"
   cache:
     key: build-x64-windows-release
@@ -86,7 +88,9 @@ test-x64-windows-debug:
   before_script:
     - cd %VCPKG_ROOT%/installed/x64-windows/debug/bin
   script:
-   - "%CI_PROJECT_DIR%/build/build-x64-windows-debug/bin/test_pdal_cd"
+    - set GDAL_DATA=%VCPKG_ROOT%\installed\x64-windows\share\gdal
+    - set PROJ_LIB=%VCPKG_ROOT%\installed\x64-windows\share\proj4
+    - "%CI_PROJECT_DIR%/build/build-x64-windows-debug/bin/test_pdal_cd"
   cache:
     key: build-x64-windows-debug
     paths:

.vscode/launch.json

@@ -12,7 +12,16 @@
 			"args": [],
 			"stopAtEntry": false,
 			"cwd": "${env:VCPKG_ROOT}\\installed\\x64-windows\\debug\\bin",
-			"environment": [],
+			"environment": [
+				{
+					"name": "GDAL_DATA",
+					"value": "${env:VCPKG_ROOT}\\installed\\x64-windows\\share\\gdal"
+				},
+				{
+					"name": "PROJ_LIB",
+					"value": "${env:VCPKG_ROOT}\\installed\\x64-windows\\share\\proj4"
+				}
+			],
 			"externalConsole": true,
 			"internalConsoleOptions": "openOnSessionStart"
 		}

source/pdal/capi/PointView.h

@@ -18,22 +18,78 @@ namespace pdal
 #include <stdbool.h> // for bool
 #include <stdint.h> // for uint64_t
 #endif
+			/**
+			 * Disposes the provided point `view`.
+			 * 
+			 * @param view The point view to dispose
+			 */
 			PDAL_C_API void PDALDisposePointView(PDALPointViewPtr view);
 
+			/**
+			 * Returns the ID of the provided point `view`.
+			 * 
+			 * @see pdal::PointView::id
+			 * 
+			 * @param view The point view
+			 * @return The view's ID
+			 */
 			PDAL_C_API int PDALGetPointViewId(PDALPointViewPtr view);
 
+			/**
+			 * Returns the number of points in the provided `view`.
+			 * 
+			 * @see pdal::PointView::size
+			 * 
+			 * @param view The point view
+			 * @return The number of points
+			 */
 			PDAL_C_API uint64_t PDALGetPointViewSize(PDALPointViewPtr view);
 
+			/**
+			 * Returns whether the provided point `view` is empty, i.e., has no points.
+			 * 
+			 * @see pdal::PointView::empty
+			 * 
+			 * @param view The point view
+			 * @return Whether the point view is empty
+			 */
 			PDAL_C_API bool PDALIsPointViewEmpty(PDALPointViewPtr view);
+
 			/**
+			 * Clones the provided point `view`.
+			 * 
 			 * @see pdal::PointView::makeNew
+			 * 
+			 * @param view The original point view
+			 * @return A pointer to the new point view
 			 */
 			PDAL_C_API PDALPointViewPtr PDALClonePointView(PDALPointViewPtr view);
 
+			/**
+			 * Returns the proj4 projection string for the provided point `view`.
+			 *
+			 * @see pdal::PointView::spatialReference
+			 * 
+			 * @param view The point view
+			 * @param[out] proj The buffer used to hold the resulting proj4 projection string
+			 * @param size The size of the proj4 projection string buffer
+			 * @return The size of the resulting proj4 projection string
+			 */
 			PDAL_C_API size_t PDALGetPointViewProj4(PDALPointViewPtr view, char *proj, size_t size);
 
+			/**
+			 * Returns the Well-Known Text (WKT) projection string for the provided point `view`.
+			 * @see pdal::PointView::spatialReference
+			 * 
+			 * @param view The point view
+			 * @param[out] wkt The buffer used to hold the resulting WKT projection string
+			 * @param size The size of the wkt projection string buffer
+			 * @param pretty Whether to enhance the formatting of the resulting WKT string
+			 * @return The size of the resulting WKT projection string
+			 */
 			PDAL_C_API size_t PDALGetPointViewWkt(PDALPointViewPtr view, char *wkt, size_t size, bool pretty);
 
+			//! PDAL_C_API PDALPointLayoutPtr PDALGetPointViewLayout(PDALPointViewPtr view);
 
 			/**
 			 * Fill a buffer with point data specified by the dimension list.
@@ -42,10 +98,19 @@ namespace pdal
 			 * @param idx Index of point to get.
 			 * @param[out] buf Pointer to buffer to fill.
 			 */
+			//! PDAL_C_API void getPackedPoint(const DimTypeList& dims, PointId idx, char *buf);
 
+			//! PDAL_C_API void getPackedPoints(const DimTypeList& dims, PointId idx, char *buf);
 
 			/**
+			 * Fill a buffer with point data specified by the dimension list, accounts index
+			 * Using this functions it is possible to pack all points into one buffer
+			* @param pv    PointView pointer.
+			* @param dims  List of dimensions/types to retrieve.
+			* @param idx   Index of point to get.
+			* @param buf   Pointer to buffer to fill
 			*/
+			//! PDAL_C_API void appendPackedPoint(PointViewPtr pv, const DimTypeList& dims, PointId idx, std::size_t pointSize, char *buf)
 
 #ifdef __cplusplus
 		}

tests/data/CMakeLists.txt

@@ -1,4 +1,6 @@
 set(PIPELINES
+	simple-reproject.json
+	sort.json
 	stats.json
 )
 

tests/data/simple-reproject.json.in

@@ -0,0 +1,12 @@
+{
+  "pipeline":[
+    {
+      "filename": "@CMAKE_SOURCE_DIR@/tests/data/las/1.2-with-color.las",
+      "spatialreference": "EPSG:2993"
+    },
+    {
+      "type": "filters.reprojection",
+      "out_srs": "EPSG:4326"
+    }
+  ]
+}

tests/data/sort.json.in

@@ -0,0 +1,9 @@
+{
+  "pipeline": [
+    "@CMAKE_SOURCE_DIR@/test/data/las/1.2-with-color.las",
+    {
+        "type": "filters.sort",
+        "dimension": "X"
+    }
+  ]
+}

tests/pdal/capi/PointViewTest.c.in

@@ -62,7 +62,7 @@ static PDALPointViewCollectionPtr gPointViewCollection = NULL;
 
 static void setupPointViewTest(void *arg)
 {
-	FILE *file = fopen("@CMAKE_BINARY_DIR@//data/stats.json", "rb");
+	FILE *file = fopen("@CMAKE_BINARY_DIR@/data/simple-reproject.json", "rb");
 	char *json = NULL;
 
 	if (file)
@@ -76,7 +76,6 @@ static void setupPointViewTest(void *arg)
 		{
 			fread(json, 1, length, file);
 			json[length] = '\0';
-
 			gPipeline = PDALCreatePipeline(json);
 
 			if (gPipeline && PDALExecutePipeline(gPipeline))
@@ -170,11 +169,10 @@ TEST testPDALGetPointViewProj4(void)
 	size = PDALGetPointViewProj4(view, proj, 0);
 	ASSERT_FALSE(size > 0);
 
-	// TODO Enable when test incorporates a pipeline with projection info
-	// size = PDALGetPointViewProj4(view, proj, 1024);
-	// ASSERT_FALSE(size == 0 || size > 1024);
-	// ASSERT_FALSE(proj[0] == '\0');
-	// printf("\n%s\n", proj);
+	size = PDALGetPointViewProj4(view, proj, 1024);
+	ASSERT_FALSE(size == 0 || size > 1024);
+	ASSERT_FALSE(proj[0] == '\0');
+	ASSERT_STR_EQ("+proj=longlat +datum=WGS84 +no_defs", proj);
 
 	PASS();
 }
@@ -199,11 +197,21 @@ TEST testPDALGetPointViewWkt(void)
 	size = PDALGetPointViewWkt(view, wkt, 0, false);
 	ASSERT_FALSE(size > 0);
 
-	// TODO Enable when test incorporates a pipeline with projection info
-	// size = PDALGetPointViewWkt(view, wkt, 1024, false);
-	// ASSERT_FALSE(size == 0 || size > 1024);
-	// ASSERT_FALSE(wkt[0] == '\0');
-	// printf("\n%s\n", wkt);
+	size = PDALGetPointViewWkt(view, wkt, 1024, false);
+	ASSERT_FALSE(size == 0 || size > 1024);
+	ASSERT_FALSE(wkt[0] == '\0');
+	ASSERT_STR_EQ(
+		"GEOGCS[\"WGS 84\","
+			"DATUM[\"WGS_1984\","
+				"SPHEROID[\"WGS 84\",6378137,298.257223563,AUTHORITY[\"EPSG\",\"7030\"]],"
+				"AUTHORITY[\"EPSG\",\"6326\"]"
+			"],"
+			"PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],"
+			"UNIT[\"degree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"9122\"]],"
+			"AUTHORITY[\"EPSG\",\"4326\"]"
+		"]",
+		wkt
+	);
 
 	PASS();
 }