Merge branch 'main' into pointx

Author: edzer

R/RcppExports.R

@@ -333,8 +333,8 @@ CPL_proj_info <- function(type) {
     .Call(`_sf_CPL_proj_info`, type)
 }
 
-CPL_xy2sfc <- function(cc, dim, to_points, which) {
-    .Call(`_sf_CPL_xy2sfc`, cc, dim, to_points, which)
+CPL_xy2sfc <- function(cc, dim, to_points, which, cc_has_NAs) {
+    .Call(`_sf_CPL_xy2sfc`, cc, dim, to_points, which, cc_has_NAs)
 }
 
 sfc_is_null <- function(sfc) {

R/gdal_utils.R

@@ -114,7 +114,7 @@ gdal_utils = function(util = "info", source, destination, options = character(0)
 			}, # nocov end
 			translate = CPL_gdaltranslate(source, destination, options, oo, config_options, quiet),
 			vectortranslate = CPL_gdalvectortranslate(source, destination, options, oo, doo, config_options, quiet),
-			buildvrt = CPL_gdalbuildvrt(source, destination, options, oo, config_options, quiet),
+			buildvrt = CPL_gdalbuildvrt(if (missing(source)) character(0) else source, destination, options, oo, config_options, quiet),
 			demprocessing = CPL_gdaldemprocessing(source, destination, options, processing, colorfilename, oo, config_options, quiet),
 			nearblack = CPL_gdalnearblack(source, destination, options, oo, config_options, doo, quiet),
 			grid = CPL_gdalgrid(source, destination, options, oo, config_options, quiet),

R/stars.R

@@ -192,10 +192,14 @@ st_as_sfc.dimensions = function(x, ..., as_points = NA, use_cpp = TRUE, which =
 		}
 	}
 	dims = dim(x) + !as_points
-	if (use_cpp)
-		structure(CPL_xy2sfc(cc, as.integer(dims), as_points, as.integer(which)), 
-			crs = st_crs(xd$refsys), n_empty = 0L, bbox = bbox.Mtrx(cc))
-	else
+	if (use_cpp) {
+		bb = if (cc_has_NAs <- anyNA(cc))
+				bbox.Mtrx(na.omit(cc))
+			else
+				bbox.Mtrx(cc)
+		structure(CPL_xy2sfc(cc, as.integer(dims), as_points, as.integer(which), cc_has_NAs), 
+			crs = st_crs(xd$refsys), n_empty = 0L, bbox = bb)
+	} else
 		st_sfc(xy2sfc(cc, dims, as_points), crs = xd$refsys)
 }
 

src/RcppExports.cpp

@@ -1126,16 +1126,17 @@ BEGIN_RCPP
 END_RCPP
 }
 // CPL_xy2sfc
