Skip to content

Commit

Permalink
Merge pull request #49 from dblodgett-usgs/master
Browse files Browse the repository at this point in the history
function rename and pkgdown v0.5.0 done
  • Loading branch information
dblodgett-usgs authored Aug 20, 2018
2 parents 7059335 + ecdaced commit be38637
Show file tree
Hide file tree
Showing 78 changed files with 6,514 additions and 1,290 deletions.
4 changes: 3 additions & 1 deletion .Rbuildignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
^.*\.Rproj$
^\.Rproj\.user$
.travis.yml
demo.R
demo.R
_pkgdown.yml
docs
10 changes: 6 additions & 4 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
Package: ncdfgeom
Type: Package
Title: Discrete Sampling Geometry NetCDF
Version: 0.4.0
Title: NetCDF Geometry and Timeseries
Version: 0.5.0
Date: 2017-07-17
Authors@R: c(person("David", "Blodgett", role = c("aut", "cre"),
email = "[email protected]"),
person("Luke", "Winslow", role = "ctb"))
Description: Tools to create discrete sampling geometry and spatial geometry NetCDF files.
URL: https://github.com/USGS-R/ncdfgeom
BugReports: https://github.com/USGS-R/ncdfgeom/issues
Imports:
ncdf4,
sp,
sf,
sp,
rgdal,
methods,
dplyr
Expand All @@ -24,7 +26,7 @@ Suggests:
knitr,
rmarkdown,
pkgdown,
leaflet
tidyr
License: CC0
LazyData: TRUE
Encoding: UTF-8
Expand Down
16 changes: 7 additions & 9 deletions NAMESPACE
Original file line number Diff line number Diff line change
@@ -1,17 +1,15 @@
# Generated by roxygen2: do not edit by hand

export(FromNCDFSG)
export(ToNCDFSG)
export(addGeomData)
export(checkNCDF)
export(getGmFromPrj)
export(getPrjFromNCDF)
export(read_instance_data)
export(get_gridmapping)
export(get_prj)
export(read_attribute_data)
export(read_geometry)
export(read_timeseries_dsg)
export(write_instance_data)
export(write_attribute_data)
export(write_geometry)
export(write_point_dsg)
export(write_ragged_timeseries_dsg)
export(write_timeseries_dsg)
export(write_timeseries_ragged_dsg)
import(ncdf4)
importFrom(dplyr,left_join)
importFrom(methods,is)
Expand Down
17 changes: 15 additions & 2 deletions R/AAA.R → R/0_ncdfgeom.R
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,18 @@ pkg.env <- new.env()
pkg.env$multi_val <- 0
pkg.env$hole_val <- 1

pkg.env$instance_dim_name <- "instance"

# Arbitrary dim and variable names assumed in code.
pkg.env$instance_dim_name <- "instance"
pkg.env$time_dim_name <- "time"
pkg.env$time_var_name <- "time"
pkg.env$lat_coord_var_name <- "lat"
pkg.env$lon_coord_var_name <- "lon"
pkg.env$alt_coord_var_name <- "alt"
pkg.env$str_len_dim <- "name_strlen"
pkg.env$dsg_timeseries_id <- "instance_name"
pkg.env$node_dim_name <- "node"
pkg.env$x_nodes <- "x_nodes"
pkg.env$y_nodes <- "y_nodes"
pkg.env$part_dim_name <- "part"
pkg.env$part_node_count_var_name <- "part_node_count"
pkg.env$part_type_var_name <- "interior_ring"
Expand All @@ -40,6 +48,11 @@ pkg.env$part_node_count_attr_name <- "part_node_count"
pkg.env$part_type_attr_name <- "interior_ring"
pkg.env$geometry_container_att_name <- "geometry"
pkg.env$crs <- "grid_mapping"
pkg.env$time_var_standard_name <- "time"
pkg.env$lat_coord_var_standard_name <- "latitude"
pkg.env$lon_coord_var_standard_name <- "longitude"
pkg.env$alt_coord_var_standard_name <- "height"
pkg.env$timeseries_id_cf_role <- "timeseries_id"

check_geomData <- function(geomData) {
if (any(c("sf", "sfc") %in% class(geomData))) {
Expand Down
90 changes: 0 additions & 90 deletions R/ToNCDFSG.R

This file was deleted.

Loading

0 comments on commit be38637

Please sign in to comment.