@@ -38,54 +38,53 @@ latest version at [r.geocompx.org](https://r.geocompx.org/).
38
38
### Note: we are actively working on the Second Edition 🏗
39
39
40
40
<details >
41
-
42
- <summary >Summary of the changes</summary >
41
+ <summary >
42
+ Summary of the changes
43
+ </summary >
43
44
44
45
Since commencing work on the Second Edition in September 2021 much has
45
46
changed, including:
46
47
47
- - Replacement of ` raster ` with ` terra ` in Chapters 1 to 7 (see commits
48
- related to this update
49
- [ here] ( https://github.com/geocompx/geocompr/search?q=terra&type=commits ) )
50
- - Update of Chapter 7 to include mention alternative ways or
51
- reading-in OSM data in
52
- [ \# 656] ( https://github.com/geocompx/geocompr/pull/656 )
53
- - Refactor build settings so the book builds on Docker images in the
54
- [ geocompr/docker] ( https://github.com/geocompr/docker ) repo
55
- - Improve the experience of using the book in Binder (ideal for trying
56
- out the code before installing or updating the necessary R
57
- packages), as documented in issue
58
- [ \# 691] ( https://github.com/geocompx/geocompr/issues/691 ) (thanks to
59
- [ yuvipanda] ( https://github.com/yuvipanda ) )
60
- - Improved communication of binary spatial predicates in Chapter 4
61
- (see [ \# 675] ( https://github.com/geocompx/geocompr/pull/675 ) )
62
- - New section on the links between subsetting and clipping (see
63
- [ \# 698] ( https://github.com/geocompx/geocompr/pull/698 ) ) in Chapter 5
64
- - New
65
- [ section] ( https://r.geocompx.org/spatial-operations.html#de-9im-strings )
66
- on the dimensionally extended 9 intersection model (DE-9IM)
67
- - New [ chapter] ( https://r.geocompx.org/raster-vector.html ) on
68
- raster-vector interactions split out from Chapter 5
69
- - New
70
- [ section] ( https://r.geocompx.org/spatial-class.html#the-sfheaders-package )
71
- on the ** sfheaders** package
72
- - New [ section] ( https://r.geocompx.org/spatial-class.html#s2 ) in
73
- Chapter 2 on spherical geometry engines and the ** s2** package
74
- - Replacement of code based on the old ** mlr** package with code based
75
- on the new ** mlr3** package, as described in a huge [ pull
76
- request] ( https://github.com/geocompx/geocompr/pull/771 )
77
- <!-- Todo: update this bullet point (Rl 2021-11) -->
78
- <!-- - Next issue -->
48
+ - Replacement of ` raster ` with ` terra ` in Chapters 1 to 7 (see commits
49
+ related to this update
50
+ [ here] ( https://github.com/geocompx/geocompr/search?q=terra&type=commits ) )
51
+ - Update of Chapter 7 to include mention alternative ways or reading-in
52
+ OSM data in [ \# 656] ( https://github.com/geocompx/geocompr/pull/656 )
53
+ - Refactor build settings so the book builds on Docker images in the
54
+ [ geocompr/docker] ( https://github.com/geocompr/docker ) repo
55
+ - Improve the experience of using the book in Binder (ideal for trying
56
+ out the code before installing or updating the necessary R packages),
57
+ as documented in issue
58
+ [ \# 691] ( https://github.com/geocompx/geocompr/issues/691 ) (thanks to
59
+ [ yuvipanda] ( https://github.com/yuvipanda ) )
60
+ - Improved communication of binary spatial predicates in Chapter 4 (see
61
+ [ \# 675] ( https://github.com/geocompx/geocompr/pull/675 ) )
62
+ - New section on the links between subsetting and clipping (see
63
+ [ \# 698] ( https://github.com/geocompx/geocompr/pull/698 ) ) in Chapter 5
64
+ - New
65
+ [ section] ( https://r.geocompx.org/spatial-operations.html#de-9im-strings )
66
+ on the dimensionally extended 9 intersection model (DE-9IM)
67
+ - New [ chapter] ( https://r.geocompx.org/raster-vector.html ) on
68
+ raster-vector interactions split out from Chapter 5
69
+ - New
70
+ [ section] ( https://r.geocompx.org/spatial-class.html#the-sfheaders-package )
71
+ on the ** sfheaders** package
72
+ - New [ section] ( https://r.geocompx.org/spatial-class.html#s2 ) in Chapter
73
+ 2 on spherical geometry engines and the ** s2** package
74
+ - Replacement of code based on the old ** mlr** package with code based
75
+ on the new ** mlr3** package, as described in a huge [ pull
76
+ request] ( https://github.com/geocompx/geocompr/pull/771 )
77
+ <!-- Todo: update this bullet point (Rl 2021-11) -->
78
+ <!-- - Next issue -->
79
79
80
80
<!-- Todo: add news file? (RL 2021-11) -->
81
-
82
81
<!-- See NEWS.md for a summary of the changes. -->
83
82
84
83
See
85
84
[ https://github.com/geocompx/geocompr/compare/1.9…main ] ( https://github.com/geocompx/geocompr/compare/1.9...main#files_bucket )
86
85
for a continuously updated summary of the changes to date. At the time
87
86
of writing (April 2022) there have been more than 10k lines of
88
- code/prose added, lots of refactoring\ !
87
+ code/prose added, lots of refactoring!
89
88
90
89
[ ![ ] ( https://user-images.githubusercontent.com/1825120/140612663-e62566a2-62ab-4a22-827a-e86f5ce7bd63.png )] ( https://github.com/geocompx/geocompr/compare/1.9...main )
91
90
@@ -97,18 +96,18 @@ Contributions at this stage are very welcome.
97
96
98
97
We encourage contributions on any part of the book, including:
99
98
100
- - improvements to the text, e.g. clarifying unclear sentences, fixing
101
- typos (see guidance from [ Yihui
102
- Xie] ( https://yihui.org/en/2013/06/fix-typo-in-documentation/ ) );
103
- - changes to the code, e.g. to do things in a more efficient way;
104
- - suggestions on content (see the project’s [ issue
105
- tracker] ( https://github.com/geocompx/geocompr/issues ) );
106
- - improvements to and alternative approaches in the Geocompr solutions
107
- booklet hosted at
108
- [ r.geocompx.org/solutions] ( https://r.geocompx.org/solutions ) (see a
109
- blog post on how to update solutions in files such as
110
- [ \_ 01-ex.Rmd] ( https://github.com/geocompx/geocompr/blob/main/_01-ex.Rmd )
111
- [ here] ( https://geocompr.github.io/post/2022/geocompr-solutions/ ) )
99
+ - improvements to the text, e.g. clarifying unclear sentences, fixing
100
+ typos (see guidance from [ Yihui
101
+ Xie] ( https://yihui.org/en/2013/06/fix-typo-in-documentation/ ) );
102
+ - changes to the code, e.g. to do things in a more efficient way;
103
+ - suggestions on content (see the project’s [ issue
104
+ tracker] ( https://github.com/geocompx/geocompr/issues ) );
105
+ - improvements to and alternative approaches in the Geocompr solutions
106
+ booklet hosted at
107
+ [ r.geocompx.org/solutions] ( https://r.geocompx.org/solutions ) (see a
108
+ blog post on how to update solutions in files such as
109
+ [ \_ 01-ex.Rmd] ( https://github.com/geocompx/geocompr/blob/main/_01-ex.Rmd )
110
+ [ here] ( https://geocompr.github.io/post/2022/geocompr-solutions/ ) )
112
111
113
112
See
114
113
[ our-style.md] ( https://github.com/geocompx/geocompr/blob/main/misc/our-style.md )
@@ -117,10 +116,9 @@ for the book’s style.
117
116
Many thanks to all contributors to the book so far via GitHub (this list
118
117
will update automatically): [ prosoitos] ( https://github.com/prosoitos ) ,
119
118
[ florisvdh] ( https://github.com/florisvdh ) ,
120
- [ katygregg] ( https://github.com/katygregg ) ,
121
119
[ babayoshihiko] ( https://github.com/babayoshihiko ) ,
120
+ [ katygregg] ( https://github.com/katygregg ) ,
122
121
[ Lvulis] ( https://github.com/Lvulis ) ,
123
- [ babayoshihiko] ( https://github.com/babayoshihiko ) ,
124
122
[ rsbivand] ( https://github.com/rsbivand ) ,
125
123
[ iod-ine] ( https://github.com/iod-ine ) ,
126
124
[ KiranmayiV] ( https://github.com/KiranmayiV ) ,
@@ -145,6 +143,7 @@ will update automatically): [prosoitos](https://github.com/prosoitos),
145
143
[ mdsumner] ( https://github.com/mdsumner ) ,
146
144
[ pat-s] ( https://github.com/pat-s ) ,
147
145
[ sdesabbata] ( https://github.com/sdesabbata ) ,
146
+ [ ahmohil] ( https://github.com/ahmohil ) ,
148
147
[ ateucher] ( https://github.com/ateucher ) ,
149
148
[ annakrystalli] ( https://github.com/annakrystalli ) ,
150
149
[ andtheWings] ( https://github.com/andtheWings ) ,
@@ -242,7 +241,7 @@ installed:
242
241
243
242
To reproduce book ** in its entirety** , run the following command (which
244
243
installs additional ‘Suggests’ packages, this may take some time to
245
- run\ ! ):
244
+ run!):
246
245
247
246
``` r
248
247
# Install packages to fully reproduce book (may take several minutes):
@@ -275,9 +274,7 @@ bookdown::serve_book()
275
274
```
276
275
277
276
<!-- The code associated with each chapter is saved in the `code/chapters/` folder. -->
278
-
279
277
<!-- `source("code/chapters/07-transport.R")` runs run the code chunks in chapter 7, for example. -->
280
-
281
278
<!-- These R scripts are generated with the follow command which wraps `knitr::purl()`: -->
282
279
283
280
## Geocompr in a devcontainer
@@ -342,7 +339,7 @@ docker run -it geocompr/geocompr R
342
339
![ ] ( https://user-images.githubusercontent.com/1825120/39538109-9b50e7ac-4e33-11e8-93b3-e00e95a79294.png )
343
340
344
341
If you see something like this after following the steps above,
345
- congratulations: it worked\ ! See
342
+ congratulations: it worked! See
346
343
[ github.com/rocker-org] ( https://github.com/rocker-org/rocker/wiki/Using-the-RStudio-image#running-rstudio-server )
347
344
for more info.
348
345
@@ -396,9 +393,7 @@ rmarkdown::render("README.Rmd", output_format = "github_document", output_file =
396
393
```
397
394
398
395
<!-- ## Book statistics -->
399
-
400
396
<!-- An indication of the book's progress over time is illustrated below (to be updated roughly every week as the book progresses). -->
401
-
402
397
<!-- Book statistics: estimated number of pages per chapter over time. -->
403
398
404
399
## Citations
@@ -440,7 +435,8 @@ followed by `N`), and as illustrated in the figure below:
440
435
441
436
Zotero settings: these are useful if you want to add references.
442
437
438
+ When you export the citations as a .bib file from Zotero, use the
439
+ ` Better BibTex ` (not ` BibLaTeX ` ) format.
440
+
443
441
We use Zotero because it is a powerful open source reference manager
444
- that integrates well with the ** citr** package. As described in the
445
- GitHub repo
446
- [ Robinlovelace/rmarkdown-citr-demo] ( https://github.com/Robinlovelace/rmarkdown-citr-demo ) .
442
+ that integrates well with citation tools in VS Code and RStudio.
0 commit comments