Skip to content

Prep v2 - updated structure and choropleth map #51

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 42 commits into
base: v2
Choose a base branch
from
Open

Prep v2 - updated structure and choropleth map #51

Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
a8066a8
Major package restructure. Removed everything except utils (moved som…
evanoffPNNL Apr 20, 2020
c1ccebc
Update utils file name to spatial_utils and moved functions from map …
evanoffPNNL Apr 21, 2020
570d383
Updating error checking functions parameters and function shells
evanoffPNNL Apr 21, 2020
e164c85
Updated file name to spatial_utils, added output.r for specific outpu…
evanoffPNNL Apr 21, 2020
9a79419
Work on error checking, many changes, this is a partial development p…
evanoffPNNL Apr 22, 2020
d5a3a1d
Finished error checking for shape object
evanoffPNNL Apr 23, 2020
243f1ec
More error checking and processing work
evanoffPNNL Apr 23, 2020
7f50ea7
More error checking/processing
evanoffPNNL Apr 24, 2020
36c3173
Added flexible verify_map_options function that checks 11 map inputs
evanoffPNNL Apr 27, 2020
f21fc9a
Filled out verify map_data function
evanoffPNNL Apr 28, 2020
ba3e316
More work on process data and verify data functions
evanoffPNNL Apr 28, 2020
9cca960
Added return_error function, reduced warnings, etc
evanoffPNNL Apr 28, 2020
cd355ad
output checking, warnings removed, fixes to some error checking funct…
evanoffPNNL Apr 29, 2020
e09e305
choro push
evanoffPNNL Apr 29, 2020
32352c7
testing, minor tweaks based on error results, also added map_font_adj…
evanoffPNNL Apr 29, 2020
277d58a
Update for pull request, one line commented
evanoffPNNL Apr 30, 2020
077d96e
removed outdated test
crvernon May 6, 2020
0250253
Fixes authorship issue. Also other code from when I started on some o…
evanoffPNNL May 6, 2020
041c156
Fixes function headers
evanoffPNNL May 6, 2020
11d5bae
Fixes arguments conversation
evanoffPNNL May 7, 2020
cf02cc6
Fixed comment/section info
evanoffPNNL May 7, 2020
a9a85e0
Fixes @importFrom conversation
evanoffPNNL May 7, 2020
ecb9191
Fixed simplify conversation
evanoffPNNL May 7, 2020
4990519
Fixes 2 conversations about variable names and output in error messag…
evanoffPNNL May 7, 2020
f520ed0
Fixing '/' in comments
evanoffPNNL May 14, 2020
cbaedae
Fixes null parameters conversation
evanoffPNNL May 14, 2020
9f1b84f
Update .Rd files from previous changes (new build)
evanoffPNNL May 14, 2020
1f1266f
Fixing error checking and process data - should fix bug in conversation.
evanoffPNNL May 26, 2020
69e2b2f
Updating parameter definitions
evanoffPNNL May 26, 2020
0e01f37
Parameters update, suppress warnings on graph output
evanoffPNNL May 31, 2020
5c0e966
Think I have eliminated all the warnings that have been popping up.
evanoffPNNL Jun 1, 2020
04ce7a4
Work towards choropleth vignette
evanoffPNNL Jun 1, 2020
83be4bc
Fixed parameter order, fixed bug in spatial_utils, work on choropleth…
evanoffPNNL Jun 1, 2020
447e015
Completed first two sections of vignette
evanoffPNNL Jun 2, 2020
43931ba
More choropleth vignete
evanoffPNNL Jun 3, 2020
9bc64c4
Minor changes as I build tutorial + tutorial changes
evanoffPNNL Jun 4, 2020
e4fb96b
Bug fixes, continued work on vignette
evanoffPNNL Jun 9, 2020
e07f71f
First tutorial completed
evanoffPNNL Jun 10, 2020
984b9b4
Cleanup, vignettes, 2 new test files
evanoffPNNL Jun 16, 2020
62fb401
no message
evanoffPNNL Jun 16, 2020
aaba29b
Function tweaks, lots of tests developed
evanoffPNNL Jun 17, 2020
bf3c3bf
additional error checking and started new test file for it
evanoffPNNL Jun 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,3 +65,4 @@ xcuserdata
.RData
.Rproj.user
inst/doc
test.png
2 changes: 1 addition & 1 deletion DESCRIPTION
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Imports:
RColorBrewer (>= 1.1.2),
sf (>= 0.6.1),
units (>= 0.4-6)
RoxygenNote: 6.0.1
RoxygenNote: 6.1.1
Suggests: knitr,
rmarkdown,
rgcam,
Expand Down
73 changes: 49 additions & 24 deletions NAMESPACE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,53 @@
# Generated by roxygen2: do not edit by hand

export(EXTENT_AFRICA)
export(EXTENT_CHINA)
export(EXTENT_LA)
export(EXTENT_USA)
export(EXTENT_WORLD)
export(add_region_ID)
export(af_ortho)
export(basin235)
export(ch_aea)
export(chn)
export(eck3)
export(gcam14_colors)
export(gcam32_colors)
export(choropleth)
export(custom_map)
export(distributed_flow)
export(import_mapdata)
export(na_aea)
export(plot_GCAM)
export(plot_GCAM_grid)
export(rgn14)
export(rgn32)
export(robin)
export(process_data)
export(process_raster)
export(process_shape)
export(return_error)
export(save_plot)
export(simplify_mapdata)
export(usa)
export(wgs84)
import(ggplot2)
importFrom(magrittr,"%>%")
importFrom(utils,read.csv)
export(verify_csv)
export(verify_data)
export(verify_raster)
export(verify_shape)
import(RColorBrewer)
importFrom(classInt,classIntervals)
importFrom(dplyr,left_join)
importFrom(dplyr,mutate)
importFrom(ggplot2,aes_string)
importFrom(ggplot2,coord_sf)
importFrom(ggplot2,element_text)
importFrom(ggplot2,expand_scale)
importFrom(ggplot2,geom_raster)
importFrom(ggplot2,geom_sf)
importFrom(ggplot2,geom_sf_label)
importFrom(ggplot2,ggplot)
importFrom(ggplot2,ggsave)
importFrom(ggplot2,guides)
importFrom(ggplot2,labs)
importFrom(ggplot2,rel)
importFrom(ggplot2,scale_fill_brewer)
importFrom(ggplot2,scale_fill_distiller)
importFrom(ggplot2,scale_x_continuous)
importFrom(ggplot2,scale_x_discrete)
importFrom(ggplot2,scale_y_continuous)
importFrom(ggplot2,scale_y_discrete)
importFrom(ggplot2,theme)
importFrom(ggplot2,theme_minimal)
importFrom(ggplot2,theme_update)
importFrom(ggspatial,df_spatial)
importFrom(ggspatial,layer_spatial)
importFrom(raster,as.data.frame)
importFrom(raster,compareCRS)
importFrom(raster,crs)
importFrom(raster,maxValue)
importFrom(raster,minValue)
importFrom(raster,nlayers)
importFrom(raster,raster)
importFrom(rgis,import_raster)
importFrom(sf,st_crs)
importFrom(sf,st_transform)
Loading