From 85a3d816cb0a4d194dff71118576726ad3b343f9 Mon Sep 17 00:00:00 2001 From: Noah Fahlgren Date: Mon, 19 Jun 2023 15:48:45 -0500 Subject: [PATCH] Import elide from sp instead of maptools The elide function was moved from maptools to sp https://github.com/edzer/sp/pull/129 maptools is also removed as a dependency --- DESCRIPTION | 1 - NAMESPACE | 2 +- R/fct_fieldRotate.R | 1 - R/fct_fieldShape.R | 3 +-- 4 files changed, 2 insertions(+), 5 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 41c5625..0512944 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -21,7 +21,6 @@ Imports: fftwtools, git2r, glue, - maptools, DescTools, methods, raster, diff --git a/NAMESPACE b/NAMESPACE index c6499ad..53fc3a1 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -32,7 +32,6 @@ importFrom(graphics,locator) importFrom(graphics,par) importFrom(graphics,plot) importFrom(graphics,points) -importFrom(maptools,elide) importFrom(methods,as) importFrom(methods,slot) importFrom(parallel,detectCores) @@ -68,6 +67,7 @@ importFrom(sp,bbox) importFrom(sp,over) importFrom(sp,proj4string) importFrom(sp,spsample) +importFrom(sp, elide) importFrom(spatialEco,polyPerimeter) importFrom(stats,dist) importFrom(utils,read.csv) diff --git a/R/fct_fieldRotate.R b/R/fct_fieldRotate.R index c4dcde4..efba429 100644 --- a/R/fct_fieldRotate.R +++ b/R/fct_fieldRotate.R @@ -26,7 +26,6 @@ #' @importFrom graphics abline axis lines par plot points locator legend #' @importFrom grDevices grey rgb col2rgb #' @importFrom sp bbox Polygons Polygon SpatialPolygonsDataFrame SpatialPolygons spsample SpatialPointsDataFrame over proj4string -#' @importFrom maptools elide #' #' #' @return A list with two element diff --git a/R/fct_fieldShape.R b/R/fct_fieldShape.R index 143ced5..f2f4a07 100644 --- a/R/fct_fieldShape.R +++ b/R/fct_fieldShape.R @@ -21,8 +21,7 @@ #' @importFrom raster raster projection plotRGB res projectRaster crs extent atan2 crop rasterToPolygons mask extract clump drawLine drawPoly xyFromCell #' @importFrom graphics abline axis lines par plot points locator legend #' @importFrom grDevices grey rgb col2rgb -#' @importFrom sp bbox Polygons Polygon SpatialPolygonsDataFrame SpatialPolygons spsample SpatialPointsDataFrame over proj4string -#' @importFrom maptools elide +#' @importFrom sp bbox Polygons Polygon SpatialPolygonsDataFrame SpatialPolygons spsample SpatialPointsDataFrame over proj4string elide #' #' #' @return A list with two element