From 26983aeba9c21e6405b469d8513ed00f274510d7 Mon Sep 17 00:00:00 2001
From: bransonf <32143148+bransonf@users.noreply.github.com>
Date: Fri, 11 Oct 2019 18:31:32 -0500
Subject: [PATCH 1/2] use switch instead of if, and case insensitize

---
 R/get_data.R | 72 ++++++++++++++++++++--------------------------------
 1 file changed, 27 insertions(+), 45 deletions(-)

diff --git a/R/get_data.R b/R/get_data.R
index 5320a13..5bcf23e 100644
--- a/R/get_data.R
+++ b/R/get_data.R
@@ -122,51 +122,33 @@ gw_get_data <- function(data, class, ...){
 # Create Calls for City Data
 gw_get_city <- function(data){
 
-  # create vectors
-  if (data == "Addresses") {
-    url <- "https://www.stlouis-mo.gov/data/upload/data-files/pargeocd.zip"
-    path <- "/pargeocd.shp"
-  }
-  else if (data == "Neighborhoods") {
-    url <- "https://www.stlouis-mo.gov/data/upload/data-files/nbrhds_wards.zip"
-    path <- "/nbrhds_wards/BND_Nhd88_cw.shp"
-  }
-  else if (data == "Land Records") {
-    url <- "https://www.stlouis-mo.gov/data/upload/data-files/par.zip"
-    path <- "/par.dbf"
-  }
-  else if (data == "Land Use") {
-    url <- "https://www.stlouis-mo.gov/data/upload/data-files/slup.zip"
-    path <- "/slup.shp"
-  }
-  else if (data == "Parcels") {
-    url <- "https://www.stlouis-mo.gov/data/upload/data-files/prcl_shape.zip"
-    path <- "/prcl.shp"
-  }
-  else if (data == "Parks") {
-    url <- "https://www.stlouis-mo.gov/data/upload/data-files/parks.zip"
-    path <- "/parks.shp"
-  }
-  else if (data == "Police Districts") {
-    url <- "https://www.stlouis-mo.gov/data/boundaries/upload/STL-Police-Districts-2014-2.zip"
-    path <- "/STL POLICE DISTRICTS/GIS.STL.POLICE_DISTRICTS_2014.shp"
-  }
-  else if (data == "Police Districts, Pre-2014") {
-    url <- "https://www.stlouis-mo.gov/data/boundaries/upload/STL-Police-Districts-pre-2014.zip"
-    path <- "/STL Police Districts - pre-2014/STLPOLICEDISTRICTSPRE2014.shp"
-  }
-  else if (data == "Voting Precincts") {
-    url <- "https://www.stlouis-mo.gov/data/upload/data-files/nbrhds_wards.zip"
-    path <- "/nbrhds_wards/POL_WRD_2010_Prec.shp"
-  }
-  else if (data == "Zoning") {
-    url <- "https://www.stlouis-mo.gov/data/upload/data-files/zoning.zip"
-    path <- "/prclz.shp"
-  }
-  else if (data == "Zoning, Multi") {
-    url <- "https://www.stlouis-mo.gov/data/upload/data-files/zoning.zip"
-    path <- "/prclzm.shp"
-  }
+  data <- tolower(data)
+  url <- switch (data,
+    addresses = "https://www.stlouis-mo.gov/data/upload/data-files/pargeocd.zip",
+    neighborhoods = "https://www.stlouis-mo.gov/data/upload/data-files/nbrhds_wards.zip",
+    `land records` = "https://www.stlouis-mo.gov/data/upload/data-files/par.zip",
+    `land use` = "https://www.stlouis-mo.gov/data/upload/data-files/slup.zip",
+    parcels = "https://www.stlouis-mo.gov/data/upload/data-files/prcl_shape.zip",
+    parks = "https://www.stlouis-mo.gov/data/upload/data-files/parks.zip",
+    `police districts` = "https://www.stlouis-mo.gov/data/boundaries/upload/STL-Police-Districts-2014-2.zip",
+    `police districts, pre-2014` = "https://www.stlouis-mo.gov/data/boundaries/upload/STL-Police-Districts-pre-2014.zip",
+    `voting precincts` = "https://www.stlouis-mo.gov/data/upload/data-files/nbrhds_wards.zip",
+    zoning = "https://www.stlouis-mo.gov/data/upload/data-files/zoning.zip",
+    `zoning, multi` = "https://www.stlouis-mo.gov/data/upload/data-files/zoning.zip"
+  )
+  path <- switch(data,
+    addresses = "/pargeocd.shp",
+    neighborhoods = "/nbrhds_wards/BND_Nhd88_cw.shp"
+    `land records` = "/par.dbf",
+    `land use` = "/slup.shp",
+    parcels = "/prcl.shp",
+    parks = "/parks.shp",
+    `police districts` = "/STL POLICE DISTRICTS/GIS.STL.POLICE_DISTRICTS_2014.shp",
+    `police districts, pre-2014` = "/STL Police Districts - pre-2014/STLPOLICEDISTRICTSPRE2014.shp",
+    `voting precincts` = "/nbrhds_wards/POL_WRD_2010_Prec.shp",
+    zoning = "/prclz.shp",
+    `zoning, multi` = "/prclzm.shp"
+  )
 
   # create list
   call <- list(

From 9a0d5b9337789404164d5211193e4437e1c79653 Mon Sep 17 00:00:00 2001
From: Branson Fox <32143148+bransonf@users.noreply.github.com>
Date: Wed, 16 Oct 2019 22:06:57 -0500
Subject: [PATCH 2/2] Update get_data.R

---
 R/get_data.R | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/R/get_data.R b/R/get_data.R
index 5bcf23e..c7afa6d 100644
--- a/R/get_data.R
+++ b/R/get_data.R
@@ -138,7 +138,7 @@ gw_get_city <- function(data){
   )
   path <- switch(data,
     addresses = "/pargeocd.shp",
-    neighborhoods = "/nbrhds_wards/BND_Nhd88_cw.shp"
+    neighborhoods = "/nbrhds_wards/BND_Nhd88_cw.shp",
     `land records` = "/par.dbf",
     `land use` = "/slup.shp",
     parcels = "/prcl.shp",