Merge branch 'main' into 63-r-data-prep

.github/workflows/pages.yml

@@ -1,6 +1,9 @@
 name: Deploy site
 
-on: [push]
+on:
+  push:
+    branches:
+      - main
 
 jobs:
   build:
@@ -37,4 +40,4 @@ jobs:
       with:
         github_token: ${{ secrets.GITHUB_TOKEN }}
         publish_dir: ./docs/_book
-        keep_files: true
+        keep: false

Cargo.toml

@@ -17,7 +17,7 @@ enum-map = { version = "2.4.2", features = ["serde"] }
 flate2 = "1.0.25"
 fs-err = "2.9.0"
 futures-util = "0.3.25"
-geo = { version = "0.23.1", features = ["use-serde"] }
+geo = { version = "0.26.0", features = ["use-serde"] }
 geojson = { version = "0.24.0", features = ["geo-types"] }
 indicatif = "0.17.2"
 ndarray = "0.15.6"
@@ -29,7 +29,7 @@ rand = "0.8.4"
 rand_distr = "0.4.2"
 rayon = "1.6.1"
 reqwest = { version = "0.11.13", features = ["stream"] }
-rstar = "0.9.3"
+rstar = "0.11.0"
 serde = { version = "1.0.152", features = ["derive"] }
 shapefile = { version = "0.3.0", features = ["geo-types"] }
 tar = "0.4.38"

README.md

@@ -6,9 +6,9 @@
 
 <img src="docs/logo_SPC_Black.png" align="left" width="130"/>
 
-The Synthetic Population Catalyst (SPC) makes it easier for researchers to work with synthetic population data in England. It combines a variety of [data sources](https://alan-turing-institute.github.io/uatk-spc/data_sources.html) and outputs a single file in [protocol buffer format](https://github.com/alan-turing-institute/uatk-spc/blob/main/synthpop.proto), describing the population in a given study area, with a particular focus on socio-economic characteristics and interactions between individuals. It is therefore well suited to create inputs for models studying the spreading of a pandemic or segregation (e.g.). The tool provides methods to export the outcome in diferent formats often use for researchers like CSV or JSON.
+The Synthetic Population Catalyst (SPC) makes it easier for researchers to work with synthetic population data in England. It combines a variety of [data sources](https://alan-turing-institute.github.io/uatk-spc/understanding_data_sources.html) and outputs a single file in [protocol buffer format](https://github.com/alan-turing-institute/uatk-spc/blob/main/synthpop.proto), describing the population in a given study area, with a particular focus on socio-economic characteristics and interactions between individuals. It is therefore well suited to create inputs for models studying the spreading of a pandemic or segregation (e.g.). The tool provides methods to export the outcome in diferent formats often use for researchers like CSV or JSON.
 
-The input of the SPC tool is a list of the Middle Layer Super Output Area (MSOAs) where you want to create a spatially enriched sythetic population to feed other dynamic models. SPC includes a script to assist you with the proper list of the MSOAs by defining a Local Authority District area in England. [Get started](https://alan-turing-institute.github.io/uatk-spc/) to download SPC data or run the tool in different MSOAs.
+The input of the SPC tool is a list of the Middle Layer Super Output Area (MSOAs) where you want to create a spatially enriched sythetic population to feed other dynamic models. SPC includes a script to assist you with the proper list of the MSOAs by defining a Local Authority District area in England. [Get started](https://alan-turing-institute.github.io/uatk-spc/using_getting_started.html) to download SPC data or run the tool in different MSOAs.
 
 
 ## Lineage
@@ -29,4 +29,4 @@ version control history can be seen on Github in the other repositories.
 
 ## Ethical considerations
 
-Synthetic data may propagate biases existing in the real data it is based on, introduce new ones, or remove useful outliers. See [ONS ethical guidance](https://uksa.statisticsauthority.gov.uk/publication/ethical-considerations-relating-to-the-creation-and-use-of-synthetic-data/pages/1/) for more details. SPC is based on a collection of different 'modelling modules', including some developed externally by other researchers. Each module is validated independently. Validation for newly created methods and links to previous projects can be found in the [modelling methods](https://alan-turing-institute.github.io/uatk-spc/modelling_methods.html).
+Synthetic data may propagate biases existing in the real data it is based on, introduce new ones, or remove useful outliers. See [ONS ethical guidance](https://uksa.statisticsauthority.gov.uk/publication/ethical-considerations-relating-to-the-creation-and-use-of-synthetic-data/pages/1/) for more details. SPC is based on a collection of different 'modelling modules', including some developed externally by other researchers. Each module is validated independently. Validation for newly created methods and links to previous projects can be found in the [modelling methods](https://alan-turing-institute.github.io/uatk-spc/understanding_modelling_methods.html).