From a2b38ab0fff4543ddf32f9da3380e5326934862c Mon Sep 17 00:00:00 2001 From: hrbrmstr Date: Sat, 11 Apr 2020 23:00:21 -0400 Subject: [PATCH] fixed nssp_er_visits_regional --- DESCRIPTION | 2 +- NEWS.md | 3 +++ R/nss-cd-reg.R | 2 +- README.md | 16 +++++++++------- 4 files changed, 14 insertions(+), 9 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 716dacc..e45c7ee 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: cdccovidview Type: Package Title: Weekly Surveillance Summary of U.S. COVID-19 Activity -Version: 0.1.0 +Version: 0.1.1 Date: 2020-04-11 Authors@R: c( person("Bob", "Rudis", email = "bob@rud.is", role = c("aut", "cre"), diff --git a/NEWS.md b/NEWS.md index 9b4679b..8ea30fc 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,2 +1,5 @@ +0.1.1 +* Fixed `nssp_er_visits_regional()` + 0.1.0 * Initial release diff --git a/R/nss-cd-reg.R b/R/nss-cd-reg.R index ef6e48b..ab6fd4e 100644 --- a/R/nss-cd-reg.R +++ b/R/nss-cd-reg.R @@ -13,7 +13,7 @@ nssp_er_visits_regional <- function() { lapply(regions, function(region){ - reg_tbl <- rvest::html_nodes(pg, xpath=".//table[contains(., 'National')]") + reg_tbl <- rvest::html_nodes(pg, xpath=sprintf(".//table[contains(., '%s (')]", region)) nat_rows <- rvest::html_nodes(reg_tbl, "tbody > tr") lapply(nat_rows, function(.x) { nat_tds <- rvest::html_nodes(.x, "td") diff --git a/README.md b/README.md index b3d39ff..bb4a479 100644 --- a/README.md +++ b/README.md @@ -60,6 +60,8 @@ The following functions are implemented: ## Installation ``` r +install.packages("cdccovidview", repos = c("https://cinc.rud.is", "https://cloud.r-project.org/")) +# or remotes::install_git("https://git.rud.is/hrbrmstr/cdccovidview.git") # or remotes::install_git("https://git.sr.ht/~hrbrmstr/cdccovidview") @@ -81,7 +83,7 @@ library(cdccovidview) # current version packageVersion("cdccovidview") -## [1] '0.1.0' +## [1] '0.1.1' ``` ``` r @@ -182,12 +184,12 @@ head(nssp_er_visits_national()) head(nssp_er_visits_regional()) ## week num_fac total_ed_visits visits pct_visits visit_type region source year -## 1 40 3255 2146776 19503 0.009 ili Region 1 Emergency Departments 2019 -## 2 41 3249 2106999 20457 0.010 ili Region 1 Emergency Departments 2019 -## 3 42 3256 2101358 22515 0.011 ili Region 1 Emergency Departments 2019 -## 4 43 3254 2122427 23776 0.011 ili Region 1 Emergency Departments 2019 -## 5 44 3295 2087335 25466 0.012 ili Region 1 Emergency Departments 2019 -## 6 45 3315 2137854 29948 0.014 ili Region 1 Emergency Departments 2019 +## 1 41 202 130377 814 0.006 ili Region 1 Emergency Departments 2019 +## 2 42 202 132385 912 0.007 ili Region 1 Emergency Departments 2019 +## 3 43 202 131866 883 0.007 ili Region 1 Emergency Departments 2019 +## 4 44 203 128256 888 0.007 ili Region 1 Emergency Departments 2019 +## 5 45 203 127466 979 0.008 ili Region 1 Emergency Departments 2019 +## 6 46 202 125306 1188 0.009 ili Region 1 Emergency Departments 2019 ``` ### Mortality