cran submission fix and new docs

MazamaScience · Apr 3, 2019 · 106bbc8 · 106bbc8
1 parent 80fa685
commit 106bbc8
Show file tree

Hide file tree

Showing 176 changed files with 226 additions and 212 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Type: Package
 Package: PWFSLSmoke
-Version: 1.2.1
+Version: 1.2.2
 Title: Utilities for Working with Air Quality Monitoring Data
 Authors@R: c(
     person("Jonathan", "Callahan", email="[email protected]", role=c("aut","cre")), 

diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,7 @@
+# PWFSLSmoke 1.2.2
+
+ * CRAN submission fix
+
 # PWFSLSmoke 1.2.1
 
  * addedd an introductory vignette

diff --git a/R/monitor_map.R b/R/monitor_map.R
@@ -90,7 +90,7 @@ monitor_map <- function(
 
     stateCodes <- unique(ws_monitor$meta$stateCode)
 
-    if ( is.null(stateCodes) || stateCodes == "" ) {
+    if ( is.null(stateCodes) || all(stateCodes == "") ) {
 
       # No stateCodes found. Use xlim and ylim.
       xlim <- range(ws_monitor$meta$longitude)

diff --git a/R/monitor_performanceMap.R b/R/monitor_performanceMap.R
@@ -2,7 +2,7 @@
 #' @export
 #' @import maps mapproj
 #'
-#' @title Create Map of Monitor Prediction Performance
+#' @title Create map of monitor prediction performance
 #'
 #' @param predicted ws_monitor object with predicted values
 #' @param observed ws_monitor object with observed  values
@@ -54,29 +54,31 @@
 #' title('Heidke Skill of monitors predicting another monitor.')
 #' }
 
-monitor_performanceMap <- function(predicted,
-                                   observed,
-                                   threshold = AQI$breaks_24[3],
-                                   cex = par("cex"),
-                                   sizeBy = NULL,
-                                   colorBy = "heidikeSkill",
-                                   breaks = c(-Inf, .5, .6, .7, .8, Inf),
-                                   paletteFunc = grDevices::colorRampPalette(
-                                     RColorBrewer::brewer.pal(
-                                       length(breaks), "Purples"
-                                     )[-1]
-                                   ),
-                                   showLegend = TRUE,
-                                   legendPos = "topright",
-                                   stateCol = "grey60",
-                                   stateLwd = 2,
-                                   countyCol = "grey70",
-                                   countyLwd = 1,
-                                   add = FALSE,
-                                   ...) {
-
-
-# below copies from monitor_performanceMap --------------------------------
+monitor_performanceMap <- function(
+  predicted,
+  observed,
+  threshold = AQI$breaks_24[3],
+  cex = par("cex"),
+  sizeBy = NULL,
+  colorBy = "heidikeSkill",
+  breaks = c(-Inf, .5, .6, .7, .8, Inf),
+  paletteFunc = grDevices::colorRampPalette(
+    RColorBrewer::brewer.pal(
+      length(breaks), "Purples"
+    )[-1]
+  ),
+  showLegend = TRUE,
+  legendPos = "topright",
+  stateCol = "grey60",
+  stateLwd = 2,
+  countyCol = "grey70",
+  countyLwd = 1,
+  add = FALSE,
+  ...
+) {
+
+
+  # below copies from monitor_performanceMap -----------------------------------
 
   # Get the performance dataframe
   performanceDF <- monitor_performance(predicted, observed, threshold, threshold)
@@ -86,7 +88,7 @@ monitor_performanceMap <- function(predicted,
 
     stateCodes <- unique(predicted$meta$stateCode)
 
-    if ( is.null(stateCodes) || stateCodes == "" ) {
+    if ( is.null(stateCodes) || all(stateCodes == "") ) {
 
       # No stateCodes found. Use xlim and ylim.
       xlim <- range(predicted$meta$longitude)

diff --git a/docs/LICENSE-text.html b/docs/LICENSE-text.html
diff --git a/docs/articles/Data_Model.html b/docs/articles/Data_Model.html
diff --git a/docs/articles/Maps_and_Timeseries_Plots.html b/docs/articles/Maps_and_Timeseries_Plots.html
diff --git a/docs/articles/NowCast.html b/docs/articles/NowCast.html
diff --git a/docs/articles/PWFSLSmoke.html b/docs/articles/PWFSLSmoke.html
diff --git a/docs/articles/articles/esriMap.html b/docs/articles/articles/esriMap.html
diff --git a/docs/articles/articles/esriMap_files/figure-html/makeMap-1.png b/docs/articles/articles/esriMap_files/figure-html/makeMap-1.png
diff --git a/docs/articles/index.html b/docs/articles/index.html
diff --git a/docs/authors.html b/docs/authors.html
diff --git a/docs/index.html b/docs/index.html
diff --git a/docs/news/index.html b/docs/news/index.html
diff --git a/docs/reference/AIRSIS.html b/docs/reference/AIRSIS.html
diff --git a/docs/reference/AQI.html b/docs/reference/AQI.html
diff --git a/docs/reference/AQI_en.html b/docs/reference/AQI_en.html
diff --git a/docs/reference/AQI_es.html b/docs/reference/AQI_es.html
diff --git a/docs/reference/CONUS.html b/docs/reference/CONUS.html
diff --git a/docs/reference/Carmel_Valley.html b/docs/reference/Carmel_Valley.html
diff --git a/docs/reference/Northwest_Megafires.html b/docs/reference/Northwest_Megafires.html
diff --git a/docs/reference/PWFSLSmoke-deprecated.html b/docs/reference/PWFSLSmoke-deprecated.html
diff --git a/docs/reference/US_52.html b/docs/reference/US_52.html
diff --git a/docs/reference/WRCC.html b/docs/reference/WRCC.html
diff --git a/docs/reference/addAQILegend.html b/docs/reference/addAQILegend.html
diff --git a/docs/reference/addAQILines.html b/docs/reference/addAQILines.html
diff --git a/docs/reference/addAQIStackedBar.html b/docs/reference/addAQIStackedBar.html
diff --git a/docs/reference/addBullseye.html b/docs/reference/addBullseye.html
diff --git a/docs/reference/addClustering.html b/docs/reference/addClustering.html
diff --git a/docs/reference/addEsriAddress.html b/docs/reference/addEsriAddress.html
diff --git a/docs/reference/addGoogleAddress.html b/docs/reference/addGoogleAddress.html
diff --git a/docs/reference/addGoogleElevation.html b/docs/reference/addGoogleElevation.html
diff --git a/docs/reference/addIcon.html b/docs/reference/addIcon.html
diff --git a/docs/reference/addMarker.html b/docs/reference/addMarker.html
diff --git a/docs/reference/addMazamaMetadata.html b/docs/reference/addMazamaMetadata.html
diff --git a/docs/reference/addPolygon.html b/docs/reference/addPolygon.html