httr -> httr2 and Bioclim model added

stangandaho · Mar 22, 2024 · cf9ffa9 · cf9ffa9
1 parent 1bb8a79
commit cf9ffa9
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 9 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -5,7 +5,7 @@ Version: 0.2.1
 Date: 2023-10-05
 Depends: R (>= 3.5.0)
 Imports: flexsdm, shiny, shinyFiles, shinydashboard, shinydashboardPlus, shinyjs,
-        plotly, leaflet, leaflet.extras, httr2, jsonlite, sf, terra, dismo,
+        plotly, leaflet, leaflet.extras, httr2, sf, terra, dismo,
         DT, shinyWidgets, shinycssloaders, methods, dplyr, ggplot2
 Remotes: sjevelazco/flexsdm
 Author: Stanislas Mahussi GANDAHO

diff --git a/NAMESPACE b/NAMESPACE
@@ -1,7 +1,14 @@
 # Generated by roxygen2: do not edit by hand
 
-#exportPattern("^[[:alpha:]]+")
-export("nimo")
+## Export
+export(nimo)
+export(nm_match_raster)
+export(nm_fit_bioclim)
+export(nm_eval)
+export(nm_gbif_suggestion)
+export(nm_find_hcv)
+export(nm_predict)
+## Import
 importFrom("grDevices", "gray.colors", "rainbow")
 importFrom("graphics", "points")
 importFrom("methods", "show")
@@ -165,8 +172,10 @@ importFrom(leaflet, addMeasure)
 importFrom(leaflet, leafletProxy)
 #leaflet.extras
 importFrom(leaflet.extras, addDrawToolbar)
-#jsonlite
-importFrom(jsonlite, fromJSON)
-#httr
-importFrom(httr, content)
-importFrom(httr, GET)
+#httr2
+importFrom(httr2, request)
+importFrom(httr2, req_timeout)
+importFrom(httr2, req_url_query)
+importFrom(httr2, req_perform)
+importFrom(httr2, resp_body_json)
+
diff --git a/tests/testthat/test-nm_fit_bioclim.R b/tests/testthat/test-nm_fit_bioclim.R
@@ -43,7 +43,7 @@ test_that("test different function setting ", {
   )
 
   expect_equal(class(bioc2), "list")
-  expect_length(max_t1, 4)
+  expect_length(bioc2, 4)
 
   # What about no predictors? Does not work
   expect_error(nm_fit_bioclim(