Skip to content

Commit

Permalink
renamed neonetb to neonetatl
Browse files Browse the repository at this point in the history
  • Loading branch information
nevrome committed Jan 2, 2024
1 parent c088682 commit 59e7d6f
Show file tree
Hide file tree
Showing 9 changed files with 31 additions and 31 deletions.
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: c14bazAAR
Title: Download and Prepare C14 Dates from Different Source Databases
Description: Query different C14 date databases and apply basic data cleaning, merging and calibration steps. Currently available databases: 14cpalaeolithic, 14sea, adrac, agrichange, aida, austarch, bda, calpal, caribbean, eubar, euroevol, irdd, jomon, katsianis, kiteeastafrica, medafricarbon, mesorad, neonet, nerd, p3k14c, pacea, palmisano, radon, radonb, rxpand, sard.
Description: Query different C14 date databases and apply basic data cleaning, merging and calibration steps. Currently available databases: 14cpalaeolithic, 14sea, adrac, agrichange, aida, austarch, bda, calpal, caribbean, eubar, euroevol, irdd, jomon, katsianis, kiteeastafrica, medafricarbon, mesorad, neonet, neonetatl, nerd, p3k14c, pacea, palmisano, radon, radonb, rxpand, sard.
Version: 4.0.0
Authors@R:
c(person(given = "Clemens",
Expand Down
2 changes: 1 addition & 1 deletion NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ export(get_kiteeastafrica)
export(get_medafricarbon)
export(get_mesorad)
export(get_neonet)
export(get_neonetb)
export(get_neonetatl)
export(get_nerd)
export(get_p3k14c)
export(get_pacea)
Expand Down
2 changes: 1 addition & 1 deletion R/get_c14data.R
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ get_all_parser_functions <- function() {
"sard" = c14bazAAR::get_sard,
"p3k14c" = c14bazAAR::get_p3k14c,
"neonet" = c14bazAAR::get_neonet,
"neonet" = c14bazAAR::get_neonetb
"neonet" = c14bazAAR::get_neonetatl
))
}

