Merge pull request #335 from dblodgett-usgs/main

hydroloom news and test fix for latest sf
DOI-USGS · Mar 9, 2023 · 1cf251f · 1cf251f
2 parents 9cb909e + 7fd6be6
commit 1cf251f
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 6 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -28,7 +28,7 @@ Imports: dplyr, rlang, sf, RANN, units, magrittr, jsonlite, httr, xml2, R.utils,
 Suggests: testthat, knitr, rmarkdown, markdown, ggmap, ggplot2, sp, lwgeom, devtools, codetools, data.table, parallel, s2, gifski, leaflet
 License: CC0
 Encoding: UTF-8
-RoxygenNote: 7.2.2
+RoxygenNote: 7.2.3
 VignetteBuilder: knitr
 Config/testthat/parallel: true
 Config/testthat/edition: 3

diff --git a/README.Rmd b/README.Rmd
@@ -19,6 +19,14 @@ knitr::opts_chunk$set(
 
 ## nhdplusTools: Tools for Accessing and Working with the NHDPlus
 
+*New nhdplusTools is coming*
+
+`nhdplusTools` is being split into two packages. A new package [`hydroloom`](https://github.com/DOI-USGS/hydroloom) is now available for testing. It contains all nhdplusTools functionality not related to specific dataset schemas. See [this issue](https://github.com/DOI-USGS/nhdplusTools/issues/307) for details. The transition to `hydroloom` should occur in Fall 2023. In the mean time, you can install the `hydroloom` version of nhdplusTools with:
+
+`remotes::install_github("doi-usgs/nhdplusTools@hydroloom")`
+
+Please submit issues at: https://github.com/DOI-USGS/nhdplusTools/issues
+
 This package is a growing set of tools for manipulation of hydrographic
 data using the NHDPlus data model. There is no specific
 funding or plan to continue development of this package long term

diff --git a/README.md b/README.md
@@ -11,6 +11,21 @@ Downloads](https://cranlogs.r-pkg.org/badges/grand-total/nhdplusTools)](https://
 
 ## nhdplusTools: Tools for Accessing and Working with the NHDPlus
 
+*New nhdplusTools is coming*
+
+`nhdplusTools` is being split into two packages. A new package
+[`hydroloom`](https://github.com/DOI-USGS/hydroloom) is now available
+for testing. It contains all nhdplusTools functionality not related to
+specific dataset schemas. See [this
+issue](https://github.com/DOI-USGS/nhdplusTools/issues/307) for details.
+The transition to `hydroloom` should occur in Fall 2023. In the mean
+time, you can install the `hydroloom` version of nhdplusTools with:
+
+`remotes::install_github("doi-usgs/nhdplusTools@hydroloom")`
+
+Please submit issues at:
+<https://github.com/DOI-USGS/nhdplusTools/issues>
+
 This package is a growing set of tools for manipulation of hydrographic
 data using the NHDPlus data model. There is no specific funding or plan
 to continue development of this package long term but ongoing support is

diff --git a/tests/testthat/test_index.R b/tests/testthat/test_index.R
@@ -192,11 +192,9 @@ test_that("get location", {
 
   locations <- get_hydro_location(indexes, sample_flines)
 
-  expect_equal(sf::st_coordinates(locations)[, 1:2],
-               structure(c(-76.8693957911233, -76.9176139910484, -76.8810037244386,
-                           39.4932572053652, 39.4090934721626, 39.3632976055671),
-                         .Dim = 3:2, .Dimnames = list(c("1", "2", "3"),
-                                                      c("X", "Y"))))
+  expect_equal(as.numeric(sf::st_coordinates(locations)[, 1:2]),
+               c(-76.8693957911233, -76.9176139963277, -76.8810037292214, 39.4932572053652,
+                 39.4090934738461, 39.3632976014239))
 
   points <- sf::st_sfc(sf::st_sfc(list(sf::st_point(c(-76.86934, 39.49328))),
                                   crs = 4326))