New Upstream Release - r-cran-ncdfgeom
Ready changes
Summary
Merged new upstream version: 1.1.5+dfsg (was: 1.1.4+dfsg).
Diff
diff --git a/DESCRIPTION b/DESCRIPTION
index bae193d..02e7aa8 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,14 +1,13 @@
Package: ncdfgeom
Type: Package
Title: 'NetCDF' Geometry and Time Series
-Version: 1.1.4
-Date: 2022-11-06
+Version: 1.1.5
Authors@R: c(person("David", "Blodgett", role = c("aut", "cre"),
email = "dblodgett@usgs.gov"),
person("Luke", "Winslow", role = "ctb"))
Description: Tools to create time series and geometry 'NetCDF' files.
URL: https://code.usgs.gov/water/ncdfgeom
-BugReports: https://github.com/USGS-R/ncdfgeom/issues
+BugReports: https://github.com/DOI-USGS/ncdfgeom/issues
Imports: RNetCDF, ncmeta, sf, dplyr, methods, stars
Depends: R (>= 3.5)
Suggests: testthat, knitr, rmarkdown, pkgdown, geoknife, ncdf4,
@@ -16,11 +15,11 @@ Suggests: testthat, knitr, rmarkdown, pkgdown, geoknife, ncdf4,
License: CC0
Encoding: UTF-8
VignetteBuilder: knitr
-RoxygenNote: 7.2.1
+RoxygenNote: 7.2.3
NeedsCompilation: no
-Packaged: 2022-11-08 19:28:51 UTC; dblodgett
+Packaged: 2023-03-24 21:10:20 UTC; dblodgett
Author: David Blodgett [aut, cre],
Luke Winslow [ctb]
Maintainer: David Blodgett <dblodgett@usgs.gov>
Repository: CRAN
-Date/Publication: 2022-11-08 22:40:02 UTC
+Date/Publication: 2023-03-24 21:40:02 UTC
diff --git a/MD5 b/MD5
index c4fb684..e95dcad 100644
--- a/MD5
+++ b/MD5
@@ -1,7 +1,7 @@
-975db24cdffe3ba45f5c15edb28a8f93 *DESCRIPTION
+f9b9fb46f602d724eff96ef39354786f *DESCRIPTION
c46267426930be3823092e5d94165ab3 *NAMESPACE
-a4400771a4becb03ca727a2905674e07 *NEWS.md
-71f44a5dac631435d74db5f6a06ee54f *R/0_ncdfgeom.R
+359b64a6f9aec197fded47aa17e35d87 *NEWS.md
+41dba69e0139984d03565272e89723df *R/0_ncdfgeom.R
467271e5173ab0b8df85078b6ddb12d1 *R/calculate_area_intersection_weights.R
107431a911a413553e40f57de3c1076f *R/check_netcdf.R
c6655ff284e0d6becef6eaa072bfe656 *R/create_cell_geometry.R
@@ -12,15 +12,15 @@ c9ba97b6e64ee7eb10bb6a5872987900 *R/read_attribute_data.R
8747f43adc5f4228524b2191f12915c6 *R/write_geometry.R
07fbff70ce9623d44f21656c3df8c9db *R/write_point_dsg.R
016718217f95432e2c08e264c6a5f9eb *R/write_timeseries_dsg.R
-45ad358cd6e3ea8e1f864ee787b21272 *README.md
-e4671f79a9e184e7571d67ddc333957e *build/vignette.rds
-cb2e214096cb29579fc3a4e0a58f1382 *inst/CITATION
+a38824c8b237cac8b760c0dd50eddb79 *README.md
+197caf4007b45c20991fdfbd4e4391da *build/vignette.rds
+27c1c43910e3ea59c15b1afe6b017431 *inst/CITATION
9f4c937d9643c6c9454297f43cdc0895 *inst/doc/geometry.R
4b72380fcc6a3b5d927ececb42c0d676 *inst/doc/geometry.Rmd
-f2dab2662ebb65488e8610e13cb7cd7e *inst/doc/geometry.html
-6d6f3f7badad0d5f7151e0c840686dff *inst/doc/ncdfgeom.R
-6a4c30612290e88dec674d8a96bd2585 *inst/doc/ncdfgeom.Rmd
-ad572dbe57c9e2e18d5d44873b7b3883 *inst/doc/ncdfgeom.html
+7fbcb802daf16cf773ffe04b3f84f23e *inst/doc/geometry.html
+65b86c0b18b301f5aa82afa7a47be908 *inst/doc/ncdfgeom.R
+28279ce7fc7ce02f2d15eba7f54ba683 *inst/doc/ncdfgeom.Rmd
+a2f7b0505583235b4432fe31b98243bc *inst/doc/ncdfgeom.html
10be0711fb8a2058282f77f95a039aa3 *inst/doc/timeseries.R
be0f1e01057f5db6c5d813aa85aa457d *inst/doc/timeseries.Rmd
d6a3b4c73fddeb764457d81b6f07a361 *inst/doc/timeseries.html
@@ -78,5 +78,5 @@ ff94e4c892cfed9163a63c37f6ee7aff *tests/testthat/test_poly.R
76a60fd90852936aa8c896a7e05abf35 *tests/testthat/test_read-write_attribute_data.R
f23bbe9bfad870f43874c242f1c55160 *tests/testthat/test_read-write_timeseries_dsg.R
4b72380fcc6a3b5d927ececb42c0d676 *vignettes/geometry.Rmd
-6a4c30612290e88dec674d8a96bd2585 *vignettes/ncdfgeom.Rmd
+28279ce7fc7ce02f2d15eba7f54ba683 *vignettes/ncdfgeom.Rmd
be0f1e01057f5db6c5d813aa85aa457d *vignettes/timeseries.Rmd
diff --git a/NEWS.md b/NEWS.md
index 1afbe84..6512290 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,3 +1,7 @@
+1.1.5
+==========
+* update URLs for new repository.
+
ncdfgeom 1.1.1
==========
* Updates to read and write timeseries DSG. Should be backwards compatible.
diff --git a/R/0_ncdfgeom.R b/R/0_ncdfgeom.R
index f89cf1e..85cdc80 100644
--- a/R/0_ncdfgeom.R
+++ b/R/0_ncdfgeom.R
@@ -1,7 +1,7 @@
.onAttach <- function(libname, pkgname) {
packageStartupMessage("****Support Package****
-This package is a USGS-R Support package.
+This package is a DOI-USGS Support package.
see: https://owi.usgs.gov/R/packages.html#support")
}
diff --git a/README.md b/README.md
index d567dac..f0f32fd 100644
--- a/README.md
+++ b/README.md
@@ -1,15 +1,18 @@
NetCDF-CF Geometry and Timeseries Tools for R
===
- [](https://app.codecov.io/gh/usgs-r/ncdfgeom) [](https://cran.r-project.org/package=ncdfgeom) [](https://cran.r-project.org/package=ncdfgeom)
+<!---
+ [](https://app.codecov.io/gh/doi-usgs/ncdfgeom)
+--->
+[](https://cran.r-project.org/package=ncdfgeom) [](https://cran.r-project.org/package=ncdfgeom)
`ncdfgeom` reads and writes geometry data (points lines and polygons), attributes of geometries, and time series associated with the geometries in a standards-compliant way.
It implements the NetCDF-CF Spatial Geometries specification and the timeSeries feature type of the [Discrete Sampling Geometry](http://cfconventions.org/cf-conventions/cf-conventions.html#discrete-sampling-geometries) NetCDF-CF specification.
-**Visit the [`pkgdown` site](https://usgs-r.github.io/ncdfgeom/articles/ncdfgeom.html) for a complete overview of the package.**
+**Visit the [`pkgdown` site](https://doi-usgs.github.io/ncdfgeom/articles/ncdfgeom.html) for a complete overview of the package.**
Given that this package is fairly new and in active development, please test it out
-and consider [submitting issues and/or contributions!](https://github.com/USGS-R/ncdfgeom/issues)
+and consider [submitting issues and/or contributions!](https://github.com/DOI-USGS/ncdfgeom/issues)
## Installation
@@ -22,7 +25,7 @@ install.packages("ncdfgeom")
For the latest development version:
```
install.packages("remotes")
-remotes::install_github("USGS-R/ncdfgeom")
+remotes::install_github("DOI-USGS/ncdfgeom")
```
## Contributing
diff --git a/build/vignette.rds b/build/vignette.rds
index 3232d5d..dacb884 100644
Binary files a/build/vignette.rds and b/build/vignette.rds differ
diff --git a/debian/changelog b/debian/changelog
index 2dec28a..17d19ed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+r-cran-ncdfgeom (1.1.5+dfsg-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Debian Janitor <janitor@jelmer.uk> Fri, 02 Jun 2023 02:31:57 -0000
+
r-cran-ncdfgeom (1.1.4+dfsg-1) unstable; urgency=medium
* New upstream version
diff --git a/inst/CITATION b/inst/CITATION
index 8159bc8..4ce4072 100644
--- a/inst/CITATION
+++ b/inst/CITATION
@@ -1,16 +1,16 @@
-citHeader("To cite ncdfgeom in publications, please use:")
-
-bibentry(bibtype = "Manual",
- author = personList(
- as.person("David Blodgett"),
- as.person("Luke Winslow")
- ),
- title = "ncdfgeom: 'NetCDF' Geometry and Time Series",
- publisher = "U.S. Geological Survey",
- address="Reston, VA",
- version = "1.1.0",
- institution = "U.S. Geological Survey",
- year = 2019,
- url = "https://code.usgs.gov/water/ncdfgeom",
- textVersion = "Blodgett, D., 2019, ncdfgeom: 'NetCDF' Geometry and Time Series, https://code.usgs.gov/water/ncdfgeom"
-)
+citHeader("To cite ncdfgeom in publications, please use:")
+
+bibentry(bibtype = "Manual",
+ author = c(
+ as.person("David Blodgett"),
+ as.person("Luke Winslow")
+ ),
+ title = "ncdfgeom: 'NetCDF' Geometry and Time Series",
+ publisher = "U.S. Geological Survey",
+ address="Reston, VA",
+ version = "1.1.0",
+ institution = "U.S. Geological Survey",
+ year = 2019,
+ url = "https://code.usgs.gov/water/ncdfgeom",
+ textVersion = "Blodgett, D., 2019, ncdfgeom: 'NetCDF' Geometry and Time Series, https://code.usgs.gov/water/ncdfgeom"
+)
diff --git a/inst/doc/ncdfgeom.R b/inst/doc/ncdfgeom.R
index 15177c3..6e8a21e 100644
--- a/inst/doc/ncdfgeom.R
+++ b/inst/doc/ncdfgeom.R
@@ -14,7 +14,7 @@ library(ncdfgeom)
## ----data_shape_2-------------------------------------------------------------
prcp_data <- readRDS(system.file("extdata/climdiv-pcpndv.rds", package = "ncdfgeom"))
-print(prcp_data, n_extra = 0)
+print(prcp_data, max_extra_cols = 0)
plot(prcp_data$date, prcp_data$`0101`, col = "red",
xlab = "date", ylab = "monthly precip (inches)", main = "Sample Timeseries for 0101-'Northern Valley'")
lines(prcp_data$date, prcp_data$`0101`)
diff --git a/inst/doc/ncdfgeom.Rmd b/inst/doc/ncdfgeom.Rmd
index 9ba8ec8..284b971 100644
--- a/inst/doc/ncdfgeom.Rmd
+++ b/inst/doc/ncdfgeom.Rmd
@@ -31,7 +31,7 @@ For timeseries, two formats are supported:
1. a wide format `data.frame` with timesteps in rows and geometry "instances" in columns with required attributes of geometry "instances" provided separately. This format lends its self to data where the same timestamps are used for every row and data exists for all geometry instances for all time steps -- it is sometimes referred to as the orthogonal array, or "space-wide", encoding.
1. a long format `data.frame` where each row contains all the geometry "instance" metadata, a time stamp, and the variables to be stored for that time step. This format lends it self to data where each geometry instance has unique timesteps and/or data is not available for each geometry instance at the same timesteps (sparse arrays).
-Additional read / write functions to include additional DSG feature types will be implemented in the future and contributions are welcomed. `ncdfgeom` is a work in progress. Please review the ["issues"](https://github.com/USGS-R/ncdfgeom/issues) list to submit issues and/or see what changes are planned.
+Additional read / write functions to include additional DSG feature types will be implemented in the future and contributions are welcomed. `ncdfgeom` is a work in progress. Please review the ["issues"](https://github.com/DOI-USGS/ncdfgeom/issues) list to submit issues and/or see what changes are planned.
## Installation
@@ -39,7 +39,7 @@ At the time of writing, installation is only available via `remotes` or building
```
install.packages("remotes")
-remotes::install_github("USGS-R/ncdfgeom")
+remotes::install_github("DOI-USGS/ncdfgeom")
```
When on CRAN, the package will be installed with the typical install.packages method.
@@ -67,7 +67,7 @@ The data required for this demo has been cached in the `ncdfgeom` package and is
### `prcp_data`
```{r data_shape_2}
prcp_data <- readRDS(system.file("extdata/climdiv-pcpndv.rds", package = "ncdfgeom"))
-print(prcp_data, n_extra = 0)
+print(prcp_data, max_extra_cols = 0)
plot(prcp_data$date, prcp_data$`0101`, col = "red",
xlab = "date", ylab = "monthly precip (inches)", main = "Sample Timeseries for 0101-'Northern Valley'")
lines(prcp_data$date, prcp_data$`0101`)
diff --git a/vignettes/ncdfgeom.Rmd b/vignettes/ncdfgeom.Rmd
index 9ba8ec8..284b971 100644
--- a/vignettes/ncdfgeom.Rmd
+++ b/vignettes/ncdfgeom.Rmd
@@ -31,7 +31,7 @@ For timeseries, two formats are supported:
1. a wide format `data.frame` with timesteps in rows and geometry "instances" in columns with required attributes of geometry "instances" provided separately. This format lends its self to data where the same timestamps are used for every row and data exists for all geometry instances for all time steps -- it is sometimes referred to as the orthogonal array, or "space-wide", encoding.
1. a long format `data.frame` where each row contains all the geometry "instance" metadata, a time stamp, and the variables to be stored for that time step. This format lends it self to data where each geometry instance has unique timesteps and/or data is not available for each geometry instance at the same timesteps (sparse arrays).
-Additional read / write functions to include additional DSG feature types will be implemented in the future and contributions are welcomed. `ncdfgeom` is a work in progress. Please review the ["issues"](https://github.com/USGS-R/ncdfgeom/issues) list to submit issues and/or see what changes are planned.
+Additional read / write functions to include additional DSG feature types will be implemented in the future and contributions are welcomed. `ncdfgeom` is a work in progress. Please review the ["issues"](https://github.com/DOI-USGS/ncdfgeom/issues) list to submit issues and/or see what changes are planned.
## Installation
@@ -39,7 +39,7 @@ At the time of writing, installation is only available via `remotes` or building
```
install.packages("remotes")
-remotes::install_github("USGS-R/ncdfgeom")
+remotes::install_github("DOI-USGS/ncdfgeom")
```
When on CRAN, the package will be installed with the typical install.packages method.
@@ -67,7 +67,7 @@ The data required for this demo has been cached in the `ncdfgeom` package and is
### `prcp_data`
```{r data_shape_2}
prcp_data <- readRDS(system.file("extdata/climdiv-pcpndv.rds", package = "ncdfgeom"))
-print(prcp_data, n_extra = 0)
+print(prcp_data, max_extra_cols = 0)
plot(prcp_data$date, prcp_data$`0101`, col = "red",
xlab = "date", ylab = "monthly precip (inches)", main = "Sample Timeseries for 0101-'Northern Valley'")
lines(prcp_data$date, prcp_data$`0101`)