Correctly sample points in nndm (#161)

* Correctly sample points in nndm

Fixes #160

* Refresh autoplots

* Still test on Windows, just not 3.6

* Use st_bbox

st_convex_hull() requires a relatively new GEOS, not on old Ubuntu

Author: mikemahoney218

.github/workflows/R-CMD-check.yaml

@@ -25,8 +25,6 @@ jobs:
           - {os: macos-latest,   r: 'release'}
 
           - {os: windows-latest, r: 'release'}
-          # Use 3.6 to trigger usage of RTools35
-          - {os: windows-latest, r: '3.6'}
           # use 4.1 to check with rtools40's older compiler
           - {os: windows-latest, r: '4.1'}
 

NEWS.md

@@ -1,5 +1,8 @@
 # spatialsample (development version)
 
+* Fixed bug where passing a polygon to `spatial_nndm_cv()` forced leave-one-out
+  CV, rather than the intended sampling of prediction points from the polygon.
+
 # spatialsample 0.5.1
 
 * `spatial_block_cv()` now adds an `expand_bbox` attribute to the resulting rset

R/spatial_nndm_cv.R

@@ -126,15 +126,15 @@ spatial_nndm_cv <- function(data, prediction_sites, ...,
   )
 
   if (use_provided_points) {
-    sample_points <- prediction_sites
+    prediction_sites <- prediction_sites
   } else if (sample_provided_poly) {
-    sample_points <- sf::st_sample(
+    prediction_sites <- sf::st_sample(
       x = sf::st_geometry(prediction_sites),
       size = prediction_sample_size,
       ...
     )
   } else {
-    sample_points <- sf::st_sample(
+    prediction_sites <- sf::st_sample(
       x = sf::st_as_sfc(sf::st_bbox(prediction_sites)),
       size = prediction_sample_size,
       ...
@@ -145,9 +145,9 @@ spatial_nndm_cv <- function(data, prediction_sites, ...,
   # and will _sometimes_ warn instead (systematic sampling)
   # but will _often_ strip CRS from the returned data;
   # enforce here that our output prediction sites share a CRS with input data
-  if (is.na(sf::st_crs(sample_points))) {
+  if (is.na(sf::st_crs(prediction_sites))) {
     prediction_sites <- sf::st_set_crs(
-      sample_points,
+      prediction_sites,
       sf::st_crs(prediction_sites)
     )
   }