saved to stash

Merge branch 'master' of https://github.com/wenlong-liu/usfertilizer

# Conflicts:
#	Readme.md
#	readme.rmd

.Rbuildignore

@@ -3,6 +3,7 @@
 ^\.travis\.yml$
 .Rprofile
 inst/db
+inst/doc
 man-roxygen
 demo/pandas
 ^\.httr-oauth$

DESCRIPTION

@@ -1,19 +1,19 @@
 Package: usfertilizer
 Type: Package
 Title: County-Level Estimates of Fertilizer Application in US 
-Version: 0.1.3
+Version: 0.1.4
 Authors@R: c(
     person("Wenlong", "Liu", role = c("aut","cre"),
         email = 'wliu14@ncsu.edu')
     )
 Maintainer: Wenlong Liu <wliu14@ncsu.edu>
 Description: Compiled and cleaned the county-level estimates of fertilizer, 
-    nitrogen and phosphorus, from 1945 to 2012.  The dataset were originally 
-    generated by USGS based on the sales data of commercial fertilizer. 
-    See <https://www.sciencebase.gov/catalog/item/5851b2d1e4b0f99207c4f238/> for details.  
+    nitrogen and phosphorus, from 1945 to 2012.  The commercial fertilizer data were originally 
+    generated by USGS based on the sales data of commercial fertilizer. The manure data were estimated
+    based on county-level population data of livestock, poultry, and other animals.
+    See the user manual for detailed data sources and cleaning methods.  
     'usfertilizer' utilized the tidyverse to clean the original data and provide 
-    user-friendly dataframe. Please note that USGS does not endorse this package and this package
-    does not include manure data. Also data from 1986 is not available for now.
+    user-friendly dataframe. Please note that USGS does not endorse this package. Also data from 1986 is not available for now.
 License: GPL
 URL: https://github.com/wenlong-liu/usfertilizer
 BugReports: https://github.com/wenlong-liu/usfertilizer/issues

NEWS.md

@@ -18,3 +18,11 @@
 * Added a license file and code of conduct.
 * Enable website for project using pkgdown.
 
+# usfertilizer 0.1.4
+
+* Added manure data from 1982 to 2012 (every five years).
+* Update the column names: Fertilizer -> Nutrient.
+* Added another column: Input.Type to indicate the nutrient input type.
+* Update readme and related articles.
+* Fixed the failed build of vignettes.
+

R/data.R

@@ -1,7 +1,7 @@
 #' us_fertilizer_county
 #'
 #' This is data adapted from the county-level estimates of fertilizer nitrogen and phosphorus based on
-#' commacial sales from 1945 to 2012.  Please visit [here](https://www.sciencebase.gov/catalog/item/5851b2d1e4b0f99207c4f238)
+#' commercial sales from 1945 to 2012.  Please visit [here](https://www.sciencebase.gov/catalog/item/5851b2d1e4b0f99207c4f238)
 #' for more details.
 #'
 #' @format A data frame with 582012rows and 11 variables:
@@ -15,8 +15,9 @@
 #'   \item{INTPTLONG}{The longitude of centriod in each county, e.g. -86.64449}
 #'   \item{Quantity}{The quantity of fertilizeation as N or P, e.g. kg N or kg P}
 #'   \item{Year}{The year of estimated data, e.g. 1994}
-#'   \item{Fertilizer}{The fertilizer type, e.g. N or P}
+#'   \item{Nutrient}{The fertilizer type, e.g. N or P}
 #'   \item{Farm.Type}{The land use type of fertilizer, e.g. farm and nonfarm}
+#'   \item{Input.Type}{The input type of nutrient, e.g. Fertilizer or Manure}
 #'   ...
 #' }
 #' @examples