Code

Enhancements#244

Code

Merged

carlhiggs merged 26 commits intomainhealthysustainablecities/global-indicators:mainfrom enhancementshealthysustainablecities/global-indicators:enhancementsCopy head branch name to clipboardApr 12, 2023

+2,366-1,747

Commits

Commits on Mar 27, 2023

• removed the renaming of 'study_region' to 'City' in the city data when collating urban covariates to simplify write up of data dictionary for grid and city datasets, as per #230 and #231)

  carlhiggs

  committed
  62c2520

Commits on Mar 28, 2023

• added basic data dictionary for output as per #230 to assets folder that can be copied for regions

  carlhiggs

  committed
  cfdb184

• added code to copy over data dictionary in CSV and XLSX format to study region output folder when generating resources, as per #230

  carlhiggs

  committed
  af8f40f

Commits on Mar 29, 2023

• improved output from the 3_generate_resources.py script (provide output directory and list all generate resources including data, data dictionaries, figure and maps, reports generated along with an…

  Show description for 47dba5e
  carlhiggs

  committed
  47dba5e

• amended spacing of some messages for cleaner output and changed the overall study region results summary name from 'city' to 'region' (as someone may use it just for a specific area, that could be …

  Show description for 2b3479d
  carlhiggs

  committed
  2b3479d

• implemented text wrapping for better printing to screen

  carlhiggs

  committed
  98a9a19

• more minor output printing tidying up

  carlhiggs

  committed
  2616f3d

• added in some additional error checking for mis-specified configurations

  carlhiggs

  committed
  f57c0b4

• updated the neighbourhood analysis script to read from SQL, not gpkg (the latter has slow read/write with non-concurrent access that can cause problems; also results in redundant read/writes as dat…

  Show description for 26439f7
  carlhiggs

  committed
  26439f7

• migrated analysis from using geopackage to using SQL as per #216

  carlhiggs

  committed
  0edcfbd

• further migrated analysis from using geopackage to using SQL as per #216, updating the generate resources script (data export to geopackage and csv occurs then)

  carlhiggs

  committed
  833067a

• rewrote network generation/analysis to use SQL instead of read/write to graphml; we were already writing unprojected nodes/edges to the geodatabase ---

  Show description for b60f149
  carlhiggs

  committed
  b60f149

Commits on Mar 30, 2023

• updated data dictionary (long form, rather than columns for scale)

  carlhiggs

  committed
  d856165

• refactored network creation script _03_create_network_resources.py, abstracting the core functions (configure OSMnx, generate network, clean intersections, create pgrouting topology); this will mak…

  Show description for b8b585c
  carlhiggs

  committed
  b8b585c

• fixed up some omissions in the just-now refactored network creation script

  carlhiggs

  committed
  6baac3d

Commits on Mar 31, 2023

• retained edges with full geometry for pgrouting topological analysis

  carlhiggs

  committed
  4af28be

• retained edges with full geometry for pgrouting topological analysis (corrected implementation of this)

  carlhiggs

  committed
  dc1b47d

Commits on Apr 3, 2023

• Created methods for generating metadata, as per #230

  carlhiggs

  committed
  c55990f

• refined the metadata output code, so this just oc

  Show description for ccdfe28
  carlhiggs

  committed
  ccdfe28

• consolidated the _report_functions.py functions into _utils.py

  carlhiggs

  committed
  6d95552

Commits on Apr 5, 2023

• ensured sample points only represent unique point locations (ie. only one sample point is retained at junction of multiple roads, not multiple)

  carlhiggs

  committed
  041690f

• slightly simplified the _11_neighbourhood_analysis.py script (there was some duplicated loading of edges, nodes from gdfs -- so this was consolidated, and some of the variable names simplifed, remo…

  Show description for a3350d7
  carlhiggs

  committed
  a3350d7

• re-ensured projected graph was undirected when re-loaded in neighbourhood analyses script

  carlhiggs

  committed
  926aa2e

Commits on Apr 6, 2023

• re-added in jupyter notebook support (#237) and included directions for tagging with date in the dockerfile (#236)

  carlhiggs

  committed
  12528a0

Commits on Apr 11, 2023

• fixed typo (#238) and ensured urban query is used when evaluating study region urban intersection using custom boundary when the urban query and urban region have been otherwise defined (#239)

  carlhiggs

  committed
  b0c5fd8

Commits on Apr 12, 2023

• reverted to using 'length' (float) for neighbourhood cost rather than 'weight' (integer; derived from length) as per #243, as the additional lines of code appear redundant (no tangible time benefit…

  Show description for f15aef7
  carlhiggs

  committed
  f15aef7