Merge pull request #30 from USEPA/dev

Update data commons url

R/UtilityFunctions.R

@@ -174,7 +174,7 @@ getFlowsaData <- function(dataname, year) {
   # Define file directory
   directory <- file.path(rappdirs::user_data_dir(), subdirectory)
   if (!file.exists(file.path(directory, filename))) {
-    url <- paste0("https://edap-ord-data-commons.s3.amazonaws.com/", subdirectory)
+    url <- paste0("https://dmap-data-commons-ord.s3.amazonaws.com/", subdirectory)
     logging::loginfo(paste0("file not found, downloading from ", url))
     # Check for and create directory if necessary
     if (!file.exists(directory)) {
@@ -197,7 +197,7 @@ getFlowsaData <- function(dataname, year) {
 #' "flowsa/FlowByActivity".
 #' @return A dataframe of StateIO data registry on Data Commons.
 getRegistryonDataCommons <- function(data_group = "stateio") {
-  registry_ls <- aws.s3::get_bucket(bucket = "edap-ord-data-commons",
+  registry_ls <- aws.s3::get_bucket(bucket = "dmap-data-commons-ord",
                                     prefix = data_group)
   registry <- cbind.data.frame(basename(sapply(registry_ls, `[[`, "Key")),
                                sapply(registry_ls, `[[`, "LastModified"),
@@ -251,7 +251,7 @@ downloadStateIODatafromDataCommons <- function(filename, ver = NULL) {
     f <- paste0(paste(filename, ver, sep = "_"), ".rds")
   }
   # Download file
-  url <- "https://edap-ord-data-commons.s3.amazonaws.com/stateio"
+  url <- "https://dmap-data-commons-ord.s3.amazonaws.com/stateio"
   utils::download.file(file.path(url, f),
                        file.path(directory, f), mode = "wb", quiet = TRUE)
 }
@@ -296,7 +296,7 @@ loadStateIODataFile <- function(filename, ver = NULL) {
                                    "not found in local data directory, either."))
             message("Please confirm ", filename, " is correctly spelled. ",
                     "You should be able to find the correctly spelled file on ",
-                    "https://edap-ord-data-commons.s3.amazonaws.com/index.html?prefix=stateio/. ",
+                    "https://dmap-data-commons-ord.s3.amazonaws.com/index.html?prefix=stateio/. ",
                     "If it's not found there, please open an issue at ",
                     "https://github.com/USEPA/stateior/issues/new ",
                     "and inform package maintainers.\n",

format_specs/OneRegionData.md

@@ -12,7 +12,7 @@ One region IO data created by `stateior` are data for single states saved as `.r
 | Commodity Output               | State_Summary_CommodityOutput_`year`_`version` | numeric vector | [Output Vectors](https://github.com/USEPA/useeior/blob/v1.1.0/format_specs/Model.md#output-vectors) |
 | Industry Output                | State_Summary_IndustryOutput_`year`_`version`  | numeric vector | [Output Vectors](https://github.com/USEPA/useeior/blob/v1.1.0/format_specs/Model.md#output-vectors)|
 
-<sup>1</sup> Data names on [Data Commons](https://edap-ord-data-commons.s3.amazonaws.com/index.html?prefix=stateio/). `year` and `version` are subject to change.
+<sup>1</sup> Data names on [Data Commons](https://dmap-data-commons-ord.s3.amazonaws.com/index.html?prefix=stateio/). `year` and `version` are subject to change.
 
 <sup>2</sup> These Use tables add, as the final column, the international trade adjustment (ITA) containing the value of all transportation and insurance services and customs duties 
 

format_specs/TwoRegionData.md

@@ -19,7 +19,7 @@ Each two-region matrix has a four-quadrant structure. In each matrix, `SoI` is r
 | Commodity Output               | TwoRegion_Summary_CommodityOutput_`year`_`version` | numeric vector | [Two-region total output by commodity](#Two-Region-Output-Vectors) |
 | Industry Output                | TwoRegion_Summary_IndustryOutput_`year`_`version`  | numeric vector | [Two-region total output by industry](#Two-Region-Output-Vectors) |
 
-<sup>1</sup> Data names on [Data Commons](https://edap-ord-data-commons.s3.amazonaws.com/index.html?prefix=stateio/). `year` and `version` are subject to change.
+<sup>1</sup> Data names on [Data Commons](https://dmap-data-commons-ord.s3.amazonaws.com/index.html?prefix=stateio/). `year` and `version` are subject to change.
 
 ### Two Region Make
 The two-region Make is an `industry x commodity` matrix with amounts of commodities (in model year USD) being made by industries.