Fix #3 and update doc

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

@@ -62,7 +62,6 @@ jobs:
           remotes::install_cran("rcmdcheck")
           remotes::install_cran("covr")
           options("install.packages.compile.from.source" = NULL)
-          install.packages("raster", type = "source")
         shell: Rscript {0}
 
       - name: Session information

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: rflsgen
 Type: Package
 Title: Neutral Landscape Generator with Targets on Landscape Indices
-Version: 1.2.1
+Version: 1.2.2
 Author: Dimitri Justeau-Allaire, Grégoire Blanchard, Thomas Ibanez, Xavier Lorca, Ghislain Vieilledent, Philippe Birnbaum
 Maintainer: Dimitri Justeau-Allaire <[email protected]>
 Description: Interface to the 'flsgen' neutral landscape generator <https://github.com/dimitri-justeau/flsgen>. It allows to
@@ -15,7 +15,7 @@ Depends:
   rJava,
   terra (>= 1.5-12),
   jsonlite
-Imports: rgdal, checkmate, utils
+Imports: checkmate, utils
 SystemRequirements: Java (>= 8)
 RoxygenNote: 7.2.2
 Suggests: testthat (>= 3.0.0), knitr, rmarkdown, landscapemetrics

NEWS.md

@@ -1,3 +1,9 @@
+# rflsgen 1.2.2
+
+* Fix bug described in https://github.com/dimitri-justeau/rflsgen/issues/3
+
+* Fix vignette 3 (there was still references to the raster package)
+
 # rflsgen 1.2.1
 
 * Fix bug due to "java.parameters" initialization in zzz.R, which did not allow to set custom memory limits

R/flsgen_generate.R

@@ -164,7 +164,7 @@ flsgen_generate <- function(structure_str, structure_file, terrain_file=NULL,
       terrain_raster <- terra::rast(terrain_file)
     }
     terrain_data <- values(terrain_raster)
-    .jcall(terrain, "V", "loadFromData", terrain_data, nb_rows, nb_cols)
+    .jcall(terrain, "V", "loadFromData", .jarray(as.double(as.vector(terrain_data))))
   }
   if (is.null(min_max_distance)) {
     generator <- .jnew("org.flsgen.solver.LandscapeGenerator", struct, as.integer(connectivity), as.integer(min_distance), terrain)