Merge remote-tracking branch 'origin/SHI_new' into conference_staging

GEO-BON · Oct 6, 2023 · 30bd013 · 30bd013
2 parents 8e0e4b4 + dac771e
commit 30bd013
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/scripts/SHI/scp_SHI_02_GetAOH.R b/scripts/SHI/scp_SHI_02_GetAOH.R
@@ -93,7 +93,7 @@ if(study_area$option == 1){
   sf_area_lim1 <- ne_countries(country = country_code,returnclass = 'sf') |> st_make_valid() # country
 }
 if(study_area$option == 2){
-  sf_area_lim1 <- ne_states(geounit="canada",returnclass = 'sf') |> st_make_valid() |> filter(woe_name==region) # region in a country
+  sf_area_lim1 <- ne_states(geounit=country_code,returnclass = 'sf') |> st_make_valid() |> filter(woe_name==region) # region in a country
 }
 if(study_area$option == 3){
   sf_area_lim1 <- st_read(study_area_path) # user defined area

diff --git a/scripts/SHI/scp_SHI_02_GetAOH.yml b/scripts/SHI/scp_SHI_02_GetAOH.yml
@@ -34,9 +34,9 @@ inputs:
     description: Path to the study area file. This file should be a polygon with a .gpkg extension or .shp (in this case do not foget to add the projection file to the folder)
     type: application/geopackage+sqlite3 ; application/geo+json ; application/dbf
     example: null
-  country_code:
+  country:
     label: country code
-    description: Three letter code (ISO_3166-1_alpha-3 [https://www.iso.org/obp/ui/#search]) for the country where the analysis will be done.
+    description: Name of the country for the analysis. According to the 'rnaturalearth' package functions 'ne_countries' and 'ne_states' (https://github.com/ropensci/rnaturalearth)
     type: text
     example: COL
   region: