Merge pull request #305 from r-spatialecology/main

Update v2.0.0

.Rbuildignore

@@ -21,6 +21,5 @@ vignettes/articles
 ^\.httr-oauth$
 ^pkgdown
 ^\.github$
-test_data/
 ^CODE_OF_CONDUCT\.md$
 ^CRAN-SUBMISSION$

.gitattributes

@@ -0,0 +1,2 @@
+# Set the default behavior, in case people don't have core.autocrlf set.
+* text=auto

.github/workflows/Deploy-pkgdown.yaml

@@ -31,7 +31,7 @@ jobs:
 
       - uses: r-lib/actions/setup-r-dependencies@v2
         with:
-          extra-packages: any::pkgdown, any::bench, any::dplyr, any::landscapetools, any::purrr, any::stars, local::.
+          extra-packages: any::pkgdown, any::bench, any::dplyr, any::purrr, any::tidyr, local::.
           needs: website
 
       - name: Install SDMTools

.github/workflows/Render-README.yaml

@@ -27,7 +27,7 @@ jobs:
 
       - uses: r-lib/actions/setup-r-dependencies@v2
         with:
-          extra-packages: any::rmarkdown, any::landscapetools, local::.
+          extra-packages: any::rmarkdown, local::.
 
       - name: Render README files
         run: Rscript -e 'rmarkdown::render("README.Rmd")'

.gitignore

