Merge pull request #418 from DOI-USGS/api-update

Api update

DESCRIPTION

@@ -32,7 +32,7 @@ Imports: hydroloom, dataRetrieval, dplyr, sf, units, magrittr, jsonlite, httr, x
 Suggests: testthat, knitr, rmarkdown, ggmap, ggplot2, lwgeom, gifski, leaflet, httptest, future, future.apply
 License: CC0
 Encoding: UTF-8
-RoxygenNote: 7.3.1
+RoxygenNote: 7.3.2
 VignetteBuilder: knitr
 Config/testthat/parallel: true
 Config/testthat/edition: 3

R/A_nhdplusTools.R

@@ -92,7 +92,7 @@ nhdplus_attributes <- list(
 
 assign("nhdplus_attributes", nhdplus_attributes, envir = nhdplusTools_env)
 
-assign("geoserver_root", "https://labs.waterdata.usgs.gov/geoserver/",
+assign("geoserver_root", "https://api.water.usgs.gov/geoserver/",
        envir = nhdplusTools_env)
 
 assign("arcrest_root", "https://hydro.nationalmap.gov/arcgis/rest/services/",
@@ -276,10 +276,16 @@ nhdplus_debug <- function() {
 #' @noRd
 get_nldi_url <- function() {
 
-  tier <- get("nldi_tier", envir = nhdplusTools_env)
+  tier_env <- Sys.getenv("NLDI_TIER")
+
+  tier <- if(tier_env != "") {
+    tier_env
+  } else {
+    get("nldi_tier", envir = nhdplusTools_env)
+  }
 
   if (tier == "prod") {
-    "https://labs.waterdata.usgs.gov/api/nldi"
+    "https://api.water.usgs.gov/nldi"
   } else if (tier == "test") {
     "https://labs-beta.waterdata.usgs.gov/api/nldi"
   } else {

R/discover_nhdplus.R

@@ -35,8 +35,19 @@ discover_nhdplus_id <- function(point = NULL, nldi_feature = NULL, raindrop = FA
     coords = sf::st_coordinates(point)
 
     comid <- tryCatch({
-      as.integer(dataRetrieval::findNLDI(location = c(X = coords[1],
-                                           Y = coords[2]))$origin$identifier)
+
+      URL <- paste0(get("geoserver_root", envir = nhdplusTools_env),
+                    "wmadata",
+                    "/ows",
+                    "?service=WFS&request=GetFeature&version=1.0.0", # axis order switched in 1.1.0
+                    "&typeName=catchmentsp&outputFormat=application/json",
+                    "&CQL_FILTER=INTERSECTS(the_geom, POINT (",
+                    coords[1], " ", coords[2], "))",
+                    "&propertyName=featureid")
+
+      d <- jsonlite::fromJSON(rawToChar(RETRY("GET", utils::URLencode(URL))$content))
+
+      as.integer(d$features$properties$featureid)
 
     }, error = function(e) NULL)
 

R/geoserver_tools.R

@@ -107,7 +107,7 @@ query_usgs_geoserver <- function(AOI = NULL,  ids = NULL,
                         version="1.1.0" outputFormat="application/json"',
                        ' xsi:schemaLocation="http://www.opengis.net/wfs
                         http://schemas.opengis.net/wfs/1.1.0/wfs.xsd">',
-                       '<wfs:Query xmlns:feature="https://cida.usgs.gov/',
+                       '<wfs:Query xmlns:feature="https://api.water.usgs.gov/',
                        here$server,
                        '" typeName="feature:',
                        here$geoserver,

R/get_hydro.R

@@ -12,7 +12,7 @@
 #'
 #' See <doi:10.5066/P92U7ZUT> for full source data.
 #'
-#' See https://labs.waterdata.usgs.gov/geoserver/web/ for the web service.
+#' See https://api.water.usgs.gov/geoserver/web/ for the web service.
 #'
 #' `huc12_nhdplusv2` derives from a snapshot of the WBD available from the nhdplusv2.
 #' See \link{download_nhdplusv2} for source data documentation.

R/get_nldi.R

@@ -291,7 +291,7 @@ query_nldi <- function(query, base_path = "/linked-data", parse_json = TRUE, err
       message(url)
     }
 
-    req_data <- rawToChar(httr::RETRY("GET", url)$content)
+    req_data <- rawToChar(httr::RETRY("GET", utils::URLencode(url))$content)
 
     if (nchar(req_data) == 0) {
       NULL