Deploy commit: Merge pull request #979 from florisvdh/patch-1

01-introduction.Rmd: proposed updates wrt rgrass & qgisprocess d871ff5
geocompx · Aug 28, 2023 · 766bb42 · 766bb42
1 parent d6b9120
commit 766bb42
Show file tree

Hide file tree

Showing 33 changed files with 35 additions and 35 deletions.
diff --git a/01-introduction.md b/01-introduction.md
@@ -317,8 +317,8 @@ An important capability of **raster** and **terra** is their ability to work wit
 **raster** and **terra** also supports map algebra, as described in Section \@ref(map-algebra).
 
 In parallel with these developments of class systems and methods came the support for R as an interface to dedicated GIS software.
-**GRASS** [@bivand_using_2000] and follow-on packages **spgrass6** and **rgrass7** (for GRASS\index{GRASS} GIS 6 and 7, respectively) were prominent examples in this direction [@bivand_rgrass7_2016;@bivand_spgrass6_2016].
-Other examples of bridges between R and GIS include **RSAGA** [@R-RSAGA, first published in 2008]\index{RSAGA (package)}, **RPyGeo** [@brenning_arcgis_2012, first published in 2008], **RQGIS** [@muenchow_rqgis:_2017, first published in 2016]\index{RQGIS (package)}, and **rqgisprocess** \index{rqgisprocess (package)} (see Chapter \@ref(gis)).
+**GRASS** [@bivand_using_2000] and follow-on packages **spgrass6**, **rgrass7** and **rgrass** (for GRASS\index{GRASS} GIS 6, 7, 7 + 8 respectively) were prominent examples in this direction [@bivand_rgrass7_2016;@bivand_spgrass6_2016].
+Other examples of bridges between R and GIS include **RSAGA** [@R-RSAGA, first published in 2008]\index{RSAGA (package)}, **RPyGeo** [@brenning_arcgis_2012, first published in 2008], **RQGIS** [@muenchow_rqgis:_2017, first published in 2016]\index{RQGIS (package)}, and **qgisprocess** \index{qgisprocess (package)} (see Chapter \@ref(gis)).
 <!--toDo-->
 <!-- rqgisprocess ref! -->
 

diff --git a/05-geometry-operations_files/figure-html/circle-intersection-1.png b/05-geometry-operations_files/figure-html/circle-intersection-1.png
diff --git a/05-geometry-operations_files/figure-html/points-1.png b/05-geometry-operations_files/figure-html/points-1.png
diff --git a/13-transport.md b/13-transport.md
@@ -562,7 +562,7 @@ routes_short_scenario = routes_short |>
   mutate(bicycle = bicycle + car_driver * uptake,
          car_driver = car_driver * (1 - uptake))
 sum(routes_short_scenario$bicycle) - sum(routes_short$bicycle)