@@ -7,5 +7,5 @@ inst/doc
 src/*.o
 src/*.so
 src/*.dll
-test_data/
 ^CRAN-SUBMISSION$
+data-raw/FS-metrics.fca

DESCRIPTION

@@ -1,81 +1,80 @@
-Type: Package
-Package: landscapemetrics
-Title: Landscape Metrics for Categorical Map Patterns
-Version: 1.5.7
-Authors@R: c(person("Maximilian H.K.", "Hesselbarth",
-             role = c("aut", "cre"),
-             email = "[email protected]",
-             comment = c(ORCID = "0000-0003-1125-9918")),
-             person("Marco", "Sciaini",
-             role = "aut",
-             email = "[email protected]",
-             comment = c(ORCID = "0000-0002-3042-5435")),
-             person("Jakub", "Nowosad", 
-             role = "aut",
-             email = "[email protected]", 
-             comment = c(ORCID = "0000-0002-1057-3721")),
-             person("Sebastian", "Hanss", 
-             role = "aut", 
-             comment = c(ORCID = "0000-0002-3990-4897")),
-             person("Laura J.", "Graham",
-             role = "ctb", 
-             comment = "Input on package structure"),
-             person("Jeffrey", "Hollister", 
-             role = "ctb", 
-             comment = "Input on package structure"),
-             person("Kimberly A.", "With", 
-             role = "ctb",
-             comment = "Input on package structure"),
-             person("Florian", "Privé", 
-             role = "ctb", 
-             comment = "Original author of underlying C++ code for get_nearestneighbour() function"),
-             person("Project Nayuki", 
-             role = "ctb", 
-             comment = "Original author of underlying C++ code for get_circumscribingcircle and lsm_p_circle"),
-             person("Matt", "Strimas-Mackey", 
-             role = "ctb", 
-             comment = "Bugfix in sample_metrics()")
-             )
-Maintainer: Maximilian H.K. Hesselbarth <[email protected]>
-Description: Calculates landscape metrics for categorical landscape patterns in 
-    a tidy workflow. 'landscapemetrics' reimplements the most common metrics from
-    'FRAGSTATS' (<https://www.umass.edu/landeco/>) 
-    and new ones from the current literature on landscape metrics.
-    This package supports 'raster' spatial objects and takes 
-    RasterLayer, RasterStacks, RasterBricks or lists of RasterLayer from the
-    'raster' package as input arguments. It further provides utility functions
-    to visualize patches, select metrics and building blocks to develop new 
-    metrics.
-License: GPL-3
-URL: https://r-spatialecology.github.io/landscapemetrics/
-BugReports: https://github.com/r-spatialecology/landscapemetrics/issues
-Depends: 
-    R (>= 3.1)
-Imports: 
-    cli,
-    ggplot2,
-    methods,
-    Rcpp (>= 1.0.10),
-    sp,
-    stats,
-    raster,
-    tibble
-Suggests: 
-    covr,
-    dplyr,
-    knitr,
-    rmarkdown,
-    terra,
-    testthat
-Enhances:
-    stars,
-    sf
-LinkingTo: 
-    Rcpp,
-    RcppArmadillo
-ByteCompile: true
-Encoding: UTF-8
-LazyData: true
-Roxygen: list(markdown = TRUE)
-RoxygenNote: 7.2.3
-VignetteBuilder: knitr
+Type: Package
+Package: landscapemetrics
+Title: Landscape Metrics for Categorical Map Patterns
+Version: 2.0.0
+Authors@R: c(person("Maximilian H.K.", "Hesselbarth",
+             role = c("aut", "cre"),
+             email = "[email protected]",
+             comment = c(ORCID = "0000-0003-1125-9918")),
+             person("Marco", "Sciaini",
+             role = "aut",
+             email = "[email protected]",
+             comment = c(ORCID = "0000-0002-3042-5435")),
+             person("Jakub", "Nowosad", 
+             role = "aut",
+             email = "[email protected]", 
+             comment = c(ORCID = "0000-0002-1057-3721")),
+             person("Sebastian", "Hanss", 
+             role = "aut", 
+             comment = c(ORCID = "0000-0002-3990-4897")),
+             person("Laura J.", "Graham",
+             role = "ctb", 
+             comment = "Input on package structure"),
+             person("Jeffrey", "Hollister", 
+             role = "ctb", 
+             comment = "Input on package structure"),
+             person("Kimberly A.", "With", 
+             role = "ctb",
+             comment = "Input on package structure"),
+             person("Florian", "Privé", 
+             role = "ctb", 
+             comment = "Original author of underlying C++ code for get_nearestneighbour() function"),
+             person("Project Nayuki", 
+             role = "ctb", 
+             comment = "Original author of underlying C++ code for get_circumscribingcircle and lsm_p_circle"),
+             person("Matt", "Strimas-Mackey", 
+             role = "ctb", 
+             comment = "Bugfix in sample_metrics()")
+             )
+Maintainer: Maximilian H.K. Hesselbarth <[email protected]>
+Description: Calculates landscape metrics for categorical landscape patterns in 
+    a tidy workflow. 'landscapemetrics' reimplements the most common metrics from
+    'FRAGSTATS' (<https://www.fragstats.org/>) and new ones from the current 
+    literature on landscape metrics. This package supports 'terra' SpatRaster objects 
+    as input arguments. It further provides utility functionn to visualize patches, 
+    select metrics and building blocks to develop new metrics.
+License: GPL-3
+URL: https://r-spatialecology.github.io/landscapemetrics/
+BugReports: https://github.com/r-spatialecology/landscapemetrics/issues
+Depends: 
+    R (>= 3.6)
+Imports: 
+    cli,
+    ggplot2,
+    methods,
+    Rcpp (>= 0.11.0),
+    stats,
+    terra,
+    tibble
+Suggests: 
+    covr,
+    dplyr,
+    knitr,
+    raster,
+    rmarkdown,
+    sf,
+    sp,
+    stars,
+    stringr,
+    testthat, 
+    tidyr
+LinkingTo: 
+    Rcpp,
+    RcppArmadillo
+ByteCompile: true
+Encoding: UTF-8
+LazyData: true
+Config/testthat/edition: 3
+Roxygen: list(markdown = TRUE)
+RoxygenNote: 7.2.3
+VignetteBuilder: knitr

NAMESPACE

@@ -1,12 +1,5 @@
 # Generated by roxygen2: do not edit by hand
 
-S3method(construct_buffer,MULTIPOINT)
-S3method(construct_buffer,POINT)
-S3method(construct_buffer,SpatialPoints)
-S3method(construct_buffer,SpatialPointsDataFrame)
-S3method(construct_buffer,matrix)
-S3method(construct_buffer,sf)
-S3method(construct_buffer,sfc)
 S3method(landscape_as_list,RasterBrick)
 S3method(landscape_as_list,RasterLayer)
 S3method(landscape_as_list,RasterStack)
@@ -166,21 +159,17 @@ export(lsm_p_shape)
 export(matrix_to_raster)
 export(options_landscapemetrics)
 export(pad_raster)
+export(points_as_mat)
 export(proj_info)
 export(raster_to_points)
 export(rcpp_get_nearest_neighbor)
 export(sample_lsm)
-export(scale_sample)
-export(scale_window)
 export(show_cores)
 export(show_correlation)
 export(show_lsm)
 export(show_patches)
 export(spatialize_lsm)
 export(unpad_raster)
 export(window_lsm)
-importFrom(Rcpp,sourceCpp)
-importFrom(raster,ncell)
-importFrom(stats,na.omit)
-importFrom(stats,sd)
+importFrom(Rcpp,evalCpp)
 useDynLib(landscapemetrics)