small agr mods

Author: edzer

R/agr.R

@@ -86,7 +86,8 @@ st_set_agr = function(x, value) {
 
 summarize_agr = function(x) {
 	su = summary(st_agr(x))
-	paste(paste(su, names(su)), collapse = ", ")
+	su = su[su > 0]
+	paste(paste0(names(su), " (", su, ")"), collapse = ", ")
 }
 
 all_constant = function(x) {

R/sf.R

@@ -401,7 +401,7 @@ print.sf = function(x, ..., n = getOption("sf_max_print", default = 10)) {
 	nf = length(x) - length(geoms)
 	app = paste("and", nf, ifelse(nf == 1, "field", "fields"))
 	if (any(!is.na(st_agr(x))))
-		app = paste0(app, "\n", "Attribute-geometry relationship: ", summarize_agr(x))
+		app = paste0(app, "\n", "Attribute-geometry relationship", ifelse(nf > 1, "s: ", ": "), summarize_agr(x))
 	if (length(geoms) > 1)
 		app = paste0(app, "\n", "Active geometry column: ", attr(x, "sf_column"))
 	print(st_geometry(x), n = 0, what = "Simple feature collection with", append = app)