localNotebooks/ cleanup

DESCRIPTION

@@ -1,6 +1,6 @@
 Type: Package
 Package: PWFSLSmoke
-Version: 1.0.1
+Version: 1.0.2
 Title: Utilities for Working with Air Quality Monitoring Data
 Authors@R: c(
     person("Jonathan", "Callahan", email="[email protected]", role=c("aut","cre")), 

NEWS.md

@@ -9,6 +9,11 @@ from the US EPA, AirNow, AIRSIS, WRCC and others.
 
 ## Version 1.0 -- Monitoring Data Access
 
+### PWFSLSmoke 1.0.2
+
+ * `monitor~` functions now test for empty `ws_monitor` objects
+ * new Github `localNotebooks/` directory contains detailed examples
+
 ### PWFSLSmoke 1.0.1
 
  * `monitor~` functions now test for empty `ws_monitor` objects

README.md

@@ -61,18 +61,18 @@ installSpatialData()
 
 ## Examples
 
-Additional vignettes that demonstrate the functionality of the package can be found in the
-[localVignettes](https://github.com/MazamaScience/PWFSLSmoke/tree/master/localVignettes)
-directory on github. These vignettes are not part of the package because they require
+Additional R Notebooks that demonstrate the functionality of the package can be found in the
+[localNotebooks](https://github.com/MazamaScience/PWFSLSmoke/tree/master/localNotebooks)
+directory on github. These notebooks are not part of the package because they require
 installation of the **MazamaSpatialUtils** datasets.
 
 To run them you should:
 
  * make sure you have the proper spatial data installed in `~/Data/Spatial/`
  * make sure you have both the **knitr** and **rmarkdown** packages installed
- * download the localVignettes
- * open one with RStudio
- * click the "Knit" button
+ * download the `localNotebooks/` directory
+ * open a notebook with RStudio
+ * click the "Knit" or "Preview" button in RStudio
 
 ----
 

localExecutables/airsis_getYearlyData_exec.R

@@ -9,23 +9,17 @@
 
 VERSION <- "0.0.1"
 
-suppressPackageStartupMessages(
-  {
+suppressPackageStartupMessages({
     library(methods)
     library(optparse)
     library(PWFSLSmoke)
     library(MazamaSpatialUtils)
-  }
-)
+})
 
 ##########################################
 
 saveAirsisData <- function(opt) {
 
-  # Get all unitids 
-  usfs_unitids <- airsis_availableUnits(opt$startdate, opt$enddate, provider = 'USFS')
-  apcd_unitids <- airsis_availableUnits(opt$startdate, opt$enddate, provider = 'APCD')
-
   # for usfs and apcd, make a list of ws_monitor objects for all units
   monitors <- list()
 

localNotebooks/AIRSIS_Data_Handling.Rmd

@@ -2,11 +2,9 @@
 title: "AIRSIS Data Acquisition and Handling"
 author: "Mazama Science"
 date: '`r Sys.Date()`'
-output: rmarkdown::html_vignette
-vignette: >
-  %\VignetteIndexEntry{AIRSIS Data Acquisition and Handling}
-  %\VignetteEngine{knitr::rmarkdown}
-  %\VignetteEncoding{UTF-8}
+output:
+  html_notebook: default
+  html_document: default
 ---
 
 ```{r, echo=FALSE}

localNotebooks/AIRSIS_Raw_Data.Rmd

@@ -1,12 +1,10 @@
 ---
 title: "AIRSIS Raw Data"
 author: "Mazama Science"
-date: "`r Sys.Date()`"
-output: rmarkdown::html_vignette
-vignette: >
-  %\VignetteIndexEntry{AIRSIS Raw Data}
-  %\VignetteEngine{knitr::rmarkdown}
-  %\VignetteEncoding{UTF-8}
+date: '`r Sys.Date()`'
+output:
+  html_document: default
+  html_notebook: default
 ---
 
 ```{r, echo=FALSE}

localNotebooks/airsis_yearlyData.Rmd

@@ -2,7 +2,9 @@
 title: "Yearly AIRSIS Data"
 author: "Mazama Science"
 date: "`r Sys.Date()`"
-output: html_document
+output:
+  html_document: default
+  html_notebook: default
 ---
 
 ```{r, echo=FALSE}
@@ -18,8 +20,8 @@ suppressPackageStartupMessages({
   library(PWFSLSmoke)
   library(ggplot2)
   library(gridExtra)
-}
-  )
+})
+
 logger.setLevel(ERROR)
 load("~/Data/airsis/airsis_2015.RData")
 load("~/Data/airsis/airsis_2016.Rdata")