-#> [1] 3631
+#> [1] 3756
 ```
 
 Having created a scenario in which approximately 4000 trips have switched from driving to cycling, we can now model where this updated modeled cycling activity will take place.

diff --git a/13-transport_files/figure-html/cycleways-1.png b/13-transport_files/figure-html/cycleways-1.png
diff --git a/13-transport_files/figure-html/rnetvis-1.png b/13-transport_files/figure-html/rnetvis-1.png
diff --git a/13-transport_files/figure-html/rnetvis-2.png b/13-transport_files/figure-html/rnetvis-2.png
diff --git a/13-transport_files/figure-html/routes-1.png b/13-transport_files/figure-html/routes-1.png
diff --git a/13-transport_files/figure-html/wayssln-1.png b/13-transport_files/figure-html/wayssln-1.png
diff --git a/404.html b/404.html
@@ -129,7 +129,7 @@ <h2>Note: Second Edition is under construction 🏗</h2>
 <footer class="bg-primary text-light mt-5"><div class="container"><div class="row">
 
   <div class="col-12 col-md-6 mt-3">
-    <p>"<strong>Geocomputation with R</strong>" was written by Robin Lovelace, Jakub Nowosad, Jannes Muenchow. It was last built on 2023-08-26.</p>
+    <p>"<strong>Geocomputation with R</strong>" was written by Robin Lovelace, Jakub Nowosad, Jannes Muenchow. It was last built on 2023-08-28.</p>
   </div>
 
   <div class="col-12 col-md-6 mt-3">

diff --git a/adv-map.html b/adv-map.html
@@ -1366,7 +1366,7 @@ <h2>Note: Second Edition is under construction 🏗</h2>
 <footer class="bg-primary text-light mt-5"><div class="container"><div class="row">
 
   <div class="col-12 col-md-6 mt-3">
-    <p>"<strong>Geocomputation with R</strong>" was written by Robin Lovelace, Jakub Nowosad, Jannes Muenchow. It was last built on 2023-08-26.</p>
+    <p>"<strong>Geocomputation with R</strong>" was written by Robin Lovelace, Jakub Nowosad, Jannes Muenchow. It was last built on 2023-08-28.</p>
   </div>
 
   <div class="col-12 col-md-6 mt-3">

diff --git a/algorithms.html b/algorithms.html
@@ -527,7 +527,7 @@ <h2>Note: Second Edition is under construction 🏗</h2>
 <footer class="bg-primary text-light mt-5"><div class="container"><div class="row">
 
   <div class="col-12 col-md-6 mt-3">
-    <p>"<strong>Geocomputation with R</strong>" was written by Robin Lovelace, Jakub Nowosad, Jannes Muenchow. It was last built on 2023-08-26.</p>
+    <p>"<strong>Geocomputation with R</strong>" was written by Robin Lovelace, Jakub Nowosad, Jannes Muenchow. It was last built on 2023-08-28.</p>
   </div>
 
   <div class="col-12 col-md-6 mt-3">

diff --git a/attr.html b/attr.html
@@ -857,7 +857,7 @@ <h2>Note: Second Edition is under construction 🏗</h2>
 <footer class="bg-primary text-light mt-5"><div class="container"><div class="row">
 
   <div class="col-12 col-md-6 mt-3">
-    <p>"<strong>Geocomputation with R</strong>" was written by Robin Lovelace, Jakub Nowosad, Jannes Muenchow. It was last built on 2023-08-26.</p>
+    <p>"<strong>Geocomputation with R</strong>" was written by Robin Lovelace, Jakub Nowosad, Jannes Muenchow. It was last built on 2023-08-28.</p>
   </div>
 
   <div class="col-12 col-md-6 mt-3">

diff --git a/conclusion.html b/conclusion.html
@@ -441,7 +441,7 @@ <h2>Note: Second Edition is under construction 🏗</h2>
 <footer class="bg-primary text-light mt-5"><div class="container"><div class="row">
 
   <div class="col-12 col-md-6 mt-3">
-    <p>"<strong>Geocomputation with R</strong>" was written by Robin Lovelace, Jakub Nowosad, Jannes Muenchow. It was last built on 2023-08-26.</p>
+    <p>"<strong>Geocomputation with R</strong>" was written by Robin Lovelace, Jakub Nowosad, Jannes Muenchow. It was last built on 2023-08-28.</p>
   </div>
 
   <div class="col-12 col-md-6 mt-3">

diff --git a/eco.html b/eco.html
@@ -636,7 +636,7 @@ <h2>Note: Second Edition is under construction 🏗</h2>
 <footer class="bg-primary text-light mt-5"><div class="container"><div class="row">
 
   <div class="col-12 col-md-6 mt-3">
-    <p>"<strong>Geocomputation with R</strong>" was written by Robin Lovelace, Jakub Nowosad, Jannes Muenchow. It was last built on 2023-08-26.</p>
+    <p>"<strong>Geocomputation with R</strong>" was written by Robin Lovelace, Jakub Nowosad, Jannes Muenchow. It was last built on 2023-08-28.</p>
   </div>
 
   <div class="col-12 col-md-6 mt-3">

diff --git a/foreword-1st-edition.html b/foreword-1st-edition.html
@@ -155,7 +155,7 @@ <h2>Note: Second Edition is under construction 🏗</h2>
 <footer class="bg-primary text-light mt-5"><div class="container"><div class="row">
 
   <div class="col-12 col-md-6 mt-3">
-    <p>"<strong>Geocomputation with R</strong>" was written by Robin Lovelace, Jakub Nowosad, Jannes Muenchow. It was last built on 2023-08-26.</p>
+    <p>"<strong>Geocomputation with R</strong>" was written by Robin Lovelace, Jakub Nowosad, Jannes Muenchow. It was last built on 2023-08-28.</p>
   </div>
 
   <div class="col-12 col-md-6 mt-3">

diff --git a/foreword-2nd-edition.html b/foreword-2nd-edition.html
@@ -141,7 +141,7 @@ <h2>Note: Second Edition is under construction 🏗</h2>
 <footer class="bg-primary text-light mt-5"><div class="container"><div class="row">
 
   <div class="col-12 col-md-6 mt-3">
-    <p>"<strong>Geocomputation with R</strong>" was written by Robin Lovelace, Jakub Nowosad, Jannes Muenchow. It was last built on 2023-08-26.</p>
+    <p>"<strong>Geocomputation with R</strong>" was written by Robin Lovelace, Jakub Nowosad, Jannes Muenchow. It was last built on 2023-08-28.</p>
   </div>
 
   <div class="col-12 col-md-6 mt-3">

diff --git a/geometry-operations.html b/geometry-operations.html
@@ -1086,7 +1086,7 @@ <h2>Note: Second Edition is under construction 🏗</h2>
 <footer class="bg-primary text-light mt-5"><div class="container"><div class="row">
 
   <div class="col-12 col-md-6 mt-3">
-    <p>"<strong>Geocomputation with R</strong>" was written by Robin Lovelace, Jakub Nowosad, Jannes Muenchow. It was last built on 2023-08-26.</p>
+    <p>"<strong>Geocomputation with R</strong>" was written by Robin Lovelace, Jakub Nowosad, Jannes Muenchow. It was last built on 2023-08-28.</p>
   </div>
 
   <div class="col-12 col-md-6 mt-3">

diff --git a/gis.html b/gis.html
@@ -1022,7 +1022,7 @@ <h2>Note: Second Edition is under construction 🏗</h2>
 <footer class="bg-primary text-light mt-5"><div class="container"><div class="row">
 
   <div class="col-12 col-md-6 mt-3">
-    <p>"<strong>Geocomputation with R</strong>" was written by Robin Lovelace, Jakub Nowosad, Jannes Muenchow. It was last built on 2023-08-26.</p>
+    <p>"<strong>Geocomputation with R</strong>" was written by Robin Lovelace, Jakub Nowosad, Jannes Muenchow. It was last built on 2023-08-28.</p>
   </div>
 
   <div class="col-12 col-md-6 mt-3">

diff --git a/index.html b/index.html
@@ -117,7 +117,7 @@ <h1>Welcome<a class="anchor" aria-label="anchor" href="#welcome"><i class="fas f
 <p>The online version of the book is hosted at <a href="https://r.geocompx.org">r.geocompx.org</a> and kept up-to-date by <a href="https://github.com/geocompx/geocompr/actions">GitHub Actions</a>.
 Its current ‘build status’ as follows:</p>
 <p><a href="https://github.com/geocompx/geocompr/actions"><img src="https://github.com/geocompx/geocompr/workflows/Render/badge.svg" alt="Actions"></a></p>
-<p>This version of the book was built on GH Actions on 2023-08-26.</p>
+<p>This version of the book was built on GH Actions on 2023-08-28.</p>
 <p><a rel="license" href="http://creativecommons.org/licenses/by-nc-nd/4.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by-nc-nd/4.0/88x31.png"></a><br>This work is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-nc-nd/4.0/">Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License</a>.</p>
 <div id="how-to-contribute" class="section level2 unnumbered">
 <h2>How to contribute?<a class="anchor" aria-label="anchor" href="#how-to-contribute"><i class="fas fa-link"></i></a>
@@ -229,7 +229,7 @@ <h2>Note: Second Edition is under construction 🏗</h2>
 <footer class="bg-primary text-light mt-5"><div class="container"><div class="row">
 
   <div class="col-12 col-md-6 mt-3">
-    <p>"<strong>Geocomputation with R</strong>" was written by Robin Lovelace, Jakub Nowosad, Jannes Muenchow. It was last built on 2023-08-26.</p>
+    <p>"<strong>Geocomputation with R</strong>" was written by Robin Lovelace, Jakub Nowosad, Jannes Muenchow. It was last built on 2023-08-28.</p>
   </div>
 
   <div class="col-12 col-md-6 mt-3">

diff --git a/index.md b/index.md
@@ -1,7 +1,7 @@
 --- 
 title: 'Geocomputation with R'
 author: 'Robin Lovelace, Jakub Nowosad, Jannes Muenchow'
-date: '2023-08-26'
+date: '2023-08-28'
 site: bookdown::bookdown_site
 output: bookdown::bs4_book
 documentclass: krantz
@@ -44,7 +44,7 @@ Its current 'build status' as follows:
 
 [![Actions](https://github.com/geocompx/geocompr/workflows/Render/badge.svg)](https://github.com/geocompx/geocompr/actions)
 
-This version of the book was built on GH Actions on 2023-08-26.
+This version of the book was built on GH Actions on 2023-08-28.
 
 <a rel="license" href="http://creativecommons.org/licenses/by-nc-nd/4.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by-nc-nd/4.0/88x31.png" /></a><br />This work is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-nc-nd/4.0/">Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License</a>.
 
@@ -170,9 +170,9 @@ The book covers a wide range of topics and will be of interest to a wide range o
 
 - People who have learned spatial analysis skills using a desktop Geographic Information System (GIS), such as [QGIS](http://qgis.org/en/site/), [ArcGIS](http://desktop.arcgis.com/en/arcmap/), [GRASS](https://grass.osgeo.org/) or [SAGA](http://www.saga-gis.org/en/index.html), who want access to a powerful (geo)statistical and visualization programming language and the benefits of a command-line approach [@sherman_desktop_2008]:
 
-  > With the advent of 'modern' GIS software, most people want to point and click their way through life. That’s good, but there is a tremendous amount of flexibility and power waiting for you with the command line.
+  > With the advent of 'modern' GIS software, most people want to point and click their way through life. That's good, but there is a tremendous amount of flexibility and power waiting for you with the command line.
 
-- Graduate students and researchers from fields specializing in geographic data including Geography, Remote Sensing, Planning, GIS and Geographic Data Science
+- Graduate students and researchers from fields specializing in geographic data including Geography, Remote Sensing, Planning, GIS and Spatial Data Science
 - Academics and post-graduate students working with geographic data --- in fields such as Geology, Regional Science, Biology and Ecology, Agricultural Sciences, Archaeology, Epidemiology, Transport Modeling, and broadly defined Data Science --- who require the power and flexibility of R for their research
 - Applied researchers and analysts in public, private or third-sector organizations who need the reproducibility, speed and flexibility of a command-line language such as R in applications dealing with spatial data as diverse as Urban and Transport Planning, Logistics, Geo-marketing (store location analysis) and Emergency Planning
 

diff --git a/intro.html b/intro.html
@@ -415,8 +415,8 @@ <h2>
 An important capability of <strong>raster</strong> and <strong>terra</strong> is their ability to work with datasets that are too large to fit into RAM (R’s interface to PostGIS also supports off-disk operations, on geographic vector datasets).
 <strong>raster</strong> and <strong>terra</strong> also supports map algebra, as described in Section <a href="spatial-operations.html#map-algebra">4.3.2</a>.</p>
 <p>In parallel with these developments of class systems and methods came the support for R as an interface to dedicated GIS software.
-<strong>GRASS</strong> <span class="citation">(<a href="references.html#ref-bivand_using_2000" role="doc-biblioref">Bivand 2000</a>)</span> and follow-on packages <strong>spgrass6</strong> and <strong>rgrass7</strong> (for GRASS GIS 6 and 7, respectively) were prominent examples in this direction <span class="citation">(<a href="references.html#ref-bivand_rgrass7_2016" role="doc-biblioref">Bivand 2016a</a>, <a href="references.html#ref-bivand_spgrass6_2016" role="doc-biblioref">2016b</a>)</span>.
-Other examples of bridges between R and GIS include <strong>RSAGA</strong> <span class="citation">(<a href="references.html#ref-R-RSAGA" role="doc-biblioref">Brenning, Bangs, and Becker 2018</a>, first published in 2008)</span>, <strong>RPyGeo</strong> <span class="citation">(<a href="references.html#ref-brenning_arcgis_2012" role="doc-biblioref">Brenning 2012a</a>, first published in 2008)</span>, <strong>RQGIS</strong> <span class="citation">(<a href="references.html#ref-muenchow_rqgis:_2017" role="doc-biblioref">Muenchow, Schratz, and Brenning 2017</a>, first published in 2016)</span>, and <strong>rqgisprocess</strong> (see Chapter <a href="gis.html#gis">10</a>).
+<strong>GRASS</strong> <span class="citation">(<a href="references.html#ref-bivand_using_2000" role="doc-biblioref">Bivand 2000</a>)</span> and follow-on packages <strong>spgrass6</strong>, <strong>rgrass7</strong> and <strong>rgrass</strong> (for GRASS GIS 6, 7, 7 + 8 respectively) were prominent examples in this direction <span class="citation">(<a href="references.html#ref-bivand_rgrass7_2016" role="doc-biblioref">Bivand 2016a</a>, <a href="references.html#ref-bivand_spgrass6_2016" role="doc-biblioref">2016b</a>)</span>.
+Other examples of bridges between R and GIS include <strong>RSAGA</strong> <span class="citation">(<a href="references.html#ref-R-RSAGA" role="doc-biblioref">Brenning, Bangs, and Becker 2018</a>, first published in 2008)</span>, <strong>RPyGeo</strong> <span class="citation">(<a href="references.html#ref-brenning_arcgis_2012" role="doc-biblioref">Brenning 2012a</a>, first published in 2008)</span>, <strong>RQGIS</strong> <span class="citation">(<a href="references.html#ref-muenchow_rqgis:_2017" role="doc-biblioref">Muenchow, Schratz, and Brenning 2017</a>, first published in 2016)</span>, and <strong>qgisprocess</strong> (see Chapter <a href="gis.html#gis">10</a>).
 <!--toDo-->
 <!-- rqgisprocess ref! --></p>
 <p>Visualization was not a focus initially, with the bulk of R-spatial development focused on analysis and geographic operations.
@@ -515,7 +515,7 @@ <h2>Note: Second Edition is under construction 🏗</h2>
 <footer class="bg-primary text-light mt-5"><div class="container"><div class="row">
 
   <div class="col-12 col-md-6 mt-3">
-    <p>"<strong>Geocomputation with R</strong>" was written by Robin Lovelace, Jakub Nowosad, Jannes Muenchow. It was last built on 2023-08-26.</p>
+    <p>"<strong>Geocomputation with R</strong>" was written by Robin Lovelace, Jakub Nowosad, Jannes Muenchow. It was last built on 2023-08-28.</p>
   </div>
 
   <div class="col-12 col-md-6 mt-3">

diff --git a/location.html b/location.html
@@ -633,7 +633,7 @@ <h2>Note: Second Edition is under construction 🏗</h2>
 <footer class="bg-primary text-light mt-5"><div class="container"><div class="row">
 
   <div class="col-12 col-md-6 mt-3">
-    <p>"<strong>Geocomputation with R</strong>" was written by Robin Lovelace, Jakub Nowosad, Jannes Muenchow. It was last built on 2023-08-26.</p>
+    <p>"<strong>Geocomputation with R</strong>" was written by Robin Lovelace, Jakub Nowosad, Jannes Muenchow. It was last built on 2023-08-28.</p>
   </div>
 
   <div class="col-12 col-md-6 mt-3">

diff --git a/preface.html b/preface.html
@@ -119,7 +119,7 @@ <h2>Who this book is for<a class="anchor" aria-label="anchor" href="#who-this-bo
 <p>With the advent of ‘modern’ GIS software, most people want to point and click their way through life. That’s good, but there is a tremendous amount of flexibility and power waiting for you with the command line.</p>
 </blockquote>
 </li>
-<li><p>Graduate students and researchers from fields specializing in geographic data including Geography, Remote Sensing, Planning, GIS and Geographic Data Science</p></li>
+<li><p>Graduate students and researchers from fields specializing in geographic data including Geography, Remote Sensing, Planning, GIS and Spatial Data Science</p></li>
 <li><p>Academics and post-graduate students working with geographic data — in fields such as Geology, Regional Science, Biology and Ecology, Agricultural Sciences, Archaeology, Epidemiology, Transport Modeling, and broadly defined Data Science — who require the power and flexibility of R for their research</p></li>
 <li><p>Applied researchers and analysts in public, private or third-sector organizations who need the reproducibility, speed and flexibility of a command-line language such as R in applications dealing with spatial data as diverse as Urban and Transport Planning, Logistics, Geo-marketing (store location analysis) and Emergency Planning</p></li>
 </ul>
@@ -237,7 +237,7 @@ <h2>Note: Second Edition is under construction 🏗</h2>
 <footer class="bg-primary text-light mt-5"><div class="container"><div class="row">
 
   <div class="col-12 col-md-6 mt-3">
-    <p>"<strong>Geocomputation with R</strong>" was written by Robin Lovelace, Jakub Nowosad, Jannes Muenchow. It was last built on 2023-08-26.</p>
+    <p>"<strong>Geocomputation with R</strong>" was written by Robin Lovelace, Jakub Nowosad, Jannes Muenchow. It was last built on 2023-08-28.</p>
   </div>
 
   <div class="col-12 col-md-6 mt-3">

diff --git a/raster-vector.html b/raster-vector.html
@@ -523,7 +523,7 @@ <h2>Note: Second Edition is under construction 🏗</h2>
 <footer class="bg-primary text-light mt-5"><div class="container"><div class="row">
 
   <div class="col-12 col-md-6 mt-3">
-    <p>"<strong>Geocomputation with R</strong>" was written by Robin Lovelace, Jakub Nowosad, Jannes Muenchow. It was last built on 2023-08-26.</p>
+    <p>"<strong>Geocomputation with R</strong>" was written by Robin Lovelace, Jakub Nowosad, Jannes Muenchow. It was last built on 2023-08-28.</p>
   </div>
 
   <div class="col-12 col-md-6 mt-3">

diff --git a/read-write.html b/read-write.html
@@ -1224,7 +1224,7 @@ <h2>Note: Second Edition is under construction 🏗</h2>
 <footer class="bg-primary text-light mt-5"><div class="container"><div class="row">
 
   <div class="col-12 col-md-6 mt-3">
-    <p>"<strong>Geocomputation with R</strong>" was written by Robin Lovelace, Jakub Nowosad, Jannes Muenchow. It was last built on 2023-08-26.</p>
+    <p>"<strong>Geocomputation with R</strong>" was written by Robin Lovelace, Jakub Nowosad, Jannes Muenchow. It was last built on 2023-08-28.</p>
   </div>
 
   <div class="col-12 col-md-6 mt-3">

diff --git a/references.html b/references.html
@@ -898,7 +898,7 @@ <h2>Note: Second Edition is under construction 🏗</h2>
 <footer class="bg-primary text-light mt-5"><div class="container"><div class="row">
 
   <div class="col-12 col-md-6 mt-3">
-    <p>"<strong>Geocomputation with R</strong>" was written by Robin Lovelace, Jakub Nowosad, Jannes Muenchow. It was last built on 2023-08-26.</p>
+    <p>"<strong>Geocomputation with R</strong>" was written by Robin Lovelace, Jakub Nowosad, Jannes Muenchow. It was last built on 2023-08-28.</p>
   </div>
 
   <div class="col-12 col-md-6 mt-3">