suggestions from copilot

Author: edzer

inst/gpkg/td.gpkg.zip

@@ -68,7 +68,7 @@ Rcpp::List allocate_out_list(OGRFeatureDefn *poFDefn, int n_features, bool int64
 		attr_names[i] = poFieldDefn->GetNameRef();
 		domains[i] = NA_STRING;
 #if GDAL_VERSION_NUM >= 3030000
-		if (poFieldDefn->GetDomainName() != "")
+		if (! poFieldDefn->GetDomainName().empty())
 			domains[i] = poFieldDefn->GetDomainName();
 #endif
 	}
@@ -652,24 +652,26 @@ Rcpp::List get_field_domains(OGRDataSource *poDS, Rcpp::CharacterVector fdn) {
 			Rcpp::List fdi(3);
 			Rcpp::CharacterVector descr = Rcpp::wrap(d->GetDescription());
 			fdi[0] = descr;
-			fdi.attr("names") = Rcpp::CharacterVector::create("description", "merge_sum", "split_geom_ratio");
 			OGRFieldDomainMergePolicy mp = d->GetMergePolicy();
 			Rcpp::LogicalVector l(1);
-			if (mp == OFDMP_DEFAULT_VALUE)
-				l[0] = NA_LOGICAL;
-			else if (mp == OFDMP_SUM)
-				l[0] = true;
+			l[0] = NA_LOGICAL;
+			if (mp == OFDMP_SUM)
+				l[0] = true; // extensive
 			else if (mp == OFDMP_GEOMETRY_WEIGHTED)
-				l[0] = false;
+				l[0] = false; // intensive
+			else if (mp != OFDMP_DEFAULT_VALUE)
+				Rcpp::warning("unknown value for GetMergePolicy()");
 			fdi[1] = l;
 			OGRFieldDomainSplitPolicy sp = d->GetSplitPolicy();
-			if (sp == OFDSP_DEFAULT_VALUE)
-				l[0] = NA_LOGICAL;
-			else if (sp == OFDSP_DUPLICATE)
-				l[0] = false;
+			l[0] = NA_LOGICAL;
+			if (sp == OFDSP_DUPLICATE)
+				l[0] = false; // intensive
 			else if (sp == OFDSP_GEOMETRY_RATIO)
-				l[0] = true;
+				l[0] = true; // extensive
+			else if (sp != OFDSP_DEFAULT_VALUE)
+				Rcpp::warning("unknown value for GetSplitPolicy()");
 			fdi[2] = l;
+			fdi.attr("names") = Rcpp::CharacterVector::create("description", "merge_sum", "split_geom_ratio");
 			fd[i] = fdi;
 		}
 	}

src/gdal_read.cpp

@@ -202,3 +202,9 @@ test_that("Missing data sources have useful error message (#967)", {
 	# delete temp file
 	file.remove(x)
 })
+
+test_that("Field domains are read from a geopackage", {
+	r = read_sf(system.file("gpkg/td.gpkg.zip", package = "sf"), options=c("IMMUTABLE=YES"))
+	expect_false(is.null(attr(r, "FieldDomains")))
+	expect_false(is.null(attr(r, "domains")))
+})