Expand Down
10 changes: 5 additions & 5 deletions R/get_neonetb.R
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#' @rdname db_getter_backend
#' @export
get_neonetb <- function(db_url = get_db_url("neonetb")) {
get_neonetatl <- function(db_url = get_db_url("neonetatl")) {

check_connection_to_url(db_url)

Expand All @@ -11,7 +11,7 @@ get_neonetb <- function(db_url = get_db_url("neonetb")) {
showProgress = FALSE
)

neonetb <- c14dates %>%
neonetatl <- c14dates %>%
dplyr::transmute(
labnr = .data[["LabCode"]],
c14age = .data[["C14Age"]],
Expand All @@ -26,10 +26,10 @@ get_neonetb <- function(db_url = get_db_url("neonetb")) {
lon = .data[["Longitude"]],
shortref = .data[["bib"]],
) %>% dplyr::mutate(
sourcedb = "neonetb",
sourcedb_version = get_db_version("neonetb")
sourcedb = "neonetatl",
sourcedb_version = get_db_version("neonetatl")
) %>%
as.c14_date_list()

return(neonetb)
return(neonetatl)
}
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ To suggest other archives to be queried you can join the discussion [here](https
| [**MedAfriCarbon**](https://zenodo.org/record/3689716#.XnSHp4hKiUk) <br> 2020-03-20 <br> [`get_c14data("medafricarbon")`](R/get_medafricarbon.R) | The MedAfriCarbon Radiocarbon Database and [Web Application](https://theia.arch.cam.ac.uk/MedAfriCarbon/). Archaeological Dynamics in Mediterranean Africa, ca. 9600–700 BC by [Giulio Lucarini, Toby Wilkinson, Enrico R. Crema, Augusto Palombini, Andrew Bevan and Cyprian Broodbank](https://openarchaeologydata.metajnl.com/articles/10.5334/joad.60/) (2020). |
| [**MesoRAD**](https://github.com/eehh-stanford/price2020) <br> 2020-09-01 (V1.1) <br> [`get_c14data("mesorad")`](R/get_mesorad.R) | Data for End-to-end Bayesian analysis of 14C dates reveals new insights into lowland Maya demography by [Michael Holton Price, José M. Capriles, Julie A. Hoggarth, Kyle Bocinsky, Claire E. Ebert, James Holland Jones](https://doi.org/10.1101/2020.07.02.185256). |
| [**neonet**](https://github.com/zoometh/neonet) <br> 2023-12-08 (V2) <br> [`get_c14data("neonet")`](R/neonet.R) | NeoNet Med. Radiocarbon Dates for the Late Mesolithic/Early Neolithic Transition in the North Central-Western Mediterranean Basin by [Thomas Huet, Miriam Cubas, Juan F. Gibaja, F. Xavier Oms, Niccolò Mazzucco](https://openarchaeologydata.metajnl.com/articles/10.5334/joad.87). |
| [**neonetb**](https://github.com/zoometh/neonet) <br> 2023-12-08 (V1) <br> [`get_c14data("neonetb")`](R/neonetb.R) | NeoNet Atlantic. Radiocarbon Dates for the Late Mesolithic/Early Neolithic Transition in the Southern European Atlantic Coast by [Thomas Huet, Ana Catarina Basílio, António Faustino Carvalho, Miriam Cubas, Juan F. Gibaja, Elías López-Romero, F. Xavier Oms, Niccolò Mazzucco](https://doi.org/10.13131/unipi/z332-ye56). |
| [**neonetatl**](https://github.com/zoometh/neonet) <br> 2023-12-08 (V1) <br> [`get_c14data("neonetatl")`](R/neonetatl.R) | NeoNet Atlantic. Radiocarbon Dates for the Late Mesolithic/Early Neolithic Transition in the Southern European Atlantic Coast by [Thomas Huet, Ana Catarina Basílio, António Faustino Carvalho, Miriam Cubas, Juan F. Gibaja, Elías López-Romero, F. Xavier Oms, Niccolò Mazzucco](https://doi.org/10.13131/unipi/z332-ye56). |
| [**NERD**](https://github.com/apalmisano82/NERD) <br> latest <br> [`get_c14data("nerd")`](R/get_nerd.R) | Near East Radiocarbon Dates Alessio Palmisano, Andrew Bevan, Dan Lawrence & Stephen Shennan (2021). |
| [**pacea**](http://www.paleoanthro.org/media/journal/content/PA20110001_S01.zip) <br> 2020-01-22 <br> [`get_c14data("pacea")`](R/get_pacea.R) | PACEA Geo-Referenced Radiocarbon Database for the late Middle Paleolithic, Upper Paleolithic, and initial Holocene in Europe by [Francesco D'Errico, William E. Banks, Marian Vanhaeren, Véronique Laroulandie and Mathieu Langlais](http://www.paleoanthro.org/media/journal/content/PA20110001.pdf) (2011).. |
| [**palmisano**](https://dx.doi.org/10.14324/000.ds.1575442) <br> 2017-09-23 <br> [`get_c14data("palmisano")`](R/get_palmisano.R) | Regional Demographic Trends and Settlement Patterns in Central Italy: Archaeological Sites and Radiocarbon Dates by [Alessio Palmisano, Andrew Bevan and Stephen Shennan](https://openarchaeologydata.metajnl.com/articles/10.5334/joad.43/) (2018). |
Expand Down
2 changes: 1 addition & 1 deletion data-raw/db_info_table.csv
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@ aida,today,1,https://raw.githubusercontent.com/apalmisano82/AIDA/main/dates.csv
sard,2021-03-01,1,https://raw.githubusercontent.com/emmaloftus/Southern-African-Radiocarbon-Database/main/SARD_Mar2021_14C.csv
p3k14c,2021-08-03,1,https://raw.githubusercontent.com/people3k/p3k14c/1.0.0/inst/p3k14c_scrubbed_fuzzed.csv
neonet,2023-12-08,1,https://digitallib.unipi.it/fedora/objects/mag:2814/datastreams/MMb714bbfacf4af2ce1fd7025e3789a99b/content
neonetb,2023-12-08,1,https://digitallib.unipi.it/fedora/objects/mag:2627/datastreams/MM54ff3698c0ea78b77469ce6462c2ca36/content
neonetatl,2023-12-08,1,https://digitallib.unipi.it/fedora/objects/mag:2627/datastreams/MM54ff3698c0ea78b77469ce6462c2ca36/content
36 changes: 18 additions & 18 deletions data-raw/variable_reference.csv
Original file line number Diff line number Diff line change
Expand Up @@ -602,21 +602,21 @@ shortref,neonet,bib
site,neonet,Site Name
sitetype,neonet,
species,neonet,Material Species
c13val,neonetb,
c14age,neonetb,C14Age
c14std,neonetb,C14SD
comment,neonetb,
country,neonetb,Country
culture,neonetb,
feature,neonetb,Phase Code
labnr,neonetb,Lab Code
lat,neonetb,Latitude
lon,neonetb,Longitude
material,neonetb,Material
method,neonetb,
period,neonetb,Period
region,neonetb,
shortref,neonetb,bib
site,neonetb,Site Name
sitetype,neonetb,
species,neonetb,Material Species
c13val,neonetatl,
c14age,neonetatl,C14Age
c14std,neonetatl,C14SD
comment,neonetatl,
country,neonetatl,Country
culture,neonetatl,
feature,neonetatl,Phase Code
labnr,neonetatl,Lab Code
lat,neonetatl,Latitude
lon,neonetatl,Longitude
material,neonetatl,Material
method,neonetatl,
period,neonetatl,Period
region,neonetatl,
shortref,neonetatl,bib
site,neonetatl,Site Name
sitetype,neonetatl,
species,neonetatl,Material Species
2 changes: 1 addition & 1 deletion man/c14bazAAR-package.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions man/db_getter_backend.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 59e7d6f

Please sign in to comment.