Merge pull request #55 from California-Data-Collaborative/emwdDeploy

small changes for EMWD deploy

Author: christophertull

R/rate_inputs.R

@@ -195,7 +195,7 @@ eval_uniques <- function(colList, value_map){
 
   for(v in ls){
     print(v)
-    if(v != ""){
+    if(v != "" & !is.na(v) & !is.null(v)){
       value <- value_map[[v]]
 
       if(!is.null(value)){

global.R

@@ -69,14 +69,16 @@ owrs_file <- switch(utility_code,
                     "MNWD"="mnwd.owrs",
                     "LVMWD"="data/lvmwd_simplified.owrs",
                     "SMWD"="data/smwd-2017-01-01_simplified.owrs",
-                    "SMC"="data/smc-2017-01-01_simplified.owrs")
+                    "SMC"="data/smc-2017-01-01_simplified.owrs",
+                    "EMWD"="data/emwd_simplified.owrs")
 
 baseline_rate_list <- RateParser::read_owrs_file(owrs_file)
 
 is_budget <- switch(utility_code,
                     "IRWD"=,
                     "MNWD"=,
                     "LVMWD"=,
+                    "EMWD"=,
                     "SMWD"=TRUE,
                     "SMC"=FALSE)
 
@@ -85,14 +87,16 @@ less_than_date <- switch(utility_code,
                          "MNWD"="2017-01-01",
                          "LVMWD"="2017-01-01",
                            "SMWD"="2016-01-01",
-                         "SMC"="2017-01-01")
+                         "SMC"="2017-01-01",
+                         "EMWD"="2017-01-01")
 
 test_file <- switch(utility_code,
                     "IRWD"="data/irwd_test.csv",
                     "MNWD"="data/mnwd_sample_revised.csv",
                     "LVMWD"="data/lvmwd_test2_comm_budgets_monthly.csv",
                     "SMWD"="data/smwd_test2.csv",
-                    "SMC"="data/smc_test2.csv")
+                    "SMC"="data/smc_test2.csv",
+                    "EMWD"="data/emwd_sample.csv")
 
 
 

server.R

@@ -481,13 +481,7 @@ shinyServer(function(input, output, clientData, session) {
   # Calculate bills and tiers for the MNWD residential baseline rate
   #******************************************************************
   baseline_bill_info <- reactive({
-    switch(utility_code,
-         "IRWD"=baseline(basedata=DF()),
-         "MNWD"=baseline(basedata=DF()),
-         "LVMWD"=baseline(basedata=DF()),
-         "SMWD"=baseline(basedata=DF()),
-         "SMC"=baseline(basedata=DF())
-    )
+    baseline(basedata=DF())
   })
 
 })