-List CPL_xy2sfc(NumericMatrix cc, IntegerVector dim, bool to_points, IntegerVector which);
-RcppExport SEXP _sf_CPL_xy2sfc(SEXP ccSEXP, SEXP dimSEXP, SEXP to_pointsSEXP, SEXP whichSEXP) {
+List CPL_xy2sfc(NumericMatrix cc, IntegerVector dim, bool to_points, IntegerVector which, bool cc_has_NAs);
+RcppExport SEXP _sf_CPL_xy2sfc(SEXP ccSEXP, SEXP dimSEXP, SEXP to_pointsSEXP, SEXP whichSEXP, SEXP cc_has_NAsSEXP) {
 BEGIN_RCPP
     Rcpp::RObject rcpp_result_gen;
     Rcpp::RNGScope rcpp_rngScope_gen;
     Rcpp::traits::input_parameter< NumericMatrix >::type cc(ccSEXP);
     Rcpp::traits::input_parameter< IntegerVector >::type dim(dimSEXP);
     Rcpp::traits::input_parameter< bool >::type to_points(to_pointsSEXP);
     Rcpp::traits::input_parameter< IntegerVector >::type which(whichSEXP);
-    rcpp_result_gen = Rcpp::wrap(CPL_xy2sfc(cc, dim, to_points, which));
+    Rcpp::traits::input_parameter< bool >::type cc_has_NAs(cc_has_NAsSEXP);
+    rcpp_result_gen = Rcpp::wrap(CPL_xy2sfc(cc, dim, to_points, which, cc_has_NAs));
     return rcpp_result_gen;
 END_RCPP
 }
@@ -1496,7 +1497,7 @@ static const R_CallMethodDef CallEntries[] = {
     {"_sf_CPL_have_datum_files", (DL_FUNC) &_sf_CPL_have_datum_files, 1},
     {"_sf_CPL_proj_direct", (DL_FUNC) &_sf_CPL_proj_direct, 5},
     {"_sf_CPL_proj_info", (DL_FUNC) &_sf_CPL_proj_info, 1},
-    {"_sf_CPL_xy2sfc", (DL_FUNC) &_sf_CPL_xy2sfc, 4},
+    {"_sf_CPL_xy2sfc", (DL_FUNC) &_sf_CPL_xy2sfc, 5},
     {"_sf_sfc_is_null", (DL_FUNC) &_sf_sfc_is_null, 1},
     {"_sf_sfc_unique_sfg_dims_and_types", (DL_FUNC) &_sf_sfc_unique_sfg_dims_and_types, 1},
     {"_sf_sfc_is_empty", (DL_FUNC) &_sf_sfc_is_empty, 1},

src/raster2sf.cpp

@@ -3,25 +3,21 @@
 using namespace Rcpp;
 
 // [[Rcpp::export]]
-List CPL_xy2sfc(NumericMatrix cc, IntegerVector dim, bool to_points, IntegerVector which) {
+List CPL_xy2sfc(NumericMatrix cc, IntegerVector dim, bool to_points, IntegerVector which, bool cc_has_NAs) {
 	if (cc.nrow() != dim[0] * dim[1])
 		stop("xy2sfc: wrong dimensions"); // #nocov
+	List sfc(which.length());
 	if (to_points) {
-		List ret(which.length());
 		NumericVector point(2);
 		point.attr("class") = CharacterVector::create("XY", "POINT", "sfg");
 		for (int i = 0; i < which.length(); i++) {
 			int ix = which[i] - 1;
 			point(0) = cc(ix, 0);
 			point(1) = cc(ix, 1);
-			ret(i) = clone(point);
+			sfc(i) = clone(point);
 		}
-		ret.attr("class") = CharacterVector::create("sfc_POINT", "sfc");
-		ret.attr("precision") = NumericVector::create(0.0);
-		return(ret);
+		sfc.attr("class") = CharacterVector::create("sfc_POINT", "sfc");
 	} else {
-		// List ret((dim[0] - 1) * (dim[1] - 1));
-		List ret(which.length());
 		for (int i = 0; i < which.length(); i++) {
 			int ix = which[i] - 1; // from R, 1-based
 			size_t y = ix / (dim[0] - 1); // row index
@@ -38,13 +34,34 @@ List CPL_xy2sfc(NumericMatrix cc, IntegerVector dim, bool to_points, IntegerVect
 			points(3,1) = cc((y + 1) * (dim[0]) + x    , 1); // bottom left
 			points(4,0) = cc(y * (dim[0]) + x    ,       0); // top left
 			points(4,1) = cc(y * (dim[0]) + x    ,       1); // top left
-			List polygon(1);
-			polygon.attr("class") = CharacterVector::create("XY", "POLYGON", "sfg");
-			polygon(0) = points;
-			ret(i) = polygon;
+			bool empty = false;
+			if (cc_has_NAs) {
+				NumericVector xy(8);
+				xy(0) = points(0,0);
+				xy(1) = points(0,1);
+				xy(2) = points(1,0);
+				xy(3) = points(1,1);
+				xy(4) = points(2,0);
+				xy(5) = points(2,1);
+				xy(6) = points(3,0);
+				xy(7) = points(3,1);
+				LogicalVector b = any(is_na(xy));
+				if (b[0]) {
+					List polygon;
+					polygon.attr("class") = CharacterVector::create("XY", "POLYGON", "sfg");
+					sfc(i) = polygon; // empty polygon
+					empty = true;
+				}
+			}
+			if (!empty) {
+				List polygon(1);
+				polygon.attr("class") = CharacterVector::create("XY", "POLYGON", "sfg");
+				polygon(0) = points;
+				sfc(i) = polygon; 
+			}
 		}
-		ret.attr("class") = CharacterVector::create("sfc_POLYGON", "sfc");
-		ret.attr("precision") = NumericVector::create(0.0);
-		return(ret);
+		sfc.attr("class") = CharacterVector::create("sfc_POLYGON", "sfc");
 	}
+	sfc.attr("precision") = NumericVector::create(0.0);
+	return(sfc);
 }