Skip to content

Commit

Permalink
move images - make slides more self-contained
Browse files Browse the repository at this point in the history
  • Loading branch information
Robinlovelace committed Aug 17, 2018
1 parent 0c5288b commit 164adca
Show file tree
Hide file tree
Showing 8 changed files with 281 additions and 20 deletions.
1 change: 1 addition & 0 deletions pres/geocompr/.gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
intro_files
geostat18-geocomputation_files
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ output:
ratio: '4:3'
countIncrementalSlides: false
# for use with citr (allows auto-updates)
bibliography: ../../xaringan_stuff/references.bib
bibliography: refs-geostat.bib
---

<!-- 14:15 - 15:00 - 45 minute talk -->
Expand All @@ -31,7 +31,7 @@ BibOptions(check.entries = FALSE,
first.inits = FALSE,
hyperlink = FALSE,
dashed = FALSE)
my_bib = ReadBib("../../xaringan_stuff/references.bib", check = FALSE)
my_bib = ReadBib("refs-geostat.bib", check = FALSE)
```


Expand Down Expand Up @@ -84,10 +84,10 @@ webshot::webshot("https://bookdown.org/nowosad/Geostatystyka/")
```

```{r, echo=FALSE}
# webshot::webshot("https://bookdown.org/nowosad/Geostatystyka/", file = "images/geocompr/geostatystyka.png")
# i = magick::image_read("images/geocompr/geostatystyka.png")
# webshot::webshot("https://bookdown.org/nowosad/Geostatystyka/", file = "images/geostatystyka.png")
# i = magick::image_read("images/geostatystyka.png")
# print(i)
knitr::include_graphics("../../images/geocompr/geostatystyka.png")
knitr::include_graphics("images/geostatystyka.png")
```

---
Expand All @@ -99,12 +99,12 @@ webshot::webshot("https://github.com/Robinlovelace/Creating-maps-in-R")
```

```{r, echo=FALSE}
# i = magick::image_read("images/geocompr/creating.png")
# i = magick::image_read("images/creating.png")
# i
# i = magick::image_resize(i, "992x")
# i
# magick::image_write(i, "images/geocompr/creating.png")
knitr::include_graphics("../../images/geocompr/creating.png")
# magick::image_write(i, "images/creating.png")
knitr::include_graphics("images/creating.png")
```

---
Expand All @@ -116,9 +116,9 @@ webshot::webshot("https://rjournal.github.io/archive/2017/RJ-2017-067/")
```

```{r, echo=FALSE}
# webshot::webshot("https://rjournal.github.io/archive/2017/RJ-2017-067/", file = "images/geocompr/rqgis-rjournal.png")
# magick::image_read("images/geocompr/rqgis-rjournal.png")
knitr::include_graphics("../../images/geocompr/rqgis-rjournal.png")
# webshot::webshot("https://rjournal.github.io/archive/2017/RJ-2017-067/", file = "images/rqgis-rjournal.png")
# magick::image_read("images/rqgis-rjournal.png")
knitr::include_graphics("images/rqgis-rjournal.png")
```

---
Expand All @@ -132,11 +132,11 @@ webshot::webshot("https://github.com/jannes-m/RQGIS/issues/66")
```

```{r, echo=FALSE}
# webshot::webshot("https://github.com/jannes-m/RQGIS/issues/66#issuecomment-304788979", file = "images/geocompr/rqgis-question.png")
# i = magick::image_read("images/geocompr/rqgis-question.png")
# webshot::webshot("https://github.com/jannes-m/RQGIS/issues/66#issuecomment-304788979", file = "images/rqgis-question.png")
# i = magick::image_read("images/rqgis-question.png")
# i = magick::image_crop(image = i, "992x+0+1500")
# magick::image_write(i, "images/geocompr/rqgis-question.png")
knitr::include_graphics("../../images/geocompr/rqgis-question.png")
# magick::image_write(i, "images/rqgis-question.png")
knitr::include_graphics("images/rqgis-question.png")
```

---
Expand Down Expand Up @@ -278,8 +278,7 @@ pointmap(as.points(bodmin), add=TRUE)
# pointmap(as.points(bodmin), add=TRUE)
```

--
-
---

# Observations
- R' is robust and future-proof
Expand Down Expand Up @@ -521,19 +520,20 @@ knitr::include_graphics("https://raw.githubusercontent.com/npct/pct-team/master/
- Sea level rise could change the course of humanity
- See code: https://github.com/geocompr/geostats_18/blob/master/code/geocompr/slr.R

```{r}
`Todo: improve this section, add refs + image!

```
``{r}

```
---
class: small
# References
```{r, 'refs', results="asis", echo=FALSE}
PrintBibliography(my_bib)
# RefManageR::WriteBib(my_bib, "refs-geostat.bib")
```


File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
260 changes: 260 additions & 0 deletions pres/geocompr/refs-geostat.bib

Large diffs are not rendered by default.

0 comments on commit 164adca

Please sign in to comment.