Merge pull request #87 from dblodgett-usgs/main

one failing CRAN test

DESCRIPTION

@@ -1,8 +1,8 @@
 Package: ncdfgeom
 Type: Package
 Title: 'NetCDF' Geometry and Time Series
-Version: 1.1.2
-Date: 2021-04-22
+Version: 1.1.3
+Date: 2022-07-13
 Authors@R: c(person("David", "Blodgett", role = c("aut", "cre"), 
                     email = "[email protected]"),
              person("Luke", "Winslow", role = "ctb"))
@@ -16,4 +16,4 @@ Suggests: testthat, knitr, rmarkdown, pkgdown, geoknife, ncdf4, jsonlite, areal
 License: CC0
 Encoding: UTF-8
 VignetteBuilder: knitr
-RoxygenNote: 7.1.2
+RoxygenNote: 7.2.0

R/calculate_area_intersection_weights.R

@@ -7,7 +7,7 @@
 #'
 #' This function is a lightwieght wrapper around the functions
 #' \link[areal]{aw_intersect} \link[areal]{aw_total} and \link[areal]{aw_weight}
-#' from the \href{https://github.com/slu-openGIS/areal}{areal package}.
+#' from the \href{https://chris-prener.github.io/areal/}{areal package}.
 #'
 #' @param x sf data.frame source features including one geometry column and one identifier column
 #' @param y sf data.frame target features including one geometry column and one identifier column

R/check_netcdf.R

@@ -1,8 +1,5 @@
 #'@title Check NetCDF-DSG File
-#'
-#'
 #'@param nc A NetCDF path or URL to be opened.
-#'
 #'@description
 #'Introspects a netCDF file and tries to interpret it as a NetCDF-DSG file. Returns a named
 #'\code{list} containing \code{instance_id} \code{instance_dim} \code{node_count}

R/write_geometry.R

@@ -1,5 +1,4 @@
 #' @title Write geometries and attributes to NetCDF-CF
-#'
 #' @param nc_file \code{character} file path to the nc file to be created.
 #' @param geom_data sf \code{data.frame} with POINT, LINESTRING, MULTILINESTRING, 
 #' POLYGON, or MULTIPOLYGON geometries. Note that three dimensional geometries 
@@ -67,8 +66,6 @@ write_geometry = function(nc_file, geom_data, instance_dim_name = NULL, variable
 }
 
 #'@title Put geometry data in a NetCDF-CF File
-#'
-#'
 #'@param nc_file A string file path to the nc file to be created. It must already have
 #'an instance dimension.
 #'@param geom_data An object of class \code{SpatialLines}, \code{SpatialPolygons}

README.md

@@ -1,6 +1,6 @@
 NetCDF-CF Geometry and Timeseries Tools for R
 ===
-![R-CMD-check](https://github.com/usgs-r/ncdfgeom/workflows/R-CMD-check/badge.svg) [![codecov](https://codecov.io/gh/usgs-r/ncdfgeom/branch/master/graph/badge.svg?token=5c1L38yK5q)](https://codecov.io/gh/usgs-r/ncdfgeom) [![CRAN Downloads](https://cranlogs.r-pkg.org/badges/grand-total/ncdfgeom)](https://cran.r-project.org/package=ncdfgeom) [![CRAN](https://www.r-pkg.org/badges/version/ncdfgeom)](https://cran.r-project.org/package=ncdfgeom)
+![R-CMD-check](https://github.com/usgs-r/ncdfgeom/workflows/R-CMD-check/badge.svg) [![codecov](https://codecov.io/gh/usgs-r/ncdfgeom/branch/master/graph/badge.svg?token=5c1L38yK5q)](https://app.codecov.io/gh/usgs-r/ncdfgeom) [![CRAN Downloads](https://cranlogs.r-pkg.org/badges/grand-total/ncdfgeom)](https://cran.r-project.org/package=ncdfgeom) [![CRAN](https://www.r-pkg.org/badges/version/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.
 

tests/testthat/test_check_ncdf.R

@@ -77,7 +77,7 @@ test_that("a crs gets found correctly", {
               semi_major_axis = 6378137.0,
               inverse_flattening = 298.257223563,
               longitude_of_prime_meridian = 0)
-  expect_equal(checkVals$crs, crs)
+  expect_equal(checkVals$crs, crs[names(checkVals$crs)])
   unlink("test.nc")
 })