Skip to content

Commit

Permalink
Merging
Browse files Browse the repository at this point in the history
Merge branch 'gh-pages' of https://github.com/OHI-Science/ohiprep_v2024 into gh-pages

# Conflicts:
#	globalprep/prs_res_wgi/v2023/intermediate/wgi_combined_scores_by_country.csv
  • Loading branch information
dustin-duncan committed May 24, 2024
2 parents e7a2e65 + 9a98fff commit 5069986
Show file tree
Hide file tree
Showing 25 changed files with 3,395 additions and 42,822 deletions.

Large diffs are not rendered by default.

8 changes: 6 additions & 2 deletions globalprep/prs_res_wgi/v2024_ar/WGI_dataprep.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ Potential improvement for future assessments: Explore a better way to gapfill...

**Downloaded**:

October 2, 2023 (source data updated Sep 2023)
May 24, 2024 (source data updated Sep 2023)

**Description**:
The Worldwide Governance Indicators (WGI) project reports aggregate and individual governance indicators for 215 economies over the period 1996–2022, for six dimensions of governance:
Expand Down Expand Up @@ -72,6 +72,9 @@ library(strex)
yr_start = 1996
yr_end = 2022
# scenario year
# we want this to be 2024
# data we have may not go to this year
scen_year <- "2023"
```
Expand Down Expand Up @@ -312,9 +315,10 @@ d_calcs$country[grep("Korea, Dem.", d_calcs$country)] <- "North Korea"
d_calcs$country[grep("Turkiye", d_calcs$country)] <- "Turkey"
# Maybe in future update package with country synonym list
# kind of like the OHI version of country code (ISO 3C designations rather than what OHI core hard-coded in)
## Function to convert to OHI region ID
d_calcs_rgn <- name_2_rgn(df_in = d_calcs,
d_calcs_rgn <- name_2_rgn(df_in = d_calcs, # converts country names from source data to region IDs
fld_name='country',
flds_unique=c('year'))
Expand Down
6 changes: 3 additions & 3 deletions globalprep/prs_res_wgi/v2024_sl/WGI_dataprep.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,7 @@ This script downloads WGI data and prepares it for a pressures (1 - WGI) and res

# Updates from previous assessment

No methods updates; additional year of data added.

Potential improvement for future assessments: Explore a better way to gapfill... based on a linear model (~line 166)

***

Expand Down Expand Up @@ -72,7 +70,9 @@ library(strex)
yr_start = 1996
yr_end = 2022
scen_year <- "2023"
scen_year <- "2023"
#scenario year, ours will be 2024
# will always want to change
```

Expand Down
5,137 changes: 0 additions & 5,137 deletions globalprep/prs_res_wgi/v2024_sl/intermediate/wgi_combined_scores_by_country.csv

This file was deleted.

Loading

0 comments on commit 5069986

Please sign in to comment.