Merge branch 'main' of https://github.com/ecological-cities/biodivercity

ecological-cities · Dec 7, 2022 · 920e087 · 920e087
2 parents bcf3328 + 5e6abc2
commit 920e087
Show file tree

Hide file tree

Showing 21 changed files with 48 additions and 74 deletions.
diff --git a/NAMESPACE b/NAMESPACE
@@ -135,5 +135,6 @@ importFrom(tidyselect,contains)
 importFrom(tidyselect,everything)
 importFrom(tidyselect,matches)
 importFrom(tidyselect,starts_with)
+importFrom(tidyselect,where)
 importFrom(units,set_units)
 importFrom(vegan,specaccum)
diff --git a/docs/articles/apply-models.html b/docs/articles/apply-models.html
diff --git a/docs/articles/build-models.html b/docs/articles/build-models.html
diff --git a/docs/articles/more/animals-data-summaries.html b/docs/articles/more/animals-data-summaries.html
diff --git a/...als-data-summaries_files/figure-html/species accumulation curves_filtered-1.png b/...als-data-summaries_files/figure-html/species accumulation curves_filtered-1.png
diff --git a/.../animals-simulate-missing-surveys_files/figure-html/plot species richness-1.png b/.../animals-simulate-missing-surveys_files/figure-html/plot species richness-1.png
diff --git a/...als-simulate-missing-surveys_files/figure-html/plot species-level results-1.png b/...als-simulate-missing-surveys_files/figure-html/plot species-level results-1.png
diff --git a/docs/articles/more/animals-species-analyses.html b/docs/articles/more/animals-species-analyses.html
diff --git a/...animals-species-analyses_files/figure-html/common animal species per town-1.png b/...animals-species-analyses_files/figure-html/common animal species per town-1.png
diff --git a/...-species-analyses_files/figure-html/most abundant animal species per town-1.png b/...-species-analyses_files/figure-html/most abundant animal species per town-1.png
diff --git a/...s_files/figure-html/plot queenstown & generated points with retained data-1.png b/...s_files/figure-html/plot queenstown & generated points with retained data-1.png
diff --git a/...als-survey-protocols_files/figure-html/plot queenstown & generated points-1.png b/...als-survey-protocols_files/figure-html/plot queenstown & generated points-1.png
diff --git a/...re/test-models_files/figure-html/print xvalid plots for new data - scaled-1.png b/...re/test-models_files/figure-html/print xvalid plots for new data - scaled-1.png
diff --git a/...ticles/more/test-models_files/figure-html/print xvalid plots for new data-1.png b/...ticles/more/test-models_files/figure-html/print xvalid plots for new data-1.png
diff --git a/docs/articles/process-animal.html b/docs/articles/process-animal.html
diff --git a/docs/articles/process-landscape.html b/docs/articles/process-landscape.html
diff --git a/docs/articles/use-cases.html b/docs/articles/use-cases.html
diff --git a/docs/pkgdown.yml b/docs/pkgdown.yml
@@ -13,7 +13,7 @@ articles:
   process-animal: process-animal.html
   process-landscape: process-landscape.html
   use-cases: use-cases.html
-last_built: 2022-12-06T02:36Z
+last_built: 2022-12-06T13:01Z
 urls:
   reference: https://ecological-cities.github.io/biodivercity/reference
   article: https://ecological-cities.github.io/biodivercity/articles

diff --git a/docs/reference/check_taxongrps.html b/docs/reference/check_taxongrps.html
diff --git a/docs/search.json b/docs/search.json
diff --git a/vignettes/use-cases.Rmd b/vignettes/use-cases.Rmd
@@ -199,7 +199,7 @@ veg_rasterised <-
 veg_amended <- terra::mask(veg_remote, vect(bound), inverse = TRUE)
   
 # fill in amended veg raster with rasterised veg
-veg_amended <- terra::merge(veg_amended, veg_rasterised)
+veg_amended <- terra::mosaic(veg_amended, veg_rasterised)
 
 ```