Merge branch 'separate-palettes' into 'master'

Separate palettes See merge request WEEL_grp/study-area-figures!5
wildlifeevoeco · Apr 16, 2020 · 1718557 · 1718557
2 parents c595712 + 0b31525
commit 1718557
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 31 deletions.
diff --git a/R/00-palette.R b/R/00-palette.R
@@ -0,0 +1,12 @@
+### Palette - Study area figure ====
+# Alec Robitaille
+
+watercol <- '#c3e2ec'
+islandcol <- '#d0c2a9'
+coastcol <- '#82796a'
+roadcol <- '#666666'
+gridcol <- '#323232'
+
+parkcol <- '#9fb5a0'
+parkboundcol <- '#4c5d3a'
+
diff --git a/R/02-fogo-island-figure.R b/R/02-fogo-island-figure.R
@@ -21,12 +21,7 @@ utm <- st_crs('+proj=utm +zone=21 ellps=WGS84')
 
 ### Theme ----
 # Colors
-watercol <- '#c3e2ec'
-islandcol <- '#d0c2a9'
-coastcol <- '#82796a'
-roadcol <- '#666666'
-gridcol <- '#323232'
-
+source('R/00-palette.R')
 
 roadcols <- data.table(highway = c("primary", "secondary", "residential",
 																	 "service", "unclassified", "footway"))

diff --git a/R/04-newfoundland-figure.R b/R/04-newfoundland-figure.R
@@ -20,9 +20,7 @@ utm <- st_crs('+proj=utm +zone=21 ellps=WGS84')
 
 ### Theme ----
 # Colors
-watercol <- '#c3e2ec'
-islandcol <- '#d0c2a9'
-coastcol <- '#82796a'
+source('R/00-palette.R')
 
 # Theme
 themeMap <- theme(panel.border = element_rect(size = 1, fill = NA),

diff --git a/R/05-fogo-inset-newfoundland-figure.R b/R/05-fogo-inset-newfoundland-figure.R
@@ -40,12 +40,7 @@ utmBB <- data.table(dtbb[, project(cbind(x, y), utm$proj4string)])
 
 ### Theme ----
 # Colors
-watercol <- '#c3e2ec'
-islandcol <- '#d0c2a9'
-coastcol <- '#82796a'
-roadcol <- '#666666'
-gridcol <- '#323232'
-
+source('R/00-palette.R')
 
 roadcols <- data.table(highway = c("primary", "secondary", "residential",
 																	 "service", "unclassified", "footway"))

diff --git a/R/07-terra-nova-figure.R b/R/07-terra-nova-figure.R
@@ -29,14 +29,7 @@ highway <- roads[roads$highway %in% selroads,]
 
 ### Theme ----
 # Colors
-watercol <- '#c3e2ec'
-islandcol <- '#d0c2a9'
-coastcol <- '#82796a'
-roadcol <- '#666666'
-gridcol <- '#323232'
-
-parkcol <- '#9fb5a0'
-parkboundcol <- '#4c5d3a'
+source('R/00-palette.R')
 
 roadcols <- data.table(highway = selroads)
 roadcols[, cols := gray.colors(.N, start = 0.1, end = 0.4)]

diff --git a/R/08-terra-nova-buns-figure.R b/R/08-terra-nova-buns-figure.R
@@ -51,14 +51,7 @@ highway <- roads[roads$highway %in% selroads,]
 
 ### Theme ----
 # Colors
-watercol <- '#c3e2ec'
-islandcol <- '#d0c2a9'
-coastcol <- '#82796a'
-roadcol <- '#666666'
-gridcol <- '#323232'
-
-parkcol <- '#9fb5a0'
-parkboundcol <- '#4c5d3a'
+source('R/00-palette.R')
 
 roadcols <- data.table(highway = selroads)
 roadcols[, cols := gray.colors(.N, start = 0.1, end = 0.4)]

diff --git a/graphics/04-newfoundland.png b/graphics/04-newfoundland.png
diff --git a/graphics/05-fogo-inset-nl.png b/graphics/05-fogo-inset-nl.png
diff --git a/graphics/08-terra-nova-buns.png b/graphics/08-terra-nova-buns.png
diff --git a/run-figures.sh b/run-figures.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+for fig in R/*figure.R ; do
+	echo "Now running $fig"
+	Rscript $fig
+done
+rm Rplots.pdf