modifications handling c() and st_distance

R/bbox.R

@@ -10,10 +10,10 @@ bb_wrap = function(bb) {
 }
 
 bbox.pointmatrix = function(obj, ...) {
- if (nrow(obj) == 0)
+ if (nrow(obj) == 0 || all(is.na(obj)))
  bb_wrap(rep(NA_real_, 4))
  else
- bb_wrap(as.vector(t(apply(obj[,1:2,drop=FALSE], 2, range))))
+ bb_wrap(as.vector(t(apply(obj[,1:2,drop=FALSE], 2, range, na.rm = TRUE))))
 }
 
 bbox.Set = function(obj, ...) {

R/geom-measures.R

@@ -181,6 +181,7 @@ st_distance = function(x, y, ..., dist_fun, by_element = FALSE,
  else
  CPL_geos_dist(x, y, which, par)
  }
+ d[is.nan(d)] = NA_real_
  if (!is.null(u <- st_crs(x)$ud_unit))
  units(d) = u
  d

R/sfc.R

@@ -186,8 +186,17 @@ c.sfc = function(..., recursive = FALSE) {
  else
  c(ucls, "sfc")
 
+ points_attr = sapply(lst, function(x) !is.null(attr(x, "points")))
+ if (any(points_attr) && !all(points_attr)) {
+ for (i in seq_along(lst))
+ lst[[i]] = lst[[i]][] # realize
+ points_attr = FALSE
+ }
+
  ret = unlist(lapply(lst, unclass), recursive = FALSE)
  attributes(ret) = attributes(lst[[1]]) # crs
+ if (all(points_attr))
+ attr(ret, "points") = do.call(rbind, lapply(lst, attr, "points"))
  class(ret) = cls
  attr(ret, "bbox") = compute_bbox(ret) # dispatch on class
  attr(ret, "n_empty") = sum(sapply(lst, attr, which = "n_empty"))