v1.2.1

DESCRIPTION

 Package: GenEst
 Title: Generalized Mortality Estimator
 Version: 1.2.1
-Date: 2018-12-17
+Date: 2018-12-18
 Authors@R: c(
     person("Daniel", "Dalthorp", , "ddalthorp@usgs.gov", c("aut", "cre")),
     person("Juniper", "Simonis", , "simonis@dapperstats.com", "aut"),

DISCLAIMER.md

-This software is preliminary or provisional and is subject to revision. It is 
+This is an incremental update to GenEst v1.0.0 which was approved for release by the
+U.S. Geological Survey (USGS) after rigorous review. This software release is in
+compliance with the US Geological Survey publishing, which is associated with IP-101457.
+
+This update is preliminary or provisional and is subject to revision. It is 
 being provided to meet the need for timely best science. The software has not 
 received final approval by the U.S. Geological Survey (USGS). No warranty, 
 expressed or implied, is made by the USGS or the U.S. Government as to the 

R/app_download_functions.R

@@ -78,13 +78,12 @@ downloadgFig <- function(rv, sc){
 #' @export
 #'
 downloadMFig <- function(rv, split = TRUE){#, transpose = FALSE){
-
   if (split){
       downloadHandler(filename = "M_fig.png",
           content = function(file){
             png(file, height = rv$figH_M, width = rv$figW_M, units = "px")
             tryCatch(
-              plot(rv$Msplit),
+              plot(rv$Msplit, CL = rv$CL),
               error = function(x){plotNA()}
             )
             dev.off()
@@ -95,7 +94,7 @@ downloadMFig <- function(rv, split = TRUE){#, transpose = FALSE){
         content = function(file){
           png(file, height = rv$figH_M, width = rv$figW_M, units = "px")
           tryCatch(
-            plot(rv$M),
+            plot(rv$M, CL = rv$CL),
             error = function(x){plotNA()}
           )
           dev.off()

R/app_update_input.R

@@ -381,9 +381,8 @@ update_input <- function(eventName, rv, input, session){
   }
 
   if (eventName == "run_CP"){
-    toReset <- c("outgclass", "gSearchInterval", "gSearchMax")
+    toReset <- c("outgclass")#, "gSearchInterval", "gSearchMax")
     lapply(toReset, reset)
-    #reset("outgclass")
     updateTabsetPanel(session, "analyses_CP", "Model Comparison")
     updateSelectizeInput(session, "outCPl", choices = rv$modNames_CPl)
     updateSelectizeInput(session, "outCPs", choices = rv$modNames_CPs)

R/utility_functions.R

@@ -226,10 +226,10 @@ print.corpus_frame <- function(x, ...){
 #' @export
 
 defineUnitCol <- function(data_CO, data_SS = NULL, data_DWP = NULL){
-  ind <- sapply(data_SE, is.factor)
-  data_SE[ind] <- lapply(data_SE[ind], as.character)
-  ind <- sapply(data_CP, is.factor)
-  data_CP[ind] <- lapply(data_CP[ind], as.character)
+  ind <- sapply(data_SS, is.factor)
+  data_SS[ind] <- lapply(data_SS[ind], as.character)
+  ind <- sapply(data_CO, is.factor)
+  data_CO[ind] <- lapply(data_CO[ind], as.character)
   ind <- sapply(data_DWP, is.factor)
   data_DWP[ind] <- lapply(data_DWP[ind], as.character)
 

REVISIONS.txt

@@ -50,6 +50,8 @@ error message in lieu of crashing. (GUI)
 * added code to convert dataframe "factors" to "characters" prior to performing
 calculations in pkm0, cpm0, estM, estg, 
 
+* figure downloaded for estimated mortality corrected to properly reflect user's
+custom-selected CL
 
 2018.12.06
 v1.2.0

code.json

@@ -3,7 +3,7 @@
     "Name": "GenEst",
     "organization": "U.S. Geological Survey",
     "description": "R package for estimating bird and bat fatalities at wind and solar power facilities",
-    "version": "1.2.0",
+    "version": "1.2.1",
     "status": "Release Candidate",
 
  "permissions": {
@@ -44,7 +44,7 @@
     },
 
     "date": {
-      "metadataLastUpdated": "2018-12-06"
+      "metadataLastUpdated": "2018-12-18"
     }
   }    }
   }