safety check; tidy test script

r-spatial · Oct 30, 2023 · 4c9b377 · 4c9b377
1 parent 1bc3af4
commit 4c9b377
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/src/gdal_read.cpp b/src/gdal_read.cpp
@@ -227,6 +227,8 @@ Rcpp::List sf_from_ogrlayer(OGRLayer *poLayer, bool quiet, bool int64_as_string,
 	bool warn_int64 = false, has_null_geometries = false;
 	OGRFeature *poFeature;
 	while ((poFeature = poLayer->GetNextFeature()) != NULL) {
+		if (i > (n - 1))
+			Rcpp::stop("more features than GetFeatureCount() reported: please report as issue on GitHub");
 		// getFID:
 		fids[i] = std::to_string(poFeature->GetFID());
 

diff --git a/tests/dplyr.R b/tests/dplyr.R
@@ -4,12 +4,6 @@ if (require(dplyr, quietly = TRUE)) {
  options(dplyr.summarise.inform=FALSE)
  read_sf(system.file("shape/nc.shp", package="sf"), quiet = TRUE) %>%
 	st_transform(3857) -> nc
- if ((gc <- attr(nc, "sf_column")) != "geometry") {
-   nc$geometry = st_geometry(nc)
-   nc = as.data.frame(nc)
-   nc[gc] = NULL
-   nc = st_as_sf(nc)
- }
  nc = st_as_sf(nc, sf_column_name = "geometry")
  nc %>% filter(AREA > .1) %>% plot()