Still fixing vignette stuff for the push to cran.

DESCRIPTION

@@ -10,6 +10,8 @@ Type: Package
 Title: rWBclimate
 Description: A package for accessing World Bank climate data
 LazyData: True
+VignetteBuilder: knitr
+Suggests: knitr
 Depends:
     ggplot2,
     httr,
@@ -18,25 +20,3 @@ Depends:
     jsonlite,
     reshape2,
     sp
-Collate:
-    'check_ISO_code.R'
-    'check_locator.R'
-    'climate_map.R'
-    'create_map_df.R'
-    'date_correct.R'
-    'download_kml.R'
-    'get_climate_data.R'
-    'get_data_recursive.R'
-    'get_ensemble_climate_data.R'
-    'get_ensemble_data_recursive.R'
-    'get_ensemble_precip.R'
-    'get_ensemble_stats.R'
-    'get_ensemble_temp.R'
-    'get_historical_data_recursive.R'
-    'get_historical_data.R'
-    'get_historical_precip.R'
-    'get_historical_temp.R'
-    'get_model_precip.R'
-    'get_model_temp.R'
-    'kml_to_sp.R'
-    'rWBclimate-package.r'

Makefile

@@ -3,9 +3,8 @@ all: pandoc move
 
 pandoc:
 	cd inst/stuff/;\
-pandoc -H margins.sty rWBclimate_vignette.md -o rWBclimate_vignette.pdf --highlight-style=tango;\
+pandoc -H margins.sty rWBclimate_vignette.md -o rWBclimate.pdf --highlight-style=tango;\
 
 move:
-	mv inst/stuff/rWBclimate_vignette.pdf inst/stuff/vignette.pdf
-	cp inst/stuff/*.pdf vignettes;\
+	cp inst/stuff/*.pdf ../doc;\
 

NAMESPACE

@@ -1,6 +1,5 @@
 export(climate_map)
 export(create_map_df)
-export(date_correct)
 export(get_data_recursive)
 export(get_ensemble_precip)
 export(get_ensemble_stats)

R/rWBclimate-package.r

@@ -15,3 +15,69 @@ NULL
 #' @docType data
 #' @keywords datasets
 NULL
+
+#' Country codes for all of Africa
+#' @name Africa_country
+#' @docType data
+#' @keywords datasets
+NULL
+
+#' Basin codes for Asia, used in downloading maps
+#' @name Asia_basin
+#' @docType data
+#' @keywords datasets
+NULL
+
+#' Country codes for all of Asia
+#' @name Asia_country
+#' @docType data
+#' @keywords datasets
+NULL
+
+#' Basin codes for Eur, used in downloading maps
+#' @name Eur_basin
+#' @docType data
+#' @keywords datasets
+NULL
+
+#' Country codes for all of Eur
+#' @name Eur_country
+#' @docType data
+#' @keywords datasets
+NULL
+
+#' Basin codes for NoAm, used in downloading maps
+#' @name NoAm_basin
+#' @docType data
+#' @keywords datasets
+NULL
+
+#' Country codes for all of NoAm
+#' @name NoAm_country
+#' @docType data
+#' @keywords datasets
+NULL
+
+#' Basin codes for Oceana, used in downloading maps
+#' @name Oceana_basin
+#' @docType data
+#' @keywords datasets
+NULL
+
+#' Country codes for all of Oceana
+#' @name Oceana_country
+#' @docType data
+#' @keywords datasets
+NULL
+
+#' Basin codes for SoAm, used in downloading maps
+#' @name SoAm_basin
+#' @docType data
+#' @keywords datasets
+NULL
+
+#' Country codes for all of SoAm
+#' @name SoAm_country
+#' @docType data
+#' @keywords datasets
+NULL

README.Rmd

@@ -12,10 +12,6 @@ Installation
 Right now the package is only installable from github with [devtools](http://cran.r-project.org/web/packages/devtools/index.html):
 
 ```R
-#install.packages("devtools")
-#require(devtools)
-
-install_github("rWBclimate", "ropensci")
 require(rWBclimate)
 ```
 Package description
@@ -264,15 +260,15 @@ To cite package ‘rWBclimate’ in publications use:
 
 ```coffee
 
-  Edmund Hart (). rWBclimate: A package for accessing World Bank climate data. R package version 0.1.1.
+  Edmund Hart (). rWBclimate: A package for accessing World Bank climate data. R package version 0.1.3
   http://github.com/ropensci/rWBclimate
 
 A BibTeX entry for LaTeX users is
 
   @Manual{,
     title = {rWBclimate: A package for accessing World Bank climate data},
     author = {Edmund Hart},
-    note = {R package version 0.1.1},
+    note = {R package version 0.1.3},
     url = {http://github.com/ropensci/rWBclimate},
   }
 ```