Merge pull request #163 from zoometh/master

neonetb v1 & neonet v2

R/get_c14data.R

@@ -153,7 +153,8 @@ get_all_parser_functions <- function() {
     "rxpand" = c14bazAAR::get_rxpand,
     "sard" = c14bazAAR::get_sard,
     "p3k14c" = c14bazAAR::get_p3k14c,
-    "neonet" = c14bazAAR::get_neonet
+    "neonet" = c14bazAAR::get_neonet,
+    "neonet" = c14bazAAR::get_neonetb
   ))
 }
 

R/get_neonetb.R

@@ -0,0 +1,30 @@
+#' @rdname db_getter_backend
+#' @export
+get_neonetb <- function(db_url = get_db_url("neonetb")) {
+
+  check_connection_to_url(db_url)
+
+  c14dates <- data.table::fread(db_url)
+
+  neonetb <- c14dates %>%
+    dplyr::transmute(
+      labnr = .data[["LabCode"]],
+      c14age = .data[["C14Age"]],
+      c14std = .data[["C14SD"]],
+      site = .data[["SiteName"]],
+      feature = .data[["PhaseCode"]],
+      period = .data[["Period"]],
+      material = .data[["Material"]],
+      species = .data[["MaterialSpecies"]],
+      country = .data[["Country"]],
+      lat = .data[["Latitude"]],
+      lon = .data[["Longitude"]],
+      shortref = .data[["bib"]],
+    ) %>% dplyr::mutate(
+      sourcedb = "neonetb",
+      sourcedb_version = get_db_version("neonetb")
+    ) %>%
+    as.c14_date_list()
+
+  return(neonetb)
+}

README.md

@@ -169,7 +169,8 @@ To suggest other archives to be queried you can join the discussion [here](https
 | [**kiteeastafrica**](https://dataverse.harvard.edu/dataset.xhtml?persistentId=doi:10.7910/DVN/NJLNRJ) <br> 2016-04-28 <br> [`get_c14data("kiteeastafrica")`](R/get_kiteeastafrica.R) | Radiocarbon dates from eastern Africa in the CARD2.0 format by [Colin Courtney Mustaphi, Rob Marchant](https://www.openquaternary.com/articles/10.5334/oq.22/). |
 | [**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-07-15 <br> [`get_c14data("neonet")`](R/neonet.R) | The NeoNet app is an online open source interactive and user-friendly R Shiny application for mapping radiocarbon dates from the Late Mesolithic / Early Neolithic transition in the European river basins of the north-central Mediterranean by [Thomas Huet, Niccolò Mazzucco, Miriam Cubas Morera, Juan Gibaja, F. Xavier Oms, António Faustino Carvalho, Ana Catarina Basilio, Elías López-Romero](https://openarchaeologydata.metajnl.com/articles/10.5334/joad.87). |
+| [**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](). |
 | [**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). |

data-raw/db_info_table.csv

@@ -27,4 +27,5 @@ caribbean,2021-05-21,1,https://raw.githubusercontent.com/philriris/caribbean-14C
 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-07-15,1,http://mappaproject.arch.unipi.it/mod/files/140_140_id00140_doc_elencoc14.tsv
+neonet,2023-12-08,2,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

data-raw/variable_reference.csv

@@ -602,3 +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