Merge pull request #128 from natcap/develop

merge develop into main
natcap · Jan 17, 2024 · 621c2d2 · 621c2d2
2 parents 1409d2a + 288ce3f
commit 621c2d2
Show file tree

Hide file tree

Showing 144 changed files with 10,508 additions and 2,091 deletions.
diff --git a/.github/workflows/frontend-test.yml b/.github/workflows/frontend-test.yml
@@ -18,7 +18,7 @@ jobs:
       - name: Set up node
         uses: actions/setup-node@v2
         with:
-          node-version: lts/*
+          node-version: 18
 
       - name: Restore node_modules cache
         id: nodemodules-cache

diff --git a/README.md b/README.md
@@ -19,11 +19,19 @@ $ docker compose up --build
 `http://localhost:8000/docs`
 
 ## Data Requirements
-local path which mounts in container - (bucket where source file can be found)
-`appdata/NLCD_2016_epsg3857.tif` (natcap-urban-online-datasets-**public**)
-`appdata/invest-data/CGIAR_et0_annual_epsg_3857.tif` (natcap-urban-online-datasets)
-`appdata/invest-data/OE_Bioregions_3857.shp` (natcap-urban-online-datasets)
-`appdata/invest-data/acs_tract_3857.gpkg` (natcap-urban-online-datasets)
-`appdata/invest-data/acs_tract_poverty.csv` (natcap-urban-online-datasets)
-`appdata/invest-data/acs_tract_race.csv` (natcap-urban-online-datasets)
+These are data used by the python worker. Download these to your local
+`appdata/` folder to run the app locally. Please reach out to repository maintainers to get access to these.
 
+local path which mounts in container | (bucket where source file can be found)
+- `appdata/lulc_overlay_3857.tif` | (natcap-urban-online-datasets-**public**)
+- `appdata/invest-data/CGIAR_et0_annual_epsg_3857.tif` | (natcap-urban-online-datasets)
+- `appdata/invest-data/acs_tract_3857.gpkg` | (natcap-urban-online-datasets)
+- `appdata/invest-data/acs_tract_poverty.csv` | (natcap-urban-online-datasets)
+- `appdata/invest-data/acs_tract_race.csv` | (natcap-urban-online-datasets)
+
+## Necessary API tokens
+Currently need to add a `.env` file to `frontend/` with necessary API tokens. Please reach out to repository maintainers to get access to these.
+
+## Necessary software for development
+- Docker
+- Git
diff --git a/appdata/invest-data/biophysical_tables/building_energy_table_NA10.csv b/appdata/invest-data/biophysical_tables/building_energy_table_NA10.csv
diff --git a/appdata/invest-data/biophysical_tables/building_energy_table_NA11.csv b/appdata/invest-data/biophysical_tables/building_energy_table_NA11.csv
diff --git a/appdata/invest-data/biophysical_tables/building_energy_table_NA12.csv b/appdata/invest-data/biophysical_tables/building_energy_table_NA12.csv
diff --git a/appdata/invest-data/biophysical_tables/building_energy_table_NA13.csv b/appdata/invest-data/biophysical_tables/building_energy_table_NA13.csv
diff --git a/appdata/invest-data/biophysical_tables/building_energy_table_NA15.csv b/appdata/invest-data/biophysical_tables/building_energy_table_NA15.csv
diff --git a/appdata/invest-data/biophysical_tables/building_energy_table_NA16.csv b/appdata/invest-data/biophysical_tables/building_energy_table_NA16.csv
diff --git a/appdata/invest-data/biophysical_tables/building_energy_table_NA17.csv b/appdata/invest-data/biophysical_tables/building_energy_table_NA17.csv
diff --git a/appdata/invest-data/biophysical_tables/building_energy_table_NA18.csv b/appdata/invest-data/biophysical_tables/building_energy_table_NA18.csv
diff --git a/appdata/invest-data/biophysical_tables/building_energy_table_NA19.csv b/appdata/invest-data/biophysical_tables/building_energy_table_NA19.csv
diff --git a/appdata/invest-data/biophysical_tables/building_energy_table_NA20.csv b/appdata/invest-data/biophysical_tables/building_energy_table_NA20.csv
diff --git a/appdata/invest-data/biophysical_tables/building_energy_table_NA21.csv b/appdata/invest-data/biophysical_tables/building_energy_table_NA21.csv
diff --git a/appdata/invest-data/biophysical_tables/building_energy_table_NA22.csv b/appdata/invest-data/biophysical_tables/building_energy_table_NA22.csv
diff --git a/appdata/invest-data/biophysical_tables/building_energy_table_NA23.csv b/appdata/invest-data/biophysical_tables/building_energy_table_NA23.csv
diff --git a/appdata/invest-data/biophysical_tables/building_energy_table_NA24.csv b/appdata/invest-data/biophysical_tables/building_energy_table_NA24.csv
diff --git a/appdata/invest-data/biophysical_tables/building_energy_table_NA25.csv b/appdata/invest-data/biophysical_tables/building_energy_table_NA25.csv
diff --git a/appdata/invest-data/biophysical_tables/building_energy_table_NA27.csv b/appdata/invest-data/biophysical_tables/building_energy_table_NA27.csv
diff --git a/appdata/invest-data/biophysical_tables/building_energy_table_NA28.csv b/appdata/invest-data/biophysical_tables/building_energy_table_NA28.csv
diff --git a/appdata/invest-data/biophysical_tables/building_energy_table_NA29.csv b/appdata/invest-data/biophysical_tables/building_energy_table_NA29.csv
diff --git a/appdata/invest-data/biophysical_tables/building_energy_table_NA30.csv b/appdata/invest-data/biophysical_tables/building_energy_table_NA30.csv
diff --git a/appdata/invest-data/biophysical_tables/building_energy_table_NA31.csv b/appdata/invest-data/biophysical_tables/building_energy_table_NA31.csv
diff --git a/appdata/invest-data/biophysical_tables/building_energy_table_NT26.csv b/appdata/invest-data/biophysical_tables/building_energy_table_NT26.csv