fix check issues on zack's branch

USGS-R · Aug 10, 2020 · ddb9d52 · ddb9d52
1 parent cf0a433
commit ddb9d52
Show file tree

Hide file tree

Showing 36 changed files with 119 additions and 215 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -30,4 +30,4 @@ Suggests:
     knitr,
     rmarkdown
 VignetteBuilder: knitr
-RoxygenNote: 5.0.1
+RoxygenNote: 7.0.2
diff --git a/NAMESPACE b/NAMESPACE
@@ -1,19 +1,23 @@
 # Generated by roxygen2: do not edit by hand
 
 export(addLayer)
+export(aliasExists)
 export(authenticateUser)
 export(checkItemExists)
+export(cleanAndValidateAlias)
 export(createStorm)
 export(deleteDownload)
 export(deleteTileCache)
 export(downloadItem)
+export(getAlias)
 export(getItem)
 export(getLayer)
 export(grabXML)
 export(historical.service)
 export(loadConfig)
 export(realtime.service)
 export(refreshItemThumbnail)
+export(saveAlias)
 export(saveItem)
 export(saveTrack)
 export(setBaseURL)

diff --git a/R/grabXML.R b/R/grabXML.R
@@ -11,12 +11,13 @@
 #' @export
 #'
 #' @examples
+#'\dontrun{
 #'serviceEndpoint  <- paste0('https://cida.usgs.gov/coastalhazards/csw/?',
 #''service=CSW&request=GetRecordById&version=2.0.2&typeNames=fgdc:metadata',
 #''&id=urn:uuid:12d6c1ee-a9e6-11e3-99f6-0050569524e0&',
 #''outputSchema=http://www.opengis.net/cat/csw/csdgm&elementSetName=full')
 #'doc <- grabXML(serviceEndpoint)
-
+#}
 grabXML = function(serviceEndpoint){
 
   #if xml

diff --git a/R/setBaseURL.R b/R/setBaseURL.R
@@ -22,7 +22,7 @@ setBaseURL = function(endpoint="prod"){
   endpoint = tolower(endpoint)
 
   if (endpoint=="prod"){
-    pkg.env$url_base = "https://cida.usgs.gov/coastalchangehazardsportal/"
+    pkg.env$url_base = "https://marine.usgs.gov/coastalchangehazardsportal/"
     cat('Setting endpoint to ',pkg.env$url_base,'\n')
   } else if (endpoint=="qa"){
     pkg.env$url_base = "https://cida-test.er.usgs.gov/coastalchangehazardsportal/"

diff --git a/R/vulnerability.service.R b/R/vulnerability.service.R
@@ -8,13 +8,15 @@
 #'@importFrom jsonlite toJSON
 #'@import XML
 #'@examples
-#'serviceEndpoint  <- paste0('https://cida.usgs.gov/coastalhazards/csw/?',
+#' \dontrun{
+#'serviceEndpoint  <- paste0('https://marine.usgs.gov/coastalhazards/csw/?',
 #''service=CSW&request=GetRecordById&version=2.0.2&typeNames=fgdc:metadata',
 #''&id=urn:uuid:12d6c1ee-a9e6-11e3-99f6-0050569524e0&',
 #''outputSchema=http://www.opengis.net/cat/csw/csdgm&elementSetName=full')
 #'attribute <- 'DHIGH'
 #'summary <- vulnerability.service(serviceEndpoint,attribute)
 #'print(summary)
+#'}
 #'
 #'@export
 vulnerability.service = function(serviceEndpoint,attribute){

diff --git a/inst/doc/hazardItems.html b/inst/doc/hazardItems.html
diff --git a/man/addLayer.Rd b/man/addLayer.Rd
diff --git a/man/aliasExists.Rd b/man/aliasExists.Rd
diff --git a/man/authenticateUser.Rd b/man/authenticateUser.Rd
diff --git a/man/checkAuth.Rd b/man/checkAuth.Rd
diff --git a/man/checkItemExists.Rd b/man/checkItemExists.Rd
diff --git a/man/cleanAndValidateAlias.Rd b/man/cleanAndValidateAlias.Rd
diff --git a/man/createStorm.Rd b/man/createStorm.Rd
diff --git a/man/deleteDownload.Rd b/man/deleteDownload.Rd
diff --git a/man/deleteTileCache.Rd b/man/deleteTileCache.Rd
diff --git a/man/downloadItem.Rd b/man/downloadItem.Rd
diff --git a/man/getAlias.Rd b/man/getAlias.Rd
diff --git a/man/getAuth.Rd b/man/getAuth.Rd
diff --git a/man/getItem.Rd b/man/getItem.Rd
diff --git a/man/getLayer.Rd b/man/getLayer.Rd
diff --git a/man/grabXML.Rd b/man/grabXML.Rd
diff --git a/man/historical.service.Rd b/man/historical.service.Rd
diff --git a/man/loadConfig.Rd b/man/loadConfig.Rd
diff --git a/man/realtime.service.Rd b/man/realtime.service.Rd
diff --git a/man/refreshItemThumbnail.Rd b/man/refreshItemThumbnail.Rd
diff --git a/man/saveAlias.Rd b/man/saveAlias.Rd
diff --git a/man/saveItem.Rd b/man/saveItem.Rd
diff --git a/man/saveTrack.Rd b/man/saveTrack.Rd
diff --git a/man/setBaseURL.Rd b/man/setBaseURL.Rd
diff --git a/man/storm.service.Rd b/man/storm.service.Rd
diff --git a/man/template.Rd b/man/template.Rd
diff --git a/man/thumb.service.Rd b/man/thumb.service.Rd
diff --git a/man/updateStorm.Rd b/man/updateStorm.Rd
diff --git a/man/vulnerability.service.Rd b/man/vulnerability.service.Rd
diff --git a/tests/testthat/test-checkItemExists.R b/tests/testthat/test-checkItemExists.R
@@ -3,6 +3,6 @@ context("testing checkItemExists")
 test_that ("check if item exists", {
   setBaseURL("prod")
   expect_false(checkItemExists("CHEX123")) # bad itemID
-  expect_true(checkItemExists("CAQw7M1")) # good itemID
+  expect_true(checkItemExists("CCGftiy")) # good itemID
 
 })
diff --git a/tests/testthat/test-eg.R b/tests/testthat/test-eg.R
@@ -2,7 +2,7 @@ context("testing setting endpoints to CCHP tiers")
 
 test_that("setting endpoints", {
   setBaseURL('prod')
-  expect_equal(pkg.env$item_json, "https://cida.usgs.gov/coastalchangehazardsportal/data/item/")
+  expect_equal(pkg.env$item_json, "https://marine.usgs.gov/coastalchangehazardsportal/data/item/")
   setBaseURL('qa')
   expect_equal(pkg.env$item_json, "https://cida-test.er.usgs.gov/coastalchangehazardsportal/data/item/")
   setBaseURL('dev')