Skip to content

Commit 5c80085

Browse files
committed
Update README
1 parent eab5a6c commit 5c80085

File tree

4 files changed

+58
-62
lines changed

4 files changed

+58
-62
lines changed

README.Rmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -353,5 +353,5 @@ Zotero settings: these are useful if you want to add references.
353353

354354
When you export the citations as a .bib file from Zotero, use the `Better BibTex` (not `BibLaTeX`) format.
355355

356-
e use Zotero because it is a powerful open source reference manager that integrates well with citation tools in VS Code and RStudio.
356+
We use Zotero because it is a powerful open source reference manager that integrates well with citation tools in VS Code and RStudio.
357357

README.md

Lines changed: 55 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -38,54 +38,53 @@ latest version at [r.geocompx.org](https://r.geocompx.org/).
3838
### Note: we are actively working on the Second Edition 🏗
3939

4040
<details>
41-
42-
<summary>Summary of the changes</summary>
41+
<summary>
42+
Summary of the changes
43+
</summary>
4344

4445
Since commencing work on the Second Edition in September 2021 much has
4546
changed, including:
4647

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 -->
7979

8080
<!-- Todo: add news file? (RL 2021-11) -->
81-
8281
<!-- See NEWS.md for a summary of the changes. -->
8382

8483
See
8584
[https://github.com/geocompx/geocompr/compare/1.9…main](https://github.com/geocompx/geocompr/compare/1.9...main#files_bucket)
8685
for a continuously updated summary of the changes to date. At the time
8786
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!
8988

9089
[![](https://user-images.githubusercontent.com/1825120/140612663-e62566a2-62ab-4a22-827a-e86f5ce7bd63.png)](https://github.com/geocompx/geocompr/compare/1.9...main)
9190

@@ -97,18 +96,18 @@ Contributions at this stage are very welcome.
9796

9897
We encourage contributions on any part of the book, including:
9998

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/))
112111

113112
See
114113
[our-style.md](https://github.com/geocompx/geocompr/blob/main/misc/our-style.md)
@@ -117,10 +116,9 @@ for the book’s style.
117116
Many thanks to all contributors to the book so far via GitHub (this list
118117
will update automatically): [prosoitos](https://github.com/prosoitos),
119118
[florisvdh](https://github.com/florisvdh),
120-
[katygregg](https://github.com/katygregg),
121119
[babayoshihiko](https://github.com/babayoshihiko),
120+
[katygregg](https://github.com/katygregg),
122121
[Lvulis](https://github.com/Lvulis),
123-
[babayoshihiko](https://github.com/babayoshihiko),
124122
[rsbivand](https://github.com/rsbivand),
125123
[iod-ine](https://github.com/iod-ine),
126124
[KiranmayiV](https://github.com/KiranmayiV),
@@ -145,6 +143,7 @@ will update automatically): [prosoitos](https://github.com/prosoitos),
145143
[mdsumner](https://github.com/mdsumner),
146144
[pat-s](https://github.com/pat-s),
147145
[sdesabbata](https://github.com/sdesabbata),
146+
[ahmohil](https://github.com/ahmohil),
148147
[ateucher](https://github.com/ateucher),
149148
[annakrystalli](https://github.com/annakrystalli),
150149
[andtheWings](https://github.com/andtheWings),
@@ -242,7 +241,7 @@ installed:
242241

243242
To reproduce book **in its entirety**, run the following command (which
244243
installs additional ‘Suggests’ packages, this may take some time to
245-
run\!):
244+
run!):
246245

247246
``` r
248247
# Install packages to fully reproduce book (may take several minutes):
@@ -275,9 +274,7 @@ bookdown::serve_book()
275274
```
276275

277276
<!-- The code associated with each chapter is saved in the `code/chapters/` folder. -->
278-
279277
<!-- `source("code/chapters/07-transport.R")` runs run the code chunks in chapter 7, for example. -->
280-
281278
<!-- These R scripts are generated with the follow command which wraps `knitr::purl()`: -->
282279

283280
## Geocompr in a devcontainer
@@ -342,7 +339,7 @@ docker run -it geocompr/geocompr R
342339
![](https://user-images.githubusercontent.com/1825120/39538109-9b50e7ac-4e33-11e8-93b3-e00e95a79294.png)
343340

344341
If you see something like this after following the steps above,
345-
congratulations: it worked\! See
342+
congratulations: it worked! See
346343
[github.com/rocker-org](https://github.com/rocker-org/rocker/wiki/Using-the-RStudio-image#running-rstudio-server)
347344
for more info.
348345

@@ -396,9 +393,7 @@ rmarkdown::render("README.Rmd", output_format = "github_document", output_file =
396393
```
397394

398395
<!-- ## Book statistics -->
399-
400396
<!-- An indication of the book's progress over time is illustrated below (to be updated roughly every week as the book progresses). -->
401-
402397
<!-- Book statistics: estimated number of pages per chapter over time. -->
403398

404399
## Citations
@@ -440,7 +435,8 @@ followed by `N`), and as illustrated in the figure below:
440435

441436
Zotero settings: these are useful if you want to add references.
442437

438+
When you export the citations as a .bib file from Zotero, use the
439+
`Better BibTex` (not `BibLaTeX`) format.
440+
443441
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.

extdata/contributors.csv

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
name,link
22
prosoitos,https://github.com/prosoitos
33
florisvdh,https://github.com/florisvdh
4-
katygregg,https://github.com/katygregg
54
babayoshihiko,https://github.com/babayoshihiko
5+
katygregg,https://github.com/katygregg
66
Lvulis,https://github.com/Lvulis
7-
babayoshihiko,https://github.com/babayoshihiko
87
rsbivand,https://github.com/rsbivand
98
iod-ine,https://github.com/iod-ine
109
KiranmayiV,https://github.com/KiranmayiV
@@ -29,6 +28,7 @@ MarHer90,https://github.com/MarHer90
2928
mdsumner,https://github.com/mdsumner
3029
pat-s,https://github.com/pat-s
3130
sdesabbata,https://github.com/sdesabbata
31+
ahmohil,https://github.com/ahmohil
3232
ateucher,https://github.com/ateucher
3333
annakrystalli,https://github.com/annakrystalli
3434
andtheWings,https://github.com/andtheWings

figures/01-cranlogs.png

3.6 KB
Loading

0 commit comments

Comments
 